M3Drop 0.4.58__tar.gz → 0.4.59__tar.gz

{m3drop-0.4.58 → m3drop-0.4.59/M3Drop.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: M3Drop
-Version: 0.4.58
+Version: 0.4.59
 Summary: A Python implementation of the M3Drop single-cell RNA-seq analysis tool.
 Home-page: https://github.com/PragalvhaSharma/m3DropNew
 Author: Tallulah Andrews

{m3drop-0.4.58/M3Drop.egg-info → m3drop-0.4.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: M3Drop
-Version: 0.4.58
+Version: 0.4.59
 Summary: A Python implementation of the M3Drop single-cell RNA-seq analysis tool.
 Home-page: https://github.com/PragalvhaSharma/m3DropNew
 Author: Tallulah Andrews

{m3drop-0.4.58 → m3drop-0.4.59}/m3Drop/CoreCPU.py

@@ -22,10 +22,19 @@ from scipy.stats import norm
 from scipy import sparse
 from statsmodels.stats.multitest import multipletests
 
-# [FIX] Strict Relative Import
-# This ensures that if ControlDeviceCPU fails to load (e.g. missing dependency), 
-# the real error is shown instead of being masked.
-from .ControlDeviceCPU import ControlDevice
+# ==========================================
+#        HYBRID IMPORT (PACKAGE VS LOCAL)
+# ==========================================
+try:
+    # Case 1: Running as an installed package
+    from .ControlDeviceCPU import ControlDevice
+except ImportError:
+    # Case 2: Running locally
+    try:
+        from ControlDeviceCPU import ControlDevice
+    except ImportError:
+        print("CRITICAL ERROR: 'ControlDeviceCPU.py' not found.")
+        sys.exit(1)
 
 # ==========================================
 #        NUMBA KERNELS (CPU OPTIMIZED)

{m3drop-0.4.58 → m3drop-0.4.59}/m3Drop/CoreGPU.py

@@ -22,8 +22,19 @@ import matplotlib.pyplot as plt
 from scipy.stats import norm
 from statsmodels.stats.multitest import multipletests
 
-# Package-compatible import
-from .ControlDeviceGPU import ControlDevice
+# ==========================================
+#      HYBRID IMPORT (PACKAGE VS LOCAL)
+# ==========================================
+try:
+    # Case 1: Running as an installed package (e.g. import m3drop.CoreGPU)
+    from .ControlDeviceGPU import ControlDevice
+except ImportError:
+    # Case 2: Running locally (e.g. python CoreGPU.py)
+    try:
+        from ControlDeviceGPU import ControlDevice
+    except ImportError:
+        print("CRITICAL ERROR: 'ControlDeviceGPU.py' not found.")
+        sys.exit(1)
 
 # ==========================================
 #        FUSED KERNELS

{m3drop-0.4.58 → m3drop-0.4.59}/m3Drop/DiagnosticsCPU.py

@@ -14,9 +14,29 @@ import statsmodels.api as sm
 from scipy.stats import norm
 from statsmodels.stats.multitest import multipletests
 
-# [FIX] Strict Relative Imports
-from .ControlDeviceCPU import ControlDevice
-from .CoreCPU import hidden_calc_valsCPU, NBumiFitModelCPU, NBumiFitDispVsMeanCPU, dropout_prob_kernel_cpu
+# ==========================================
+#        HYBRID IMPORT (PACKAGE VS LOCAL)
+# ==========================================
+
+# [FIX] Hybrid Import: ControlDeviceCPU
+try:
+    from .ControlDeviceCPU import ControlDevice
+except ImportError:
+    try:
+        from ControlDeviceCPU import ControlDevice
+    except ImportError:
+        print("CRITICAL ERROR: 'ControlDeviceCPU.py' not found.")
+        sys.exit(1)
+
+# [FIX] Hybrid Import: CoreCPU
+try:
+    from .CoreCPU import hidden_calc_valsCPU, NBumiFitModelCPU, NBumiFitDispVsMeanCPU, dropout_prob_kernel_cpu
+except ImportError:
+    try:
+        from CoreCPU import hidden_calc_valsCPU, NBumiFitModelCPU, NBumiFitDispVsMeanCPU, dropout_prob_kernel_cpu
+    except ImportError:
+        print("CRITICAL ERROR: 'CoreCPU.py' not found.")
+        sys.exit(1)
 
 # ==========================================
 #        DIAGNOSTICS & COMPARISON (CPU)
@@ -244,7 +264,7 @@ def NBumiCompareModelsCPU(
     stats: dict,
     fit_adjust: dict,
     mask_filename: str = None, 
-    mode: str = "auto",
+    mode: str = "auto", 
     manual_target: int = 3000,
     suppress_plot=False,
     plot_filename=None

{m3drop-0.4.58 → m3drop-0.4.59}/m3Drop/DiagnosticsGPU.py

@@ -13,13 +13,31 @@ from scipy import sparse
 from scipy import stats
 import anndata
 
-from .ControlDeviceGPU import ControlDevice
-from .CoreGPU import (
-    hidden_calc_valsGPU, 
-    NBumiFitModelGPU, 
-    NBumiFitDispVsMeanGPU, 
-    dropout_prob_kernel
-)
+# ==========================================
+#      HYBRID IMPORT (PACKAGE VS LOCAL)
+# ==========================================
+try:
+    # Case 1: Package
+    from .ControlDeviceGPU import ControlDevice
+    from .CoreGPU import (
+        hidden_calc_valsGPU, 
+        NBumiFitModelGPU, 
+        NBumiFitDispVsMeanGPU, 
+        dropout_prob_kernel
+    )
+except ImportError:
+    # Case 2: Local
+    try:
+        from ControlDeviceGPU import ControlDevice
+        from CoreGPU import (
+            hidden_calc_valsGPU, 
+            NBumiFitModelGPU, 
+            NBumiFitDispVsMeanGPU, 
+            dropout_prob_kernel
+        )
+    except ImportError:
+        print("CRITICAL ERROR: Dependencies (ControlDeviceGPU, CoreGPU) not found.")
+        sys.exit(1)
 
 from cupy.sparse import csr_matrix as cp_csr_matrix
 import scipy.sparse as sp

{m3drop-0.4.58 → m3drop-0.4.59}/m3Drop/NormalizationCPU.py

@@ -16,8 +16,19 @@ except ImportError:
     print("CRITICAL ERROR: 'numba' not found. Please install it (pip install numba).")
     sys.exit(1)
 
-# Strict Relative Import
-from .ControlDeviceCPU import ControlDevice
+# ==========================================
+#        HYBRID IMPORT (PACKAGE VS LOCAL)
+# ==========================================
+try:
+    # Case 1: Running as an installed package
+    from .ControlDeviceCPU import ControlDevice
+except ImportError:
+    # Case 2: Running locally
+    try:
+        from ControlDeviceCPU import ControlDevice
+    except ImportError:
+        print("CRITICAL ERROR: 'ControlDeviceCPU.py' not found.")
+        sys.exit(1)
 
 # ==========================================
 #        NUMBA KERNELS (CPU)

{m3drop-0.4.58 → m3drop-0.4.59}/m3Drop/NormalizationGPU.py

@@ -18,10 +18,14 @@ except ImportError:
     cupy = None
     HAS_GPU = False
 
-# Package-compatible import
+# ==========================================
+#      HYBRID IMPORT (PACKAGE VS LOCAL)
+# ==========================================
 try:
+    # Case 1: Package
     from .ControlDeviceGPU import ControlDevice
 except ImportError:
+    # Case 2: Local
     try:
         from ControlDeviceGPU import ControlDevice
     except ImportError:
@@ -367,6 +371,3 @@ def NBumiPearsonResidualsCombinedGPU(
 
     if hasattr(adata_in, "file") and adata_in.file is not None: adata_in.file.close()
     print(f"Total time: {time.perf_counter() - start_time:.2f} seconds.\n")
-
-
-

{m3drop-0.4.58 → m3drop-0.4.59}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="M3Drop",  # Name for pip (pip install M3Drop)
-    version="0.4.58",
+    version="0.4.59",
     author="Tallulah Andrews",
     author_email="tandrew6@uwo.ca",
     description="A Python implementation of the M3Drop single-cell RNA-seq analysis tool.",