Fix conflicts with main branch #43
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix for pycodestyle * add flake8==4.0.1
* update README * add bash Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>
* Fix tpe resumption test * fix tpe resumption test * Fix tep resumption test
* (WIP) Add dynamic loading of optimizer by importlib. * (WIP) Add dynamic loading of optimizer by importlib. * Add dynamic loading of optimizer by importlib * Add dynamic loading of optimizer by importlib * Fix test code * fix test * Fix resumtioin test * Add dynamic loading of optimizer * Fix dynamic loading of optimizer * Function names and comments were rolled back. * Changed the standard optimizer specification method * changed the specification method for importing the standard optimizer.
Co-authored-by: aramoto99 <aramoto-masahiro@aist.go.jp>
* fix resume tpe * fix resume tpe * add if len(running_trials) > 0 * fix about trial number
aramoto99
requested review from
aist-airc-sirt,
tkokada and
yoshipon
and removed request for
aist-airc-sirt
yoshipon
approved these changes
Aug 26, 2022
yoshipon
added a commit
that referenced
this pull request
Aug 30, 2022
* Data management function by database is added. By adding the `--fs` option argument to the startup command, data management functions by the conventional file system can be used. Extensive refactoring was performed around the addition of this functionality. * Update setup.py * Delete tests/test_data/work/state/ as it is not used in develop/database. * Develop/database fix test (#18) * fix for tests * delete space * pInfoDict -> p_info * Merge main into debelop/database (#31) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * fix codestyle test (#26) * fix for pycodestyle * add flake8==4.0.1 * Feature/update readme (#25) * update README * add bash Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix resumption test for DB Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Feature/database (#36) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * Fixed a problem in which Snapshot could not be saved during parallel execution. * Add function of delete any data in DB/FS. * Fix code style Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> * Request to merge cumulative changes . (#37) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * The report generation function can now be called by command. * Fix data inconsistency when excute resume. (#39) * Fix resume * Fixed problem with sirialize not working in fs mode * Remove unused package imports * Fixed a problem that the resume function did not work in fs mode. * The name workspace/state is the name of the old specification, so it was changed to the appropriate name workspace/snapshot. * Delete unnecessary directories in Workspace. * Delete unnecessary directories in Workspace. * Delete unnecessary directories in Workspace. * Delete unnecessary directories in Workspace. Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> * Add dynamic loading of optimizer, And fix resumtion test. (#42) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * fix codestyle test (#26) * fix for pycodestyle * add flake8==4.0.1 * Feature/update readme (#25) * update README * add bash Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix TPE resumtion test (#29) * Fix tpe resumption test * fix tpe resumption test * Fix tep resumption test * add retry (#38) * Add dynamic loading of optimizer (#34) * (WIP) Add dynamic loading of optimizer by importlib. * (WIP) Add dynamic loading of optimizer by importlib. * Add dynamic loading of optimizer by importlib * Add dynamic loading of optimizer by importlib * Fix test code * fix test * Fix resumtioin test * Add dynamic loading of optimizer * Fix dynamic loading of optimizer * Function names and comments were rolled back. * Changed the standard optimizer specification method * changed the specification method for importing the standard optimizer. * change deserialize (#40) Co-authored-by: aramoto99 <aramoto-masahiro@aist.go.jp> * Merge branch 'main' of github:aistairc/aiaccel into feature/database * Fix codestyle * (WIP) Change TPE resume * Fix resume test * Feature/fix resume tpe (#41) * fix resume tpe * fix resume tpe * add if len(running_trials) > 0 * fix about trial number * Fix TPE resumption Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix conflicts with main branch (#43) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * fix codestyle test (#26) * fix for pycodestyle * add flake8==4.0.1 * Feature/update readme (#25) * update README * add bash Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix TPE resumtion test (#29) * Fix tpe resumption test * fix tpe resumption test * Fix tep resumption test * add retry (#38) * Add dynamic loading of optimizer (#34) * (WIP) Add dynamic loading of optimizer by importlib. * (WIP) Add dynamic loading of optimizer by importlib. * Add dynamic loading of optimizer by importlib * Add dynamic loading of optimizer by importlib * Fix test code * fix test * Fix resumtioin test * Add dynamic loading of optimizer * Fix dynamic loading of optimizer * Function names and comments were rolled back. * Changed the standard optimizer specification method * changed the specification method for importing the standard optimizer. * change deserialize (#40) Co-authored-by: aramoto99 <aramoto-masahiro@aist.go.jp> * Merge branch 'main' of github:aistairc/aiaccel into feature/database * Fix codestyle * (WIP) Change TPE resume * Fix resume test * Feature/fix resume tpe (#41) * fix resume tpe * fix resume tpe * add if len(running_trials) > 0 * fix about trial number * Fix TPE resumption Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix codestyle Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>
aramoto99
added a commit
that referenced
this pull request
Aug 30, 2022
* Data management function by database is added. By adding the `--fs` option argument to the startup command, data management functions by the conventional file system can be used. Extensive refactoring was performed around the addition of this functionality. * Update setup.py * Delete tests/test_data/work/state/ as it is not used in develop/database. * Develop/database fix test (#18) * fix for tests * delete space * pInfoDict -> p_info * Merge main into debelop/database (#31) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * fix codestyle test (#26) * fix for pycodestyle * add flake8==4.0.1 * Feature/update readme (#25) * update README * add bash Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix resumption test for DB Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Feature/database (#36) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * Fixed a problem in which Snapshot could not be saved during parallel execution. * Add function of delete any data in DB/FS. * Fix code style Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> * Request to merge cumulative changes . (#37) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * The report generation function can now be called by command. * Fix data inconsistency when excute resume. (#39) * Fix resume * Fixed problem with sirialize not working in fs mode * Remove unused package imports * Fixed a problem that the resume function did not work in fs mode. * The name workspace/state is the name of the old specification, so it was changed to the appropriate name workspace/snapshot. * Delete unnecessary directories in Workspace. * Delete unnecessary directories in Workspace. * Delete unnecessary directories in Workspace. * Delete unnecessary directories in Workspace. Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> * Add dynamic loading of optimizer, And fix resumtion test. (#42) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * fix codestyle test (#26) * fix for pycodestyle * add flake8==4.0.1 * Feature/update readme (#25) * update README * add bash Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix TPE resumtion test (#29) * Fix tpe resumption test * fix tpe resumption test * Fix tep resumption test * add retry (#38) * Add dynamic loading of optimizer (#34) * (WIP) Add dynamic loading of optimizer by importlib. * (WIP) Add dynamic loading of optimizer by importlib. * Add dynamic loading of optimizer by importlib * Add dynamic loading of optimizer by importlib * Fix test code * fix test * Fix resumtioin test * Add dynamic loading of optimizer * Fix dynamic loading of optimizer * Function names and comments were rolled back. * Changed the standard optimizer specification method * changed the specification method for importing the standard optimizer. * change deserialize (#40) Co-authored-by: aramoto99 <aramoto-masahiro@aist.go.jp> * Merge branch 'main' of github:aistairc/aiaccel into feature/database * Fix codestyle * (WIP) Change TPE resume * Fix resume test * Feature/fix resume tpe (#41) * fix resume tpe * fix resume tpe * add if len(running_trials) > 0 * fix about trial number * Fix TPE resumption Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix conflicts with main branch (#43) * Fix #19 (#20) * Fix #21 (#22) * fix README (#23) * fix codestyle test (#26) * fix for pycodestyle * add flake8==4.0.1 * Feature/update readme (#25) * update README * add bash Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * Fix TPE resumtion test (#29) * Fix tpe resumption test * fix tpe resumption test * Fix tep resumption test * add retry (#38) * Add dynamic loading of optimizer (#34) * (WIP) Add dynamic loading of optimizer by importlib. * (WIP) Add dynamic loading of optimizer by importlib. * Add dynamic loading of optimizer by importlib * Add dynamic loading of optimizer by importlib * Fix test code * fix test * Fix resumtioin test * Add dynamic loading of optimizer * Fix dynamic loading of optimizer * Function names and comments were rolled back. * Changed the standard optimizer specification method * changed the specification method for importing the standard optimizer. * change deserialize (#40) Co-authored-by: aramoto99 <aramoto-masahiro@aist.go.jp> * Merge branch 'main' of github:aistairc/aiaccel into feature/database * Fix codestyle * (WIP) Change TPE resume * Fix resume test * Feature/fix resume tpe (#41) * fix resume tpe * fix resume tpe * add if len(running_trials) > 0 * fix about trial number * Fix TPE resumption Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com> * change serialize timing Co-authored-by: aramoto99 <aramoto-masahiro@aist.go.jp> Co-authored-by: aramoto99 <107896581+aramoto99@users.noreply.github.com> Co-authored-by: Takashi OKADA <tk.okada.github@gmail.com> Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix conflicts with main branch by the addition of Optimizer's dynamic loading feature.