waaargh

PPPLDeepLearning · Apr 25, 2022 · 88dc979 · 88dc979
1 parent c993008
commit 88dc979
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/examples/conf.yaml b/examples/conf.yaml
@@ -20,7 +20,7 @@ paths:
   signal_prepath: '/signal_data/' # /signal_data/jet/
   shot_list_dir: '/shot_lists/'
   tensorboard_save_path: '/Graph/'
-  data: 'd3d_0D'
+  data: d3d_0D
   # if specific_signals: [] left empty, it will use all valid signals defined on a machine. Only use if need a custom set
   specific_signals: [] # ['q95','li','ip','betan','energy','lm','pradcore','pradedge','pradtot','pin','torquein','tmamp1','tmamp2','tmfreq1','tmfreq2','pechin','energydt','ipdirect','etemp_profile','edens_profile']
   executable: "mpi_learn.py"

diff --git a/plasma/preprocessor/normalize.py b/plasma/preprocessor/normalize.py
@@ -17,8 +17,7 @@
 
 import numpy as np
 from scipy.signal import exponential, correlate
-#import pathos.multiprocessing as mp
-import multiprocessing as mp
+import pathos.multiprocessing as mp
 
 from plasma.primitives.shots import ShotList, Shot
 
@@ -135,7 +134,6 @@ def train_on_files(self, shot_files, use_shots, all_machines,
                 use_cores = max(1, mp.cpu_count() - 2)
             else:
                 use_cores = min(conf["max_cpus"], mp.cpu_count() - 2)
-            use_cores = max(1, mp.cpu_count()-2)
             pool = mp.Pool(use_cores)
             print('running in parallel on {} processes'.format(
                 pool._processes))

diff --git a/plasma/preprocessor/preprocess.py b/plasma/preprocessor/preprocess.py
@@ -16,8 +16,7 @@
 import os
 
 import numpy as np
-#import pathos.multiprocessing as mp
-import multiprocessing as mp
+import pathos.multiprocessing as mp
 
 from plasma.utils.processing import append_to_filename
 from plasma.utils.diagnostics import print_shot_list_sizes