comment code in local fitting which prevents sloppy cell parallelization

EmoryUniversityTheoreticalBiophysics · May 29, 2021 · 96b71bd · 96b71bd
1 parent d10531e
commit 96b71bd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/SirIsaac/fittingProblem.py b/SirIsaac/fittingProblem.py
@@ -1807,9 +1807,9 @@ def localFitToData_parallel(self,numprocs,fittingData,dataModel,
 
         # call mpi
         stdoutFile = open(prefix+"stdout.txt",'w')
-        subprocess.call([ "mpirun","-np",str(numprocs),"python",
+        subprocess.call([ "mpirun","--oversubscribe", "-np",str(numprocs),"python",
                           os.path.join(SIRISAACDIR, "localFitParallel.py"),
-                          inputDictFilename ],
+                          inputDictFilename],
                         stderr=stdoutFile,stdout=stdoutFile,env=os.environ)
         stdoutFile.close()
         os.remove(inputDictFilename)
@@ -2630,9 +2630,9 @@ def generateEnsemble_parallel(self,numprocs,dataModel,initialParameters,
           # https://stackoverflow.com/questions/60060142/strange-interaction-
           #         between-h5py-subprocess-and-mpirun
           stdoutFile = open(prefix+"stdout.txt",'w')
-          subprocess.call([ "mpirun","-np",str(numprocs),"python",
+          subprocess.call([ "mpirun","--oversubscribe", "-np",str(numprocs),"python",
                 os.path.join(SIRISAACDIR, "generateEnsembleParallel.py"),
-                inputDictFilename, "--disableC" ],
+                inputDictFilename],
                 stderr=stdoutFile,stdout=stdoutFile,env=os.environ)
           stdoutFile.close()
           os.remove(inputDictFilename)

diff --git a/SirIsaac/localFitParallel.py b/SirIsaac/localFitParallel.py
@@ -20,15 +20,15 @@
 
 ## 7.3.2012 disable SloppyCell's parallel stuff
 ## see SloppyCell's __init__.py
-sc = IO.SloppyCell
-modules = [ sc,sc.ReactionNetworks,Ensembles,Dynamics,
-            Collections,PerfectData ]
-import socket
-for module in modules:
-    module.HAVE_MPI = False
-    module.num_procs = 1
-    module.my_rank = 0
-    module.my_host = socket.gethostname()
+# sc = IO.SloppyCell
+# modules = [ sc,sc.ReactionNetworks,Ensembles,Dynamics,
+#             Collections,PerfectData ]
+# import socket
+# for module in modules:
+#     module.HAVE_MPI = False
+#     module.num_procs = 1
+#     module.my_rank = 0
+#     module.my_host = socket.gethostname()
 
 # Constants
 MASTER_PROCESS = 0