From da68cef14ba4e9c411076cdca98ac8030084f628 Mon Sep 17 00:00:00 2001 From: khkim Date: Fri, 8 Jan 2021 12:17:48 +0900 Subject: [PATCH 1/5] Remove useless requirement --- requirements.txt | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2b88c7ab..442c3879 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,22 +1,21 @@ -numpy == 1.18.0 -torch == 1.6.0 -gym == 0.17.3 -atari-py == 0.2.6 -box2d-py == 2.3.8 -scipy == 1.5.4 -opencv-python == 4.4.0.46 -addict == 2.4.0 +numpy==1.18.0 +torch==1.6.0 +gym==0.17.3 +atari-py==0.2.6 +box2d-py==2.3.8 +scipy==1.5.4 +opencv-python==4.4.0.46 +addict==2.4.0 tqdm # for distributed learning -redis == 3.3.2 # for ray -ray == 1.0.1.post1 -chardet == 3.0.4 -pyzmq == 20.0.0 -pyarrow == 2.0.0 +redis==3.3.2 # for ray +ray==1.0.1.post1 +pyzmq==20.0.0 +pyarrow==2.0.0 # for log -six >= 1.13.0 -wandb == 0.10.11 -matplotlib == 3.3.3 -plotly == 4.13.0 +six>=1.13.0 +wandb==0.10.11 +matplotlib==3.3.3 +plotly==4.13.0 From 417fa2bf14e226727b03cd04b386ff321fe9dfc1 Mon Sep 17 00:00:00 2001 From: khkim Date: Fri, 8 Jan 2021 12:59:39 +0900 Subject: [PATCH 2/5] Change activation type on reacher config --- configs/reacher_v2/bc_ddpg.py | 9 ++++----- configs/reacher_v2/bc_sac.py | 11 +++++++---- configs/reacher_v2/ddpg.py | 9 ++++----- configs/reacher_v2/sac.py | 11 +++++++---- configs/reacher_v2/td3.py | 9 ++++----- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/configs/reacher_v2/bc_ddpg.py b/configs/reacher_v2/bc_ddpg.py index c99cb46b..dce3aac6 100644 --- a/configs/reacher_v2/bc_ddpg.py +++ b/configs/reacher_v2/bc_ddpg.py @@ -3,9 +3,6 @@ - Author: Kyunghwan Kim - Contact: kh.kim@medipixel.io """ -import torch - -from rl_algorithms.common.helper_functions import identity agent = dict( type="BCDDPGAgent", @@ -34,12 +31,14 @@ head=dict( actor=dict( type="MLP", - configs=dict(hidden_sizes=[256, 256], output_activation=torch.tanh,), + configs=dict(hidden_sizes=[256, 256], output_activation="tanh",), ), critic=dict( type="MLP", configs=dict( - hidden_sizes=[256, 256], output_size=1, output_activation=identity, + hidden_sizes=[256, 256], + output_size=1, + output_activation="identity", ), ), ), diff --git a/configs/reacher_v2/bc_sac.py b/configs/reacher_v2/bc_sac.py index aef6aa58..dd97c118 100644 --- a/configs/reacher_v2/bc_sac.py +++ b/configs/reacher_v2/bc_sac.py @@ -3,7 +3,6 @@ - Author: Kyunghwan Kim - Contact: kh.kim@medipixel.io """ -from rl_algorithms.common.helper_functions import identity agent = dict( type="BCSACAgent", @@ -36,18 +35,22 @@ head=dict( actor=dict( type="TanhGaussianDistParams", - configs=dict(hidden_sizes=[256, 256], output_activation=identity,), + configs=dict(hidden_sizes=[256, 256], output_activation="identity",), ), critic_vf=dict( type="MLP", configs=dict( - hidden_sizes=[256, 256], output_activation=identity, output_size=1, + hidden_sizes=[256, 256], + output_activation="identity", + output_size=1, ), ), critic_qf=dict( type="MLP", configs=dict( - hidden_sizes=[256, 256], output_activation=identity, output_size=1, + hidden_sizes=[256, 256], + output_activation="identity", + output_size=1, ), ), ), diff --git a/configs/reacher_v2/ddpg.py b/configs/reacher_v2/ddpg.py index d2a88f5c..abb7f084 100644 --- a/configs/reacher_v2/ddpg.py +++ b/configs/reacher_v2/ddpg.py @@ -3,9 +3,6 @@ - Author: Kyunghwan Kim - Contact: kh.kim@medipixel.io """ -import torch - -from rl_algorithms.common.helper_functions import identity agent = dict( type="DDPGAgent", @@ -25,12 +22,14 @@ head=dict( actor=dict( type="MLP", - configs=dict(hidden_sizes=[256, 256], output_activation=torch.tanh,), + configs=dict(hidden_sizes=[256, 256], output_activation="tanh",), ), critic=dict( type="MLP", configs=dict( - hidden_sizes=[256, 256], output_size=1, output_activation=identity, + hidden_sizes=[256, 256], + output_size=1, + output_activation="identity", ), ), ), diff --git a/configs/reacher_v2/sac.py b/configs/reacher_v2/sac.py index f6e65104..bf346e95 100644 --- a/configs/reacher_v2/sac.py +++ b/configs/reacher_v2/sac.py @@ -3,7 +3,6 @@ - Author: Kyunghwan Kim - Contact: kh.kim@medipixel.io """ -from rl_algorithms.common.helper_functions import identity agent = dict( type="SACAgent", @@ -27,18 +26,22 @@ head=dict( actor=dict( type="TanhGaussianDistParams", - configs=dict(hidden_sizes=[256, 256], output_activation=identity,), + configs=dict(hidden_sizes=[256, 256], output_activation="identity",), ), critic_vf=dict( type="MLP", configs=dict( - hidden_sizes=[256, 256], output_activation=identity, output_size=1, + hidden_sizes=[256, 256], + output_activation="identity", + output_size=1, ), ), critic_qf=dict( type="MLP", configs=dict( - hidden_sizes=[256, 256], output_activation=identity, output_size=1, + hidden_sizes=[256, 256], + output_activation="identity", + output_size=1, ), ), ), diff --git a/configs/reacher_v2/td3.py b/configs/reacher_v2/td3.py index cd42dac0..47b8b37f 100644 --- a/configs/reacher_v2/td3.py +++ b/configs/reacher_v2/td3.py @@ -3,9 +3,6 @@ - Author: Kyunghwan Kim - Contact: kh.kim@medipixel.io """ -import torch - -from rl_algorithms.common.helper_functions import identity agent = dict( type="TD3Agent", @@ -23,12 +20,14 @@ head=dict( actor=dict( type="MLP", - configs=dict(hidden_sizes=[400, 300], output_activation=torch.tanh,), + configs=dict(hidden_sizes=[400, 300], output_activation="tanh",), ), critic=dict( type="MLP", configs=dict( - hidden_sizes=[400, 300], output_size=1, output_activation=identity, + hidden_sizes=[400, 300], + output_size=1, + output_activation="identity", ), ), ), From 9bac93c80c352fed4fa77bddb26c2768df103953 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 8 Jan 2021 13:06:45 +0900 Subject: [PATCH 3/5] docs: add sehyun-hwang as a contributor (#303) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ README.md | 22 ++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 26bc143b..1536f19b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -76,6 +76,15 @@ "contributions": [ "code" ] + }, + { + "login": "sehyun-hwang", + "name": "Sehyun Hwang", + "avatar_url": "https://avatars3.githubusercontent.com/u/23437715?v=4", + "profile": "https://github.com/sehyun-hwang", + "contributions": [ + "maintenance" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 09d79457..f136228f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/medipixel/rl_algorithms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/medipixel/rl_algorithms/context:python) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-)

