Update import logic and error raising

Author: ekatralis

xobjects/sparse/solvers/CPU/__init__.py

@@ -1,7 +1,12 @@
 from scipy.sparse.linalg import splu as scipySuperLU
-__all__ = ["scipySuperLU"]
+from ....context import ModuleNotAvailableError
+
 try:
     from PyKLU import Klu as KLUSuperLU
-    __all__.append("KLUSuperLU")
-except ImportError:
-    pass
+except (ModuleNotFoundError,ImportError) as e:
+    def KLUSuperLU(*args, _import_err=e, **kwargs):
+        raise ModuleNotAvailableError(
+            "KLUSuperLU is not available. Could not import required backend."
+            ) from _import_err
+
+__all__ = ["scipySuperLU", "KLUSuperLU"]

xobjects/sparse/solvers/CUDA/__init__.py

@@ -2,23 +2,23 @@
 try:
     from ._cuDSSLU import DirectSolverSuperLU as cuDSSSuperLU
 except (ModuleNotFoundError,ImportError) as e:
-    def cuDSSSuperLU(*args, **kwargs):
+    def cuDSSSuperLU(*args, _import_err=e, **kwargs):
         raise ModuleNotAvailableError(
             "cuDSSSuperLU is not available. Could not import required backend."
-            ) from e
+            ) from _import_err
 try:
     from ._luLU import luLU as CachedSuperLU
-except (ModuleNotFoundError,ImportError):
-    def CachedSuperLU(*args, **kwargs):
+except (ModuleNotFoundError,ImportError) as e:
+    def CachedSuperLU(*args, _import_err=e, **kwargs):
         raise ModuleNotAvailableError(
             "CachedSuperLU is not available. Could not import required backend."
-            ) from e
+            ) from _import_err
 try:
     from cupyx.scipy.sparse.linalg import splu as CupySuperLU
-except (ModuleNotFoundError,ImportError):
-    def CupySuperLU(*args, **kwargs):
+except (ModuleNotFoundError,ImportError) as e:
+    def CupySuperLU(*args, _import_err=e, **kwargs):
         raise ModuleNotAvailableError(
             "CupySuperLU is not available. Could not import required backend."
-            ) from e
+            ) from _import_err
 
 __all__ = ["cuDSSSuperLU", "CachedSuperLU", "CupySuperLU"]