fix up configs (jpata#300)

farakiko · Mar 22, 2024 · 5e13929 · 5e13929
1 parent e1b439a
commit 5e13929
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 56 deletions.
diff --git a/parameters/pytorch/pyg-clic-hits.yaml b/parameters/pytorch/pyg-clic-hits.yaml
@@ -128,11 +128,7 @@ valid_dataset:
           version: 1.7.0
 
 test_dataset:
-  clic_hits:
-    physical:
-      batch_size: 1
-      samples:
-        clic_edm_qq_hits_pf10k:
-          version: 1.7.0
-        clic_edm_ttbar_hits_pf10k:
-          version: 1.7.0
+  clic_edm_qq_hits_pf10k:
+    version: 1.7.0
+  clic_edm_ttbar_hits_pf10k:
+    version: 1.7.0
diff --git a/parameters/pytorch/pyg-clic.yaml b/parameters/pytorch/pyg-clic.yaml
@@ -137,17 +137,13 @@ valid_dataset:
           version: 1.5.0
 
 test_dataset:
-  clic:
-    physical:
-      batch_size: 1
-      samples:
-        clic_edm_qq_pf:
-          version: 1.5.0
-        clic_edm_ttbar_pf:
-          version: 1.5.0
-        clic_edm_ttbar_pu10_pf:
-          version: 1.5.0
-        clic_edm_ww_fullhad_pf:
-          version: 1.5.0
-        clic_edm_zh_tautau_pf:
-          version: 1.5.0
+  clic_edm_qq_pf:
+    version: 1.5.0
+  clic_edm_ttbar_pf:
+    version: 1.5.0
+  clic_edm_ttbar_pu10_pf:
+    version: 1.5.0
+  clic_edm_ww_fullhad_pf:
+    version: 1.5.0
+  clic_edm_zh_tautau_pf:
+    version: 1.5.0
diff --git a/parameters/pytorch/pyg-delphes.yaml b/parameters/pytorch/pyg-delphes.yaml
@@ -131,11 +131,7 @@ valid_dataset:
           version: 1.2.0
 
 test_dataset:
-  delphes:
-    physical:
-      batch_size: 10
-      samples:
-        delphes_ttbar_pf:
-          version: 1.2.0
-        delphes_qcd_pf:
-          version: 1.2.0
+  delphes_ttbar_pf:
+    version: 1.2.0
+  delphes_qcd_pf:
+    version: 1.2.0
diff --git a/scripts/tallinn/rtx/pytorch.sh b/scripts/tallinn/rtx/pytorch.sh
@@ -6,34 +6,30 @@
 
 IMG=/home/software/singularity/pytorch.simg:2024-03-11
 
-# singularity exec -B /scratch/persistent --nv \
-#     --env PYTHONPATH=hep_tfds \
-#     $IMG python3.10 mlpf/pyg_pipeline.py --dataset cms --gpus 4 \
-#     --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-cms.yaml \
-#     --train --test --make-plots --conv-type gnn_lsh --num-epochs 20 --gpu-batch-multiplier 1 --num-workers 1 --prefetch-factor 10
-#
-# singularity exec -B /scratch/persistent --nv \
-#     --env PYTHONPATH=hep_tfds \
-#     $IMG python3.10 mlpf/pyg_pipeline.py --dataset cms --gpus 4 \
-#     --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-cms.yaml \
-#     --train --test --make-plots --conv-type gravnet --num-epochs 20 --gpu-batch-multiplier 1 --num-workers 1 --prefetch-factor 10
-#
-# singularity exec -B /scratch/persistent --nv \
-#     --env PYTHONPATH=hep_tfds \
-#     $IMG python3.10 mlpf/pyg_pipeline.py --dataset cms --gpus 4 \
-#     --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-cms.yaml \
-#     --train --test --make-plots --conv-type mamba --num-epochs 50 --gpu-batch-multiplier 5 --num-workers 1 --prefetch-factor 10
-#
-# singularity exec -B /scratch/persistent --nv \
-#     --env PYTHONPATH=hep_tfds \
-#     $IMG python3.10 mlpf/pyg_pipeline.py --dataset cms --gpus 4 \
-#     --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-cms.yaml \
-#     --train --test --make-plots --conv-type attention --num-epochs 20 --gpu-batch-multiplier 5 --num-workers 1 --prefetch-factor 10
-#
-#
+singularity exec -B /scratch/persistent --nv \
+    --env PYTHONPATH=hep_tfds \
+    --env KERAS_BACKEND=torch \
+    $IMG python3.10 mlpf/pyg_pipeline.py --dataset delphes --gpus 4 \
+    --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-delphes.yaml \
+    --train --test --make-plots --conv-type attention --gpu-batch-multiplier 1 --num-workers 1 --prefetch-factor 10 --attention-type efficient --dtype float32
+
+singularity exec -B /scratch/persistent --nv \
+    --env PYTHONPATH=hep_tfds \
+    --env KERAS_BACKEND=torch \
+    $IMG python3.10 mlpf/pyg_pipeline.py --dataset clic --gpus 4 \
+    --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-clic.yaml \
+    --train --test --make-plots --conv-type attention --gpu-batch-multiplier 10 --num-workers 1 --prefetch-factor 10 --attention-type math --dtype float32
+
+singularity exec -B /scratch/persistent --nv \
+    --env PYTHONPATH=hep_tfds \
+    --env KERAS_BACKEND=torch \
+    $IMG python3.10 mlpf/pyg_pipeline.py --dataset clic_hits --gpus 4 \
+    --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-clic-hits.yaml \
+    --train --test --make-plots --conv-type attention --gpu-batch-multiplier 1 --num-workers 1 --prefetch-factor 10 --attention-type efficient --dtype float32
+
 singularity exec -B /scratch/persistent --nv \
     --env PYTHONPATH=hep_tfds \
     --env KERAS_BACKEND=torch \
     $IMG python3.10 mlpf/pyg_pipeline.py --dataset cms --gpus 4 \
     --data-dir /scratch/persistent/joosep/tensorflow_datasets --config parameters/pytorch/pyg-cms.yaml \
-    --train --test --make-plots --conv-type attention --gpu-batch-multiplier 10 --num-workers 1 --prefetch-factor 10 --ntest 1000 --attention-type efficient --dtype float32
+    --train --test --make-plots --conv-type attention --gpu-batch-multiplier 1 --num-workers 1 --prefetch-factor 10 --attention-type efficient --dtype float32