fix examples config

aistairc · Dec 27, 2024 · bebe35c · bebe35c
1 parent 951ab18
commit bebe35c
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 179 deletions.
diff --git a/aiaccel/apps/optimize.py b/aiaccel/apps/optimize.py
diff --git a/aiaccel/hpo/apps/optimize.py b/aiaccel/hpo/apps/optimize.py
@@ -96,10 +96,10 @@ def main() -> None:
 
         params:
         _convert_: partial
-        _target_: aiaccel.apps.optimize.HparamsManager
+        _target_: aiaccel.hpo.apps.optimize.HparamsManager
         x1: [0, 1]
         x2:
-            _target_: aiaccel.apps.optimize.SuggestFloat
+            _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
             name: x2
             low: 0.0
             high: 1.0

diff --git a/examples/job/optuna/CmaEs/config.yaml b/examples/job/optuna/CmaEs/config.yaml
@@ -26,15 +26,15 @@ study:
 
 params:
   _convert_: partial
-  _target_: aiaccel.apps.optimize.HparamsManager
+  _target_: aiaccel.hpo.apps.optimize.HparamsManager
   x1:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x1
     low: -1
     high: 1
     log: false
   x2:
-    _target_: aiaccel.apps.optimize.SuggestInt
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestInt
     name: x2
     low: -1
     high: 1

diff --git a/examples/job/optuna/GPS/config.yaml b/examples/job/optuna/GPS/config.yaml
@@ -15,9 +15,9 @@ study:
 
 params:
   _convert_: partial
-  _target_: aiaccel.apps.optimize.HparamsManager
+  _target_: aiaccel.hpo.apps.optimize.HparamsManager
   x:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x
     low: -10.0
     high: 10.0

diff --git a/examples/job/optuna/Grid/config.yaml b/examples/job/optuna/Grid/config.yaml
@@ -10,9 +10,9 @@ study:
 
 params:
   _convert_: partial
-  _target_: aiaccel.apps.optimize.HparamsManager
+  _target_: aiaccel.hpo.apps.optimize.HparamsManager
   x:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x
     low: -5
     high: 5

diff --git a/examples/job/optuna/NSGAII/config.yaml b/examples/job/optuna/NSGAII/config.yaml
@@ -17,15 +17,15 @@ study:
 
 params:
   _convert_: partial
-  _target_: aiaccel.apps.optimize.HparamsManager
+  _target_: aiaccel.hpo.apps.optimize.HparamsManager
   x1:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x1
     low: -100.0
     high: 100.0
     log: false
   x2:
-    _target_: aiaccel.apps.optimize.SuggestCategorical
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestCategorical
     name: x2
     choices: [-1, 0, 1]
 

diff --git a/examples/job/optuna/NSGAIII/config.yaml b/examples/job/optuna/NSGAIII/config.yaml
@@ -19,21 +19,21 @@ study:
 
 params:
   _convert_: partial
-  _target_: aiaccel.apps.optimize.HparamsManager
+  _target_: aiaccel.hpo.apps.optimize.HparamsManager
   x1:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x1
     low: 0
     high: 5
     log: false
   x2:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x2
     low: 0
     high: 5
     log: false
   x3:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x3
     low: 0
     high: 5

diff --git a/examples/job/optuna/QMC/config.yaml b/examples/job/optuna/QMC/config.yaml
@@ -15,15 +15,15 @@ study:
 
 params:
   _convert_: partial
-  _target_: aiaccel.apps.optimize.HparamsManager
+  _target_: aiaccel.hpo.apps.optimize.HparamsManager
   x1:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x1
     low: -1.0
     high: 1.0
     log: false
   x2:
-    _target_: aiaccel.apps.optimize.SuggestInt
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestInt
     name: x2
     low: -1.0
     high: 1.0

diff --git a/examples/job/optuna/Random/config.yaml b/examples/job/optuna/Random/config.yaml
@@ -1,32 +1,21 @@
+study:
+  _target_: optuna.create_study
+  direction: minimize
+  sampler:
+    _target_: optuna.samplers.RandomSampler
+    seed: null
+
 params:
   _convert_: partial
-<<<<<<< HEAD
   _target_: aiaccel.hpo.apps.optimize.HparamsManager
-  x1: [0, 1]
-  x2:
-    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
-    name: x2
-    low: 0.0
-    high: 1.0
-=======
-  _target_: aiaccel.apps.optimize.HparamsManager
   x:
-    _target_: aiaccel.apps.optimize.SuggestFloat
-<<<<<<< HEAD
-    name: x2
-    low: 0.0
-    high: 1.0
-<<<<<<< HEAD
->>>>>>> 13d33e0 (add load_if_exists (#395)):examples/job/optuna/config.yaml
->>>>>>> 9938cf1 (add load_if_exists (#395))
-=======
->>>>>>> a026391 (fix conflict)
-=======
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x
     low: -10.0
     high: 10.0
->>>>>>> c133763 (fix config)
     log: false
 
 n_trials: 30
 n_max_jobs: 4
+
+group: gaa50000
diff --git a/examples/job/optuna/TPE/config.yaml b/examples/job/optuna/TPE/config.yaml
@@ -22,9 +22,9 @@ study:
 
 params:
   _convert_: partial
-  _target_: aiaccel.apps.optimize.HparamsManager
+  _target_: aiaccel.hpo.apps.optimize.HparamsManager
   x:
-    _target_: aiaccel.apps.optimize.SuggestFloat
+    _target_: aiaccel.hpo.optuna.suggest_wrapper.SuggestFloat
     name: x
     low: -10.0
     high: 10.0