Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflicts with main branch #43

Merged
merged 19 commits into from
Aug 26, 2022
Merged

Fix conflicts with main branch #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1d6e85f
Fix #19 (#20)
tkokada Jul 26, 2022
72eed63
Fix #21 (#22)
tkokada Jul 27, 2022
5b8b113
fix README (#23)
KanaiYuma-aist Jul 30, 2022
da21de6
fix codestyle test (#26)
KanaiYuma-aist Aug 3, 2022
f243f92
Feature/update readme (#25)
KanaiYuma-aist Aug 5, 2022
5766730
Fix TPE resumtion test (#29)
aramoto99 Aug 9, 2022
8f6df87
add retry (#38)
KanaiYuma-aist Aug 19, 2022
917fd7d
Add dynamic loading of optimizer (#34)
aramoto99 Aug 22, 2022
8102997
change deserialize (#40)
KanaiYuma-aist Aug 23, 2022
e118f9a
Merge branch 'main' of github:aistairc/aiaccel into feature/database
aramoto99 Aug 23, 2022
ee4c8b2
Merge branch 'main' of github:aistairc/aiaccel into feature/database
aramoto99 Aug 24, 2022
61ec9d7
Fix codestyle
aramoto99 Aug 24, 2022
4ce4f0a
(WIP) Change TPE resume
aramoto99 Aug 24, 2022
ab10895
Fix resume test
aramoto99 Aug 25, 2022
68521e2
Feature/fix resume tpe (#41)
KanaiYuma-aist Aug 25, 2022
5fdf06c
Fix TPE resumption
aramoto99 Aug 26, 2022
54acd2e
Merge branch 'develop/database' of github:aistairc/aiaccel into featu…
aramoto99 Aug 26, 2022
a3271d2
Merge branch 'develop/database' of github:aistairc/aiaccel into featu…
aramoto99 Aug 26, 2022
f4cc161
Merge branch 'feature/patch_master' of github:aistairc/aiaccel into f…
aramoto99 Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions tests/unit/abci_test/additionaloptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@
},
"optimizer": {
"optimizer_command": "python -m aiaccel.bin.optimizer",
"$optimizer_runner": "run_optimizer.sh",
"$1search_algorithm": "Random",
"$2search_algorithm": "Grid",
"$3search_algorithm": "Sobol",
"$$$search_algorithm": "NelderMead",
"search_algorithm": "Tpe",
"search_algorithm": "aiaccel.optimizer.TpeOptimizer",
"parameter_pool_size": 4,
"sleep_time_optimizer": 1
},
Expand Down
7 changes: 1 addition & 6 deletions tests/unit/abci_test/additionaloptions2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@
},
"optimizer": {
"optimizer_command": "python -m aiaccel.bin.optimizer",
"$optimizer_runner": "run_optimizer.sh",
"$1search_algorithm": "Random",
"$2search_algorithm": "Grid",
"$3search_algorithm": "Sobol",
"$$$search_algorithm": 'aiaccel.optimizer.NelderMeadOptimizer',
"search_algorithm": "Tpe",
"search_algorithm": "aiaccel.optimizer.TpeOptimizer",
"parameter_pool_size": 4,
"sleep_time_optimizer": 1
},
Expand Down
5 changes: 0 additions & 5 deletions tests/unit/abci_test/cfg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
},
"optimizer": {
"optimizer_command": "python -m aiaccel.bin.optimizer",
"$optimizer_runner": "run_optimizer.sh",
"$1search_algorithm": "Random",
"$2search_algorithm": "Grid",
"$3search_algorithm": "Sobol",
"$$$search_algorithm": 'aiaccel.optimizer.NelderMeadOptimizer',
"search_algorithm": "Tpe",
"parameter_pool_size": 4,
"sleep_time_optimizer": 1
Expand Down
7 changes: 1 addition & 6 deletions tests/unit/abci_test/cfg2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@
},
"optimizer": {
"optimizer_command": "python -m aiaccel.bin.optimizer",
"$optimizer_runner": "run_optimizer.sh",
"$1search_algorithm": "Random",
"$2search_algorithm": "Grid",
"$3search_algorithm": "Sobol",
"$$$search_algorithm": 'aiaccel.optimizer.NelderMeadOptimizer',
"search_algorithm": "Tpe",
"search_algorithm": "aiaccel.optimizer.TpeOptimizer",
"parameter_pool_size": 4,
"sleep_time_optimizer": 1
},
Expand Down
7 changes: 1 addition & 6 deletions tests/unit/abci_test/cfg3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@
},
"optimizer": {
"optimizer_command": "python -m aiaccel.bin.optimizer",
"$optimizer_runner": "run_optimizer.sh",
"$1search_algorithm": "Random",
"$2search_algorithm": "Grid",
"$3search_algorithm": "Sobol",
"$$$search_algorithm": 'aiaccel.optimizer.NelderMeadOptimizer',
"search_algorithm": "Tpe",
"search_algorithm": "aiaccel.optimizer.TpeOptimizer",
"parameter_pool_size": 4,
"sleep_time_optimizer": 1
},
Expand Down