Skip to content

initalize gnn network for CIM problem#60

Merged
Jinyu-W merged 33 commits into
v0.1from
v0.1_feature_ecr_gnn
Oct 26, 2020
Merged

initalize gnn network for CIM problem#60
Jinyu-W merged 33 commits into
v0.1from
v0.1_feature_ecr_gnn

Conversation

@wesley-stone
Copy link
Copy Markdown
Contributor

Add a simple solution for the ECR problem:

  1. We use GAT layers to learn the interactions between multi-agents.
  2. We implement the synchronized A2C for multi-processing rollout.

@wesley-stone wesley-stone changed the title initalize gnn netowrk for ECR problem initalize gnn network for ECR problem Sep 23, 2020
@wesley-stone wesley-stone changed the title initalize gnn network for ECR problem initalize gnn network for CIM problem Sep 23, 2020
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor_critic.py Outdated
Comment thread examples/cim/gnn/actor_critic.py Outdated
Comment thread examples/cim/gnn/actor_critic.py Outdated
Comment thread examples/cim/gnn/actor_critic.py Outdated
@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 10, 2020

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.50%. Comparing base (8d89117) to head (ec6d790).
⚠️ Report is 27 commits behind head on v0.1.

Additional details and impacted files
@@           Coverage Diff           @@
##             v0.1      #60   +/-   ##
=======================================
  Coverage   72.50%   72.50%           
=======================================
  Files          86       86           
  Lines        4062     4062           
=======================================
  Hits         2945     2945           
  Misses       1117     1117           
Flag Coverage Δ
unittests 72.50% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown
Contributor

@Jinyu-W Jinyu-W left a comment

Choose a reason for hiding this comment

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

Generally, please read the style guide and go through your PR.

Comment thread examples/cim/gnn/agent_manager.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/actor_critic.py Outdated
Comment thread examples/cim/gnn/agent.py Outdated
Comment thread examples/cim/gnn/agent_manager.py Outdated
Comment thread examples/cim/gnn/config.yml Outdated
Comment thread examples/cim/gnn/launcher.py
@wesley-stone wesley-stone requested a review from Jinyu-W October 15, 2020 06:30
@wesley-stone wesley-stone requested review from Jinyu-W and removed request for Jinyu-W October 15, 2020 08:35
Comment thread examples/cim/gnn/action_shaper.py
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
@wesley-stone wesley-stone requested a review from Jinyu-W October 16, 2020 04:34
Copy link
Copy Markdown
Contributor

@Jinyu-W Jinyu-W left a comment

Choose a reason for hiding this comment

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

Overall, 2 problems are serious:

  1. Please clear the useless code.
  2. Please go through your comments. They should start with a capital letter, end with a period.

Comment thread examples/cim/gnn/action_shaper.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor.py Outdated
Comment thread examples/cim/gnn/actor_critic.py Outdated
Comment thread examples/cim/gnn/agent.py Outdated
Comment thread examples/cim/gnn/experience_shaper.py Outdated
Comment thread examples/cim/gnn/actor_critic.py
Comment thread examples/cim/gnn/launcher.py Outdated
Comment thread examples/cim/gnn/numpy_store.py Outdated
Comment thread examples/cim/gnn/numpy_store.py Outdated
Comment thread examples/cim/gnn/shared_structure.py Outdated
Comment thread examples/cim/gnn/simple_gnn.py
Comment thread examples/cim/gnn/simple_gnn.py Outdated
Comment thread examples/cim/gnn/state_shaper.py Outdated
Comment thread examples/cim/gnn/state_shaper.py Outdated
Comment thread examples/cim/gnn/state_shaper.py Outdated
Copy link
Copy Markdown
Contributor

@Jinyu-W Jinyu-W left a comment

Choose a reason for hiding this comment

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

I think the part of gnn example can be merged into v0.1.

While the change of cim topologies should be merged with the updated naive experiment results (doc).

@wesley-stone wesley-stone requested a review from Jinyu-W October 26, 2020 05:37
@Jinyu-W Jinyu-W merged commit d00f60f into v0.1 Oct 26, 2020
@Jinyu-W Jinyu-W deleted the v0.1_feature_ecr_gnn branch October 30, 2020 09:55
ArthurJiang added a commit that referenced this pull request Nov 5, 2020
…#174)

