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.

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

Add Job dispatcher #360

Merged
merged 46 commits into from
Jun 19, 2024
Merged

Add Job dispatcher #360

merged 46 commits into from
Jun 19, 2024

Conversation

aramoto99
Copy link
Collaborator

aiaccel/job/* に,ABCI 向けのジョブディスパッチャを追加.

@aramoto99 aramoto99 requested a review from yoshipon March 11, 2024 01:35
@aramoto99 aramoto99 marked this pull request as ready for review March 11, 2024 01:38
Copy link
Collaborator

@yoshipon yoshipon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PRありがとうございます!細かい部分ですが,コメントしたので反映お願いします.

aiaccel/job/xml_to_dict.py Outdated Show resolved Hide resolved
aiaccel/__init__.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@yoshipon yoshipon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

遅くなりすみません,細かく読みました.

aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
aiaccel/job/dispatcher.py Outdated Show resolved Hide resolved
@yoshipon
Copy link
Collaborator

今のコード拝見してて思ったんですが,ロジックはExecutorに全部うつして,AbciJobはデータ (dataclass) のみにした方が見通しが良いですかね…?

@aramoto99 aramoto99 requested a review from yoshipon April 30, 2024 06:10
Copy link
Collaborator

@yoshipon yoshipon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushありがとうございます.いくつか気になった部分があったので,ご対応頂けますと幸いです.
このmatch文カッコいいですね.

aiaccel/job/abci_job_manager.py Outdated Show resolved Hide resolved
aiaccel/job/abci_job_manager.py Outdated Show resolved Hide resolved
tests/job/_test_abci_job.py Outdated Show resolved Hide resolved
aiaccel/job/abci_job.py Show resolved Hide resolved
aiaccel/job/abci_job.py Outdated Show resolved Hide resolved
@aramoto99 aramoto99 requested a review from yoshipon May 8, 2024 08:12
@aramoto99 aramoto99 force-pushed the feature/v2-jobexecutor branch from e162b5a to 7a059f7 Compare May 14, 2024 01:43
Copy link
Collaborator

@yoshipon yoshipon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PRありがとうございます! 何点かコメントしましたので、ご対応お願い致します。

tests/job/test_abci_job.py Outdated Show resolved Hide resolved
tests/job/test_abci_job.py Outdated Show resolved Hide resolved
tests/job/test_abci_job.py Outdated Show resolved Hide resolved
tests/job/test_abci_job.py Outdated Show resolved Hide resolved
tests/job/test_abci_job.py Outdated Show resolved Hide resolved
@aramoto99 aramoto99 requested a review from yoshipon May 23, 2024 00:41
@aramoto99
Copy link
Collaborator Author

@ yoshipon
遅くなり申し訳ございません,Changes requested への対応,完了しました.

Copy link
Collaborator

@yoshipon yoshipon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ありがとうございます!

@yoshipon yoshipon merged commit b8c0b1b into develop/v2 Jun 19, 2024
6 checks passed
@aramoto99 aramoto99 deleted the feature/v2-jobexecutor branch July 8, 2024 06:22
yoshipon added a commit that referenced this pull request Aug 26, 2024
* Add nelder-mead sampler (#346)

* add nelder_mead_sampler.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add -e. (#371)

* Support for suggest_int in neldermead sampler. (#373)

* Support for suggest_int.

* Fix for ruff.

* Add Job dispatcher (#360)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* fix test

* fix test

* fix test

* remove __future__.annotations

* A bit simplify qstat_xml

* Simplify tests

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add ignore_missing_imports. (#376)

* Draft Implementation of CLI Command (#369)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* Add 'start.py'

* Fix code format

* update pyproject.toml

* Remove unnecessary items from config

* Add random seed option

* Refactor examples/start.py into aiaccel/apps/optimize.py

* fix lint errors and warnings

* remove apps/config

* fix typo

* change config.yaml format

* fix apps/optimizer

* fix HparamManager __init__

* fix HparamsManager

* Refactor Suggest class to use generics for improved type safety

* auto fix by ruff

* add optuna suggest wrapper

* format fix

* Update wrapper.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add nm docstring and move file (#381)

* Add docstring.

* Move nelder_mead_sampler.py.

* Fix path.

* Move test files.

* autoformat and fix mypy error

* Add v2 torch docstring   (#384)

* add docstring

* Update abci_environment.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

---------

Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com>
Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>
aramoto99 added a commit that referenced this pull request Sep 2, 2024
* Add nelder-mead sampler (#346)

* add nelder_mead_sampler.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add -e. (#371)

* Support for suggest_int in neldermead sampler. (#373)

* Support for suggest_int.

* Fix for ruff.

* Add Job dispatcher (#360)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* fix test

* fix test

* fix test

* remove __future__.annotations

* A bit simplify qstat_xml

* Simplify tests

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add ignore_missing_imports. (#376)

* Draft Implementation of CLI Command (#369)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* Add 'start.py'

* Fix code format

* update pyproject.toml

* Remove unnecessary items from config

* Add random seed option

* Refactor examples/start.py into aiaccel/apps/optimize.py

* fix lint errors and warnings

* remove apps/config

* fix typo

* change config.yaml format

* fix apps/optimizer

* fix HparamManager __init__

* fix HparamsManager

* Refactor Suggest class to use generics for improved type safety

* auto fix by ruff

* add optuna suggest wrapper

* format fix

* Update wrapper.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add nm docstring and move file (#381)

* Add docstring.

* Move nelder_mead_sampler.py.

* Fix path.

* Move test files.

* autoformat and fix mypy error

* Add v2 torch docstring   (#384)

* add docstring

* Update abci_environment.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

---------

Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com>
Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>
aramoto99 added a commit that referenced this pull request Sep 2, 2024
* Add nelder-mead sampler (#346)

* add nelder_mead_sampler.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add -e. (#371)

* Support for suggest_int in neldermead sampler. (#373)

* Support for suggest_int.

* Fix for ruff.

* Add Job dispatcher (#360)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* fix test

* fix test

* fix test

* remove __future__.annotations

* A bit simplify qstat_xml

* Simplify tests

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add ignore_missing_imports. (#376)

* Draft Implementation of CLI Command (#369)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* Add 'start.py'

* Fix code format

* update pyproject.toml

* Remove unnecessary items from config

* Add random seed option

* Refactor examples/start.py into aiaccel/apps/optimize.py

* fix lint errors and warnings

* remove apps/config

* fix typo

* change config.yaml format

* fix apps/optimizer

* fix HparamManager __init__

* fix HparamsManager

* Refactor Suggest class to use generics for improved type safety

* auto fix by ruff

* add optuna suggest wrapper

* format fix

* Update wrapper.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add nm docstring and move file (#381)

* Add docstring.

* Move nelder_mead_sampler.py.

* Fix path.

* Move test files.

* autoformat and fix mypy error

* Add v2 torch docstring   (#384)

* add docstring

* Update abci_environment.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

---------

Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com>
Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>
yoshipon added a commit that referenced this pull request Sep 20, 2024
* Add torch goodies

* Add type annotations

* Add small things

* update for mypy

* Add several tests

* add test for hdf5_dataset.py

* Update workflows

* Add tests

* update workflows

* add dependencies

* update train.py

* add opt_lightning_module

* add opt_lightning_module

* Update error messages!

* Update hdf5_dataset to take grp_list as argument

* sort grp_list

* update v2 torch   (#383)

* Add nelder-mead sampler (#346)

* add nelder_mead_sampler.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add -e. (#371)

* Support for suggest_int in neldermead sampler. (#373)

* Support for suggest_int.

* Fix for ruff.

* Add Job dispatcher (#360)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* fix test

* fix test

* fix test

* remove __future__.annotations

* A bit simplify qstat_xml

* Simplify tests

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add ignore_missing_imports. (#376)

* Draft Implementation of CLI Command (#369)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* Add 'start.py'

* Fix code format

* update pyproject.toml

* Remove unnecessary items from config

* Add random seed option

* Refactor examples/start.py into aiaccel/apps/optimize.py

* fix lint errors and warnings

* remove apps/config

* fix typo

* change config.yaml format

* fix apps/optimizer

* fix HparamManager __init__

* fix HparamsManager

* Refactor Suggest class to use generics for improved type safety

* auto fix by ruff

* add optuna suggest wrapper

* format fix

* Update wrapper.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add nm docstring and move file (#381)

* Add docstring.

* Move nelder_mead_sampler.py.

* Fix path.

* Move test files.

* autoformat and fix mypy error

* Add v2 torch docstring   (#384)

* add docstring

* Update abci_environment.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

---------

Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com>
Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add torch goodies

* Add type annotations

* Add small things

* update for mypy

* Add several tests

* add test for hdf5_dataset.py

* Update workflows

* Add tests

* update workflows

* add dependencies

* update train.py

* add opt_lightning_module

* Update error messages!

* add opt_lightning_module

* Update hdf5_dataset to take grp_list as argument

* sort grp_list

* update v2 torch   (#383)

* Add nelder-mead sampler (#346)

* add nelder_mead_sampler.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add -e. (#371)

* Support for suggest_int in neldermead sampler. (#373)

* Support for suggest_int.

* Fix for ruff.

* Add Job dispatcher (#360)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* fix test

* fix test

* fix test

* remove __future__.annotations

* A bit simplify qstat_xml

* Simplify tests

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add ignore_missing_imports. (#376)

* Draft Implementation of CLI Command (#369)

* Update aiaccel/job

* fix lint error

* fix aiaccel/job/dispatcher.py

* wip

* Fix issues pointed out in review

* rename

* fix test

* fix for test

* fix for test

* fix for test

* fix for test

* Reflected code review feedback

* fix test

* fix test

* refactoring

* Run code formatter ruff

* refactoring

* Run code formatter ruff

* fix lint.yaml

* fix pypoject.toml

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* fix mypy.ini

* Refactor abci jobs

* Update pyproject.toml

* adjusted to work in the ABCI environment.

* fix lint error

* fix test

* fix test

* Changed from unittest to pytest

* Incorporate revisions based on review feedback

* Add test items

* Add 'start.py'

* Fix code format

* update pyproject.toml

* Remove unnecessary items from config

* Add random seed option

* Refactor examples/start.py into aiaccel/apps/optimize.py

* fix lint errors and warnings

* remove apps/config

* fix typo

* change config.yaml format

* fix apps/optimizer

* fix HparamManager __init__

* fix HparamsManager

* Refactor Suggest class to use generics for improved type safety

* auto fix by ruff

* add optuna suggest wrapper

* format fix

* Update wrapper.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* Add nm docstring and move file (#381)

* Add docstring.

* Move nelder_mead_sampler.py.

* Fix path.

* Move test files.

* autoformat and fix mypy error

* Add v2 torch docstring   (#384)

* add docstring

* Update abci_environment.py

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

---------

Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com>
Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>

* fix confrict

* Fixed consistency in revision history

* Fixed consistency in revision history(2)

---------

Co-authored-by: Yoshiaki Bando <yoshipon@users.noreply.github.com>
Co-authored-by: Yoshiaki Bando <3883362-yoshipon@users.noreply.gitlab.com>
Co-authored-by: KanaiYuma-aist <105629713+KanaiYuma-aist@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants