comment out txt xgboost output formats

mieskolainen · Oct 23, 2024 · 6fff690 · 6fff690
1 parent ae98407
commit 6fff690
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/icenet/deep/iceboost.py b/icenet/deep/iceboost.py
@@ -734,9 +734,11 @@ def train_xgb(config={'params': {}}, data_trn=None, data_val=None, y_soft=None,
         savedir  = aux.makedir(f'{args["modeldir"]}/{param["label"]}')
         filename = f'{savedir}/{param["label"]}_{num_epochs-1}'
 
+        """
         model.save_model(filename + '.ubj')
         model.save_model(filename + '.json')
         model.dump_model(filename + '.text', dump_format='text')
+        """
 
         losses = {'trn_losses':         trn_losses,
                   'val_losses':         val_losses,

diff --git a/icenet/tools/process.py b/icenet/tools/process.py
@@ -1382,7 +1382,7 @@ def evaluate_models(data=None, info=None, args=None):
 
     targetdir = os.path.join(f'{args["plotdir"]}', 'eval')
 
-    subdirs = ['', 'ROC', 'MVA', 'COR']
+    subdirs = ['']
     for sd in subdirs:
         os.makedirs(os.path.join(targetdir, sd), exist_ok = True)
 
@@ -1705,7 +1705,16 @@ def plot_XYZ_wrap(func_predict, x_input, y, weights, label, targetdir, args,
     Arbitrary plot steering function.
     Add new plot types here, steered from plots.yml
     """
+    # -----------------------------
+    # Prepare output folders
+
+    targetdir = os.path.join(f'{args["plotdir"]}', 'eval')
 
+    subdirs = ['ROC', 'MVA', 'COR']
+    for sd in subdirs:
+        os.makedirs(os.path.join(targetdir, sd), exist_ok = True)
+    # -----------------------------
+
     global roc_mstats
     global roc_labels
     global roc_paths

diff --git a/tests/zee/gridtune_array.job b/tests/zee/gridtune_array.job
@@ -2,9 +2,9 @@
 
 executable     = gridtune_task.sh
 arguments      = "$(PROCESS) 4 $(ClusterId)"
-error          = gridtune_array.$(CLUSTER).$(PROCESS).out
-output         = gridtune_array.$(CLUSTER).$(PROCESS).output
-log            = gridtune_array.$(CLUSTER).$(PROCESS).log
+error          = logs/gridtune_array.$(CLUSTER).$(PROCESS).out
+output         = logs/gridtune_array.$(CLUSTER).$(PROCESS).output
+log            = logs/gridtune_array.$(CLUSTER).$(PROCESS).log
 request_gpus   = 1
 request_memory = 80G
 #requirements  = TARGET.GPUs_DeviceName =?= "Tesla V100-PCIE-32GB"

diff --git a/tests/zee/gridtune_init.job b/tests/zee/gridtune_init.job
@@ -2,9 +2,9 @@
 
 executable     = gridtune_task.sh
 arguments      = "-1 1 $(ClusterId)"
-error          = gridtune_init.$(CLUSTER).out
-output         = gridtune_init.$(CLUSTER).output
-log            = gridtune_init.$(CLUSTER).log
+error          = logs/gridtune_init.$(CLUSTER).out
+output         = logs/gridtune_init.$(CLUSTER).output
+log            = logs/gridtune_init.$(CLUSTER).log
 request_gpus   = 1
 request_memory = 80G
 #requirements  = TARGET.GPUs_DeviceName =?= "Tesla V100-PCIE-32GB"

diff --git a/tests/zee/submit.sh b/tests/zee/submit.sh
@@ -5,10 +5,12 @@
 #
 # Emulating DAGMan without using it.
 #
-# Run with: source submit.sh
+# Run with: source submit.sh (execute the command in the same folder)
 #
 # [email protected], 2024
 
+mkdir logs -p
+
 ICEPATH="/vols/cms/mmieskol/icenet"
 
 TASK_SCRIPT="gridtune_task.sh"
@@ -62,12 +64,12 @@ while true; do
     elapsed_seconds=$((elapsed_time % 60))
 
     # Otherwise, job is still in the queue, and we can wait
-    echo "Job is still running (status: $job_status). Checking again in ${PERIOD} seconds..."
-    echo "Cumulative waiting time: ${elapsed_minutes} minute(s) and ${elapsed_seconds} second(s)"
+    echo "First job is still running (status: $job_status) | Elapsed: ${elapsed_minutes} min and ${elapsed_seconds} sec"
     sleep $PERIOD
 done
 
 # Submit the array job
+echo ""
 echo "Submitting array job"
 condor_submit $ARRAY_JOB
 echo " "