immucellai2 2.1.29__tar.gz → 2.1.31__tar.gz

{immucellai2-2.1.29 → immucellai2-2.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: immucellai2
-Version: 2.1.29
+Version: 2.1.31
 Summary: A tool for immune cell type deconvolution
 Home-page: https://github.com/VyvyanYjm/ImmuCellAI2.0
 Author: YangJingmin

{immucellai2-2.1.29 → immucellai2-2.1.31}/immucellai2/Deconvolution.py

@@ -267,36 +267,33 @@ def MainRun(RunObject, seed=42, MultithreadModule = 'joblib'):
             RunObject.SampleList[sample_index], 
             RunObject.MAPorMLE 
         )) 
-    #EmceeParameterCopy = RunObject.EmceeParameter.mycopy() 
-    MultiprocessingReturnValue = [] 
+    MultiprocessingReturnValue = []
     if MultithreadModule == 'joblib':
-        try: 
-            results = joblib.Parallel(n_jobs=int(EnvironmentRun.ThreadNum), backend='loky',verbose=0)(joblib.delayed(ThreadRunEachSamples)(*arg) for arg in parameterlist) 
-        except: 
-            print('error occurs while paralleling') 
-        finally: 
-            del parameterlist 
-            print('finished all!') 
+       try:
+          MultiprocessingReturnValue = joblib.Parallel(n_jobs=int(EnvironmentRun.ThreadNum), backend='loky',verbose=0)(joblib.delayed(ThreadRunEachSamples)(*arg) for arg in parameterlist)
+       except:
+          print('error occurs while paralleling')
+       finally:
+          del parameterlist
+          print('finished all!')
     elif MultithreadModule == 'multiprocessing':
         with multiprocessing.Pool(processes=int(EnvironmentRun.ThreadNum)) as pool:
-            results = pool.starmap(
-                ThreadRunEachSamples, 
-                [(EmceeParameterCopy, 
-                  CelltypesReferenceMatrix, 
-                  RunObject.SamplesBulkRNAseqExpression[sample_index], 
-                  RunObject.SampleList[sample_index], 
-                  seed + sample_index, 
-                  RunObject.MAPorMLE
-                  ) for sample_index in range(nsamples)]
-            )   
+            try:
+                MultiprocessingReturnValue = pool.starmap(ThreadRunEachSamples, parameterlist)
+            except Exception as e:
+                print(f'Error occurs while paralleling: {e}')
+            finally:
+                pool.close()
+                pool.join()
+                print('Finished all!')
     MergedResultObject = MergeResultsForAllSample(
-        ThreadList=[MultiprocessesResult(
-            RunObject.SampleList[i], 
-            result, 
-            deepcopy(RunObject.CellType)
-        ) for i, result in enumerate(results)],
+        ThreadList = [MultiprocessesResult(
+            SampleName = RunObject.SampleList[Sampleii],
+            SamplingResult = MultiprocessingReturnValue[Sampleii],
+            CellType=deepcopy(RunObject.CellType),
+        )   for Sampleii in range(len(MultiprocessingReturnValue))],
         OtherParams=[deepcopy(RunObject.CellType), RunObject.FileCellTypeCategory]
-    ) 
+        ) 
     RecordTime.ShowCostTime()
     if os.path.exists("TempThread"): 
         os.system("rm -rf TempThread")

{immucellai2-2.1.29 → immucellai2-2.1.31}/immucellai2/PrepareData.py

@@ -6,6 +6,14 @@ import os
 import re
 import sys
 import multiprocessing as mp
+import importlib.util
+
+def get_package_dir(package_name):
+    spec = importlib.util.find_spec(package_name)
+    if spec is None:
+        raise ModuleNotFoundError(f"Package '{package_name}' not found")
+    path = spec.origin or spec.submodule_search_locations[0]
+    return os.path.dirname(path)
 
 def SelectGeneForDeconvolution(DFReferenceProfile, FileCoveredGenes="", Method="UsedMarker"):
     print("Select the gene for the following deconvolution...")

{immucellai2-2.1.29 → immucellai2-2.1.31}/immucellai2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: immucellai2
-Version: 2.1.29
+Version: 2.1.31
 Summary: A tool for immune cell type deconvolution
 Home-page: https://github.com/VyvyanYjm/ImmuCellAI2.0
 Author: YangJingmin

{immucellai2-2.1.29 → immucellai2-2.1.31}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = immucellai2
-version = 2.1.29
+version = 2.1.31
 author = YangJingmin
 author_email = yangjingmin2021@163.com
 description = A tool for immune cell type deconvolution