Finished adding cluster exectution model, will test multi-node deploy…

…ment on HPC next
SURGroup · Oct 19, 2022 · 8d93c72 · 8d93c72
1 parent bc6fda0
commit 8d93c72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/src/UQpy/run_model/RunModel.py b/src/UQpy/run_model/RunModel.py
@@ -206,17 +206,13 @@ def parallel_execution(self):
                       f"{self.n_new_simulations}")
 
         elif self.run_type is RunType.CLUSTER:
-            print("YEEEEEHAAAAA!!!!!")
             if self.cluster_script is None:
                 raise ValueError("\nUQpy: User-provided slurm script not input, please provide this input\n")
             os.system(f"python -m UQpy.run_model.model_execution.ClusterExecution {self.cores_per_task} "
                       f"{self.n_new_simulations} {self.n_existing_simulations} {self.cluster_script}")
-
-            print("DONE WITH CLUSTER")
-
         else:
             raise ValueError("\nUQpy: RunType is not in currently supported list of cluster types\n")            
-            
+
         with open('qoi.pkl', 'rb') as filehandle:
             results = pickle.load(filehandle)
 

diff --git a/src/UQpy/run_model/model_execution/ClusterExecution.py b/src/UQpy/run_model/model_execution/ClusterExecution.py
@@ -9,7 +9,6 @@
 import pickle
 
 try:
-    print("Oh boy....")
     model = None
     samples = None
     samples_per_process = 0
@@ -30,9 +29,6 @@
     with open('samples.pkl', 'rb') as filehandle:
         samples = pickle.load(filehandle)
 
-    print(len(samples))
-    print(samples[0].shape)
-
     # Loop over the number of samples and create input files in a folder in current directory
     for i in range(len(samples)):
         new_text = model._find_and_replace_var_names_with_values(samples[i])
@@ -48,7 +44,6 @@
 
     # Run user-provided cluster script--for now, it is assumed the user knows how to
     # tile jobs in the script
-    print("This is the cluster script:", cluster_script)
     os.system(f"{cluster_script} {cores_per_task} {n_new_simulations} {n_existing_simulations}")
 
     results = []
@@ -63,20 +58,12 @@
         output = model._output_serial(i)
         results.append(output)
 
+    # Change back to model directory
+    os.chdir(model.model_dir)
+
     with open('qoi.pkl', 'wb') as filehandle:
         pickle.dump(results, filehandle)
 
-
-
-    # CONTINUE HERE TO SEE        
-
-
-    # if comm.rank == 0:
-    #     result = []
-    #     [result.extend(el) for el in qoi]
-    #     with open('qoi.pkl', 'wb') as filehandle:
-    #         pickle.dump(result, filehandle)
-
 except Exception as e:
     print(e)