@@ -36,21 +36,23 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - - - - - - - + + + + + + + - + +

Jinwoo Park (Curt)

πŸ’»

Kyunghwan Kim

πŸ’»

darthegg

πŸ’»

Mincheol Kim

πŸ’»

κΉ€λ―Όμ„­

πŸ’»

Leejin Jung

πŸ’»

Chris Yoon

πŸ’»

Jinwoo Park (Curt)

πŸ’»

Kyunghwan Kim

πŸ’»

darthegg

πŸ’»

Mincheol Kim

πŸ’»

κΉ€λ―Όμ„­

πŸ’»

Leejin Jung

πŸ’»

Chris Yoon

πŸ’»

Jiseong Han

πŸ’»

Jiseong Han

πŸ’»

Sehyun Hwang

🚧
- + + This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. From 296e4ac8c63f8d46e3a89e8ae519480c3d711443 Mon Sep 17 00:00:00 2001 From: khkim Date: Fri, 8 Jan 2021 14:56:18 +0900 Subject: [PATCH 4/5] Update ray version --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 442c3879..dd334753 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,8 +9,8 @@ addict==2.4.0 tqdm # for distributed learning -redis==3.3.2 # for ray -ray==1.0.1.post1 +redis==3.5.3 # for ray +ray==1.1.0 pyzmq==20.0.0 pyarrow==2.0.0 From 727221d1a30d024c8a7d5585e8618c3efb3717a0 Mon Sep 17 00:00:00 2001 From: khkim Date: Fri, 8 Jan 2021 15:39:35 +0900 Subject: [PATCH 5/5] Fix typo --- tools/check_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check_version.sh b/tools/check_version.sh index 4ce9c094..d4b0b08b 100644 --- a/tools/check_version.sh +++ b/tools/check_version.sh @@ -14,4 +14,4 @@ if [ "$VERSION" = "$TAG" ]; then else echo "Tag and version are not same. Check again." exit 1 -fi; \ No newline at end of file +fi;