* refine readme

* feat: refine data push/pull (#138)

* feat: refine data push/pull

* test: add cli provision testing

* fix: style fix

* fix: add necessary comments

* fix: from code review

* add fall back function in weather download (#112)

* fix deployment issue in multi envs

* fix typo

* fix ~/.maro not exist issue in build

* skip deploy when build

* update for comments

* temporarily disable weather info

* replace ecr with cim in setup.py

* replace ecr in manifest

* remove weather check when read data

* fix station id issue

* fix format

* add TODO in comments

* add noaa weather source

* fix weather reset and weather comment

* add comment for weather data url

* some format update

* add fall back function in weather download

* update comment

* update for comments

* update comment

* add period

* fix for pylint

* update for pylint check

* added example docs (#136)

* added example docs

* added citibike greedy example doc

* modified citibike doc

* fixed PR comments

* fixed more PR comments

* fixed small formatting issue

Co-authored-by: ysqyang <v-yangqi@microsoft.com>

* switch the key and value of handler_dict in decorator (#144)

* switch the key and value of handler_dict in decorator

* add dist decorator UT and fixed multithreading conflict in maro test suite

* pr comments update.

* resolved comments about decorator UT

* rename handler_fun in dist decorator

* change self.attr into class_name.attr

* update UT tests comments

* V0.1 annotation (#147)

* refine the annotation of simulator core

* remove reward from env(be)

* format refined

* white spaces test

* left-padding spaces refined

* format modifed

* update the left-padding spaces of docstrings

* code format updated

* update according to comments

* update according to PR comments

Co-authored-by: Jinyu Wang <Wang.Jinyu@microsoft.com>

* V0.1 issues in CLI (#157)

* fix: add docs for AzCopy

* style: refine code style

* fix: change stdout format to previous version

* test: add dqn tests in grass/k8s mode && add "maro k8s job list"

* docs: add scripts for installing AzCopy

* v0.1 update citi bike doc and data version (#160)

* fix deployment issue in multi envs

* fix typo

* fix ~/.maro not exist issue in build

* skip deploy when build

* update for comments

* temporarily disable weather info

* replace ecr with cim in setup.py

* replace ecr in manifest

* remove weather check when read data

* fix station id issue

* fix format

* add TODO in comments

* add noaa weather source

* fix weather reset and weather comment

* add comment for weather data url

* some format update

* add fall back function in weather download

* update comment

* update for comments

* update comment

* add period

* fix for pylint

* update for pylint check

* update data pipeline docs and data version

* update for comments

* update for comments

* update for lint

* update for lint

* update for lint

* V0.1revert data version to 0.1 (#164)

* fix deployment issue in multi envs

* fix typo

* fix ~/.maro not exist issue in build

* skip deploy when build

* update for comments

* temporarily disable weather info

* replace ecr with cim in setup.py

* replace ecr in manifest

* remove weather check when read data

* fix station id issue

* fix format

* add TODO in comments

* add noaa weather source

* fix weather reset and weather comment

* add comment for weather data url

* some format update

* add fall back function in weather download

* update comment

* update for comments

* update comment

* add period

* fix for pylint

* update for pylint check

* update data pipeline docs and data version

* update for comments

* update for comments

* update for lint

* update for lint

* update for lint

* revert data version to 0.1

* initalize gnn network for CIM problem (#60)

* initalize gnn netowrk for ECR problem

* fix import path error and remove useless function

* add the annotation for gnn and state shaper

* rename to cim

* modify topology 22p

* polish coding style in cim.gnn

* run pass after polishing

* change the name of simplegat to simple_transformer

* fix typo and suggestions

* fix format

* fix code bugs due to refactoring mistake

* refine the code format

* refine again

* refine the format

* refine again

* refine again

* fix syntax bug

* refine again

* remove useless comments

* remove unnecessary blank line

* rename pending_event to decision_event

* remove some code faced to the future.

* change topology

* fix bugs in learner: no training logic executed

* revert the topology changes

Co-authored-by: wenshi-113 <wenshi@microsoft.com>

* V0.1 store unpicklable bug fix (#166)

* fixed unpicklable store bug

* fixed a bug

* fixed a bug

* fixed a bug

* fixed lint formatting

* fixed a lint formatting issue

* fixed a bug

* renamed dump_experience_store to dump_experience_pool

* fixed a PR comment

Co-authored-by: ysqyang <v-yangqi@microsoft.com>

* V0.1 confusing component naming fix (#167)

* confusing component naming fix

* fixed a bug

* fixed a bug

* fixed lint formatting issues

* fixed a PR comment

* replaced 'actor_worker' with 'actor'

* fixed a minor formatting issue

* fixed a minor formatting issue

* fixed a minor formatting issue

Co-authored-by: ysqyang <v-yangqi@microsoft.com>

* version updated to 0.1.2a0

* modified according to flake8

* update according to lint checker

* update import format according to lint checker

* update according to lint checker

* isort config added

* add isort config file path in lint

* update import according to lint isort

* update import according to lint isort

Co-authored-by: Arthur Jiang <sjian@microsoft.com>
Co-authored-by: Arthur Jiang <ArthurSJiang@gmail.com>
Co-authored-by: Romic Huang <romic.kid@gmail.com>
Co-authored-by: zhanyu wang <pocket_2001@163.com>
Co-authored-by: ysqyang <ysqyang@gmail.com>
Co-authored-by: ysqyang <v-yangqi@microsoft.com>
Co-authored-by: kaiqli <59279714+kaiqli@users.noreply.github.com>
Co-authored-by: Jinyu Wang <Wang.Jinyu@microsoft.com>
Co-authored-by: Jinyu Wang <jinywan@microsoft.com>
Co-authored-by: WesleyStone <4548088+wesley-stone@users.noreply.github.com>
Co-authored-by: wenshi-113 <wenshi@microsoft.com>
Jinyu-W added a commit that referenced this pull request Nov 5, 2020
* refine readme

* feat: refine data push/pull (#138)

* feat: refine data push/pull

* test: add cli provision testing

* fix: style fix

* fix: add necessary comments

* fix: from code review

* add fall back function in weather download (#112)

* fix deployment issue in multi envs

* fix typo

* fix ~/.maro not exist issue in build

* skip deploy when build

* update for comments

* temporarily disable weather info

* replace ecr with cim in setup.py

* replace ecr in manifest

* remove weather check when read data

* fix station id issue

* fix format

* add TODO in comments

* add noaa weather source

* fix weather reset and weather comment

* add comment for weather data url

* some format update

* add fall back function in weather download

* update comment

* update for comments

* update comment

* add period

* fix for pylint

* update for pylint check

* added example docs (#136)

* added example docs

* added citibike greedy example doc

* modified citibike doc

* fixed PR comments

* fixed more PR comments

* fixed small formatting issue

Co-authored-by: ysqyang <v-yangqi@microsoft.com>

* switch the key and value of handler_dict in decorator (#144)

* switch the key and value of handler_dict in decorator

* add dist decorator UT and fixed multithreading conflict in maro test suite

* pr comments update.

* resolved comments about decorator UT

* rename handler_fun in dist decorator

* change self.attr into class_name.attr

* update UT tests comments

* V0.1 annotation (#147)

* refine the annotation of simulator core

* remove reward from env(be)

* format refined

* white spaces test

* left-padding spaces refined

* format modifed

* update the left-padding spaces of docstrings

* code format updated

* update according to comments

* update according to PR comments

Co-authored-by: Jinyu Wang <Wang.Jinyu@microsoft.com>

* V0.1 issues in CLI (#157)

* fix: add docs for AzCopy

* style: refine code style

* fix: change stdout format to previous version

* test: add dqn tests in grass/k8s mode && add "maro k8s job list"

* docs: add scripts for installing AzCopy

* v0.1 update citi bike doc and data version (#160)

* fix deployment issue in multi envs

* fix typo

* fix ~/.maro not exist issue in build

* skip deploy when build

* update for comments

* temporarily disable weather info

* replace ecr with cim in setup.py

* replace ecr in manifest

* remove weather check when read data

* fix station id issue

* fix format

* add TODO in comments

* add noaa weather source

* fix weather reset and weather comment

* add comment for weather data url

* some format update

* add fall back function in weather download

* update comment

* update for comments

* update comment

* add period

* fix for pylint

* update for pylint check

* update data pipeline docs and data version

* update for comments

* update for comments

* update for lint

* update for lint

* update for lint

* V0.1revert data version to 0.1 (#164)

* fix deployment issue in multi envs

* fix typo

* fix ~/.maro not exist issue in build

* skip deploy when build

* update for comments

* temporarily disable weather info

* replace ecr with cim in setup.py

* replace ecr in manifest

* remove weather check when read data

* fix station id issue

* fix format

* add TODO in comments

* add noaa weather source

* fix weather reset and weather comment

* add comment for weather data url

* some format update

* add fall back function in weather download

* update comment

* update for comments

* update comment

* add period

* fix for pylint

* update for pylint check

* update data pipeline docs and data version

* update for comments

* update for comments

* update for lint

* update for lint

* update for lint

* revert data version to 0.1

* initalize gnn network for CIM problem (#60)

* initalize gnn netowrk for ECR problem

* fix import path error and remove useless function

* add the annotation for gnn and state shaper

* rename to cim

* modify topology 22p

* polish coding style in cim.gnn

* run pass after polishing

* change the name of simplegat to simple_transformer

* fix typo and suggestions

* fix format

* fix code bugs due to refactoring mistake

* refine the code format

* refine again

* refine the format

* refine again

* refine again

* fix syntax bug

* refine again

* remove useless comments

* remove unnecessary blank line

* rename pending_event to decision_event

* remove some code faced to the future.

* change topology

* fix bugs in learner: no training logic executed

* revert the topology changes

Co-authored-by: wenshi-113 <wenshi@microsoft.com>

* V0.1 store unpicklable bug fix (#166)

* fixed unpicklable store bug

* fixed a bug

* fixed a bug

* fixed a bug

* fixed lint formatting

* fixed a lint formatting issue

* fixed a bug

* renamed dump_experience_store to dump_experience_pool

* fixed a PR comment

Co-authored-by: ysqyang <v-yangqi@microsoft.com>

* V0.1 confusing component naming fix (#167)

* confusing component naming fix

* fixed a bug

* fixed a bug

* fixed lint formatting issues

* fixed a PR comment

* replaced 'actor_worker' with 'actor'

* fixed a minor formatting issue

* fixed a minor formatting issue

* fixed a minor formatting issue

Co-authored-by: ysqyang <v-yangqi@microsoft.com>

* version updated to 0.1.2a0

* modified according to flake8

* update according to lint checker

* update import format according to lint checker

* update according to lint checker

* isort config added

* add isort config file path in lint

* update import according to lint isort

* update import according to lint isort

* skip file added for isort linter

* filter files option added for isort

* V0.1 reformat imports with isort (#184)

* init auto-isort

* re-format maro init

* redis added to isort known third party

* update according to lint isort

* update according to lint isort

* update according to lint

* update import path for communication module

* update import path for cli scripts module

* update according to lint

* filter file option added for isort in CONTRIBUTING

* update import path for cli utils and communication

* update import path for tests

* remove filter file option in CONTRIBUTING

Co-authored-by: Jinyu Wang <Wang.Jinyu@microsoft.com>

* update according to isort

Co-authored-by: Arthur Jiang <sjian@microsoft.com>
Co-authored-by: Romic Huang <romic.kid@gmail.com>
Co-authored-by: zhanyu wang <pocket_2001@163.com>
Co-authored-by: ysqyang <ysqyang@gmail.com>
Co-authored-by: ysqyang <v-yangqi@microsoft.com>
Co-authored-by: kaiqli <59279714+kaiqli@users.noreply.github.com>
Co-authored-by: Jinyu-W <53509467+Jinyu-W@users.noreply.github.com>
Co-authored-by: Jinyu Wang <Wang.Jinyu@microsoft.com>
Co-authored-by: Jinyu Wang <jinywan@microsoft.com>
Co-authored-by: WesleyStone <4548088+wesley-stone@users.noreply.github.com>
Co-authored-by: wenshi-113 <wenshi@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants