From 59a615b3869eb8488a748e2aa51224a5e3d366bb Mon Sep 17 00:00:00 2001
From: Titus von Koeller <titus@vonkoeller.com>
Date: Tue, 2 Aug 2022 21:26:50 -0700
Subject: factored cuda_setup.main out into smaller modules and functions

---
 bitsandbytes/cextension.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'bitsandbytes/cextension.py')

diff --git a/bitsandbytes/cextension.py b/bitsandbytes/cextension.py
index f5b97fd..66c79d8 100644
--- a/bitsandbytes/cextension.py
+++ b/bitsandbytes/cextension.py
@@ -1,8 +1,8 @@
 import ctypes as ct
-import os
+from pathlib import Path
 from warnings import warn
 
-from bitsandbytes.cuda_setup.main import evaluate_cuda_setup
+from .cuda_setup.main import evaluate_cuda_setup
 
 
 class CUDALibrary_Singleton(object):
@@ -12,18 +12,17 @@ class CUDALibrary_Singleton(object):
         raise RuntimeError("Call get_instance() instead")
 
     def initialize(self):
-        self.context = {}
         binary_name = evaluate_cuda_setup()
-        if not os.path.exists(os.path.dirname(__file__) + f"/{binary_name}"):
+        package_dir = Path(__file__).parent
+        binary_path = package_dir / binary_name
+
+        if not binary_path.exists():
             print(f"TODO: compile library for specific version: {binary_name}")
-            print("defaulting to libbitsandbytes.so")
-            self.lib = ct.cdll.LoadLibrary(
-                os.path.dirname(__file__) + "/libbitsandbytes.so"
-            )
+            legacy_binary_name = "libbitsandbytes.so"
+            print(f"Defaulting to {legacy_binary_name}...")
+            self.lib = ct.cdll.LoadLibrary(package_dir / legacy_binary_name)
         else:
-            self.lib = ct.cdll.LoadLibrary(
-                os.path.dirname(__file__) + f"/{binary_name}"
-            )
+            self.lib = ct.cdll.LoadLibrary(package_dir / binary_name)
 
     @classmethod
     def get_instance(cls):
-- 
cgit v1.2.3