job update

config.yaml

@@ -5,7 +5,7 @@ io:
 
 ptycho:
   engine: 'fold_slice'
-  path: '/home/swim/Si_project/lemon-ptychography/fold_slice'
+  path: '/home/swim/fold_slice'
   params:
     voltage: 200
     alpha_max: 30
@@ -24,7 +24,7 @@ ptycho:
     Niter_save_results: 50
     CBED_size: 192
     ADU: 1
-    extra_print_info: 'swim Si2V1_1.mat'
+    extra_print_info: ''
     scan_number: 1
     gpu_id: 1
     roi_label: '0_Ndp64'

job.sub

@@ -1,5 +1,5 @@
 #!/bin/bash
-#SBATCH --job-name=swim_test
+#SBATCH --job-name=jobname
 #SBATCH --nodes=1
 #SBATCH --ntasks=1
 #SBATCH --cpus-per-task=1
@@ -7,7 +7,7 @@
 #SBATCH --time=100:00:00
 #SBATCH --output=/home/swim/slurm-logs/job_%j.log
 
-echo "TEST JOB"
+echo "JOBNAME"
 pwd
 hostname
 date
@@ -16,9 +16,10 @@ export PATH=/home/shared/MATLAB/R2021a/bin:$PATH
 export PATH=/usr/local/cuda-11.4/bin:$PATH
 export LD_LIBRARY_PATH=/usr/local/cuda-11.4/lib64:$LD_LIBRARY_PATH
 
-source /home/swim/Si_project/wrapper/venv/bin/activate
+source /home/swim/bo-ptycho/venv/bin/activate
 
 cat config.yaml
 python -u main.py config.yaml
 
+date
 echo "SLURM JOB FINISHED"

main.py

@@ -16,35 +16,27 @@ def main(config_yaml):
     os.makedirs(result_dir, exist_ok=True)
     shutil.copy(config_yaml, os.path.join(result_dir, os.path.basename(config_yaml)))
 
-
     randombo = bo.RandomBOEngine(config)
 
     for j in range(10):
         job_config = randombo.ask()
-
         ptycho_engine = ptycho.FoldSlicePtychoEngine(job_config)
         ptycho_engine.run()
         y_value = -np.log(ptycho_engine.metric())
-
         randombo.tell(job_config, y_value)
-
         print('[random] TRAIN_X\n', randombo.state['train_x'])
         print('[random] TRAIN_Y\n', randombo.state['train_y'])
 
-
     sobo = bo.SingleObjectiveBOEngine(config)
     sobo.train_x = randombo.state['train_x']
     sobo.train_y = randombo.state['train_y']
 
     for j in range(config['bo']['max_iterations']):
         job_config = sobo.ask()
-
         ptycho_engine = ptycho.FoldSlicePtychoEngine(job_config)
-        ptycho_engine.run()
+        ptycho_engine.run(header=f"[BO {j:03d}] ")
         y_value = -np.log(ptycho_engine.metric())
-
         sobo.tell(job_config, y_value)
-
         print('[sobo] TRAIN_X\n', sobo.train_x)
         print('[sobo] TRAIN_Y\n', sobo.train_y)
 
@@ -53,7 +45,5 @@ if __name__ == "__main__":
     if len(sys.argv) != 2:
         print("Usage: python bo-ptycho.py <config_yaml>")
         sys.exit(1)
-
     config_yaml = sys.argv[1]
-    
     main(config_yaml)