M3Drop 0.4.57__py3-none-any.whl → 0.4.59__py3-none-any.whl

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/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/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/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/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)
@@ -259,7 +270,7 @@ def NBumiPearsonResidualsCombinedCPU(
         print(f"Phase [Viz]: Samples Collected... n = {len(flat_approx):,}")
 
         # --- FILE 1: SUMMARY (1080p) ---
-        print(f"Saving Summary Plot to {plot_summary_filename}")
+        print(f"Saving plot to: {plot_summary_filename}")
         fig1, ax1 = plt.subplots(1, 2, figsize=(16, 7))
         
         # Plot 1: Variance Stabilization
@@ -299,7 +310,7 @@ def NBumiPearsonResidualsCombinedCPU(
         plt.close()
 
         # --- FILE 2: DETAIL (4K) ---
-        print(f"Saving plot detail plot to: {plot_detail_filename}")
+        print(f"Saving plot to: {plot_detail_filename}")
         fig2, ax2 = plt.subplots(figsize=(20, 11))
         
         if len(flat_approx) > 0:

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:
@@ -292,7 +296,7 @@ def NBumiPearsonResidualsCombinedGPU(
         print(f"Phase [Viz]: Samples Collected... n = {len(flat_approx):,}")
 
         # --- FILE 1: SUMMARY (1080p) ---
-        print(f"Saving Summary Plot to {plot_summary_filename}")
+        print(f"Saving plot to: {plot_summary_filename}")
         fig1, ax1 = plt.subplots(1, 2, figsize=(16, 7))
         
         # Plot 1: Variance Stabilization
@@ -341,7 +345,7 @@ def NBumiPearsonResidualsCombinedGPU(
         plt.close()
 
         # --- FILE 2: DETAIL (4K) ---
-        print(f"Saving plot detail plot to: {plot_detail_filename}")
+        print(f"Saving plot to: {plot_detail_filename}")
         fig2, ax2 = plt.subplots(figsize=(20, 11))
         
         if len(flat_approx) > 0:
@@ -367,4 +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.57.dist-info → m3drop-0.4.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: M3Drop
-Version: 0.4.57
+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.59.dist-info/RECORD

@@ -0,0 +1,14 @@
+m3Drop/ControlDeviceCPU.py,sha256=8P-hxd4thc2wSeon73b9rz3clIGkE3x0cEE82RiGFds,8880
+m3Drop/ControlDeviceGPU.py,sha256=4nzPtgyV0RsEOeezwCVJ7oyDOsp9-dRVLczlduUocpU,9143
+m3Drop/CoreCPU.py,sha256=bJ-4eSW5Q5FXIRdxv6Q8Aj-hF4VhvVq0fFJpTPZGwDA,18922
+m3Drop/CoreGPU.py,sha256=phOUJ6PyOCczY3x_9FzVuOtC-oyHOkDte8bqA1yX7b4,20227
+m3Drop/DiagnosticsCPU.py,sha256=YnKK6mkPEUS8IkQ-vKPE3aZaVJQBsSUp3YsO98sPNV0,13569
+m3Drop/DiagnosticsGPU.py,sha256=wtVC2O48vcfS0sEl7RlXTHGZRBNDehszXEtxgLOqTJc,14994
+m3Drop/NormalizationCPU.py,sha256=Qfj2IRMQyxkvJaAlbH9_H6SMFIWs_UCw3LhY2mOTFSA,13038
+m3Drop/NormalizationGPU.py,sha256=FJLzfYdEB96v9OXld64FZO7r5_M9AU00OSuSlaM0ThY,15541
+m3Drop/__init__.py,sha256=W_TQ9P8_7Tdsa6kDZ6IJKT0FMkX_JFvBqiP821CZIrk,2180
+m3drop-0.4.59.dist-info/licenses/LICENSE,sha256=44Iqpp8Fc10Xzd5T7cT9UhO31Qftk3gBiCjtpwilP_k,1074
+m3drop-0.4.59.dist-info/METADATA,sha256=S9HaM8uJ_X5BfUnho10yRoYV62o8yXkBfm9oWYCKWY4,5248
+m3drop-0.4.59.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+m3drop-0.4.59.dist-info/top_level.txt,sha256=AEULFEFIgFtAwS-KBlIFoYXrqczX_rwqrEcdK46GIrA,7
+m3drop-0.4.59.dist-info/RECORD,,

m3drop-0.4.57.dist-info/RECORD

@@ -1,14 +0,0 @@
-m3Drop/ControlDeviceCPU.py,sha256=8P-hxd4thc2wSeon73b9rz3clIGkE3x0cEE82RiGFds,8880
-m3Drop/ControlDeviceGPU.py,sha256=4nzPtgyV0RsEOeezwCVJ7oyDOsp9-dRVLczlduUocpU,9143
-m3Drop/CoreCPU.py,sha256=csRg5TLQx1Sup7k3lDJm9OO5Oe5-1aC3u_6ldE_GIX8,18679
-m3Drop/CoreGPU.py,sha256=6LToLuWyHxX_7sC2z0Xnvy_qqgmpew5DmnCV0PxmTZQ,19785
-m3Drop/DiagnosticsCPU.py,sha256=l0Imkh3F3zo4ovihUjx7cYWYgzPdztWCN1hcBFO43nY,12943
-m3Drop/DiagnosticsGPU.py,sha256=bsatHyHszgbufneeJvFvHBTLzDuY006nP2yHPHs8s7M,14389
-m3Drop/NormalizationCPU.py,sha256=TrDLq7Urh5OnmaHw34rAalQLoTQ3AfKeIxZNjsbd3_g,12675
-m3Drop/NormalizationGPU.py,sha256=PxYCTmuwU0BEVJllOAQiBalJiclNe-51xmZT5PubloQ,15414
-m3Drop/__init__.py,sha256=W_TQ9P8_7Tdsa6kDZ6IJKT0FMkX_JFvBqiP821CZIrk,2180
-m3drop-0.4.57.dist-info/licenses/LICENSE,sha256=44Iqpp8Fc10Xzd5T7cT9UhO31Qftk3gBiCjtpwilP_k,1074
-m3drop-0.4.57.dist-info/METADATA,sha256=QZnDCH2cSgaXVLzQlxnKueKlaZqAUKQvIWeZinrIJwM,5248
-m3drop-0.4.57.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-m3drop-0.4.57.dist-info/top_level.txt,sha256=AEULFEFIgFtAwS-KBlIFoYXrqczX_rwqrEcdK46GIrA,7
-m3drop-0.4.57.dist-info/RECORD,,