From bda5ed6d964a422fad2687dfd9a043cdc49c0381 Mon Sep 17 00:00:00 2001 From: Alexandra McCoy Date: Mon, 4 Nov 2024 10:32:30 -0500 Subject: [PATCH 1/8] Updated pip install command --- dist/spinup-0.2.0-py3-none-any.whl | Bin 0 -> 1994 bytes docs/user/installation.rst | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 dist/spinup-0.2.0-py3-none-any.whl diff --git a/dist/spinup-0.2.0-py3-none-any.whl b/dist/spinup-0.2.0-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..8da77cb63c7dd220f8abdd7c92ddfabfc013379f GIT binary patch literal 1994 zcmaKt3pCSh7{LFV4Mq5}u9{nt(k|wHYtzh;sb)k%vNG`zGRnuWLSnKNhHkF8WhT-m zKIIaU%bKFww?xMriKN`+TXi~}cFw-{Jizn=NCU}vF!9!@3#zi-# z*&VX&>DijGZk?Nl)F|(=Zg0U;lH9Z|QmRW<;xbet8Haz zwR;E64l8_>5BEsjeg*fL^d%Vm++Z*c+uHesi?x9o3ozqML^C9oIS^3u{55Xf*-Ed3 zGyJ)QQ?>M4+EZ{ZKN%}q8d`r+wYvR6Vb#HQPi2=VRMWGE{odM4lh!BC;@NTU-%kiw ziL<9fJrg~+;XWi7&nM#K3Jn?6!LQk0BW@deDqT|u0;g^rZP`Y_kWL*A*t7fkl6+GH z91l5vZ+qp9v773bcJucP(+LdBK>v;V7NHC{>R4KOM2^1|H;}S)?7jV_0PF&H+U>UM zVq@q#Ju5>h&jr5ZZ5dg2?cVGkMM51uD6zL(NX)Car=&E~h<+DtUGTL28haGq+EQP3 zt|?9R&5DVr9Ou7%1+mQ<5VwRXRZ`=oI^H!O;Jp}2-3b-=$$NBAO4)>41fP+PWOJ3ujkvm@$o($NV5fg{>8!Hu zBab;5jEqi0#-jwBZ!|kaZC#E-7;<3M@#t>vR-+;nf?+^?>A8O$NXc_%F{SJ>O|{aU z%r>+Q=Vdf=;`olWgNHL~SVgYyyGqJ)N()Ha(aIvwqaj^+vKi=PhRw2xOT^)=2(->iY(3Z7R zZ*2+9NkuK5HSBl=^lErPt0OVE{RJ=N`E|=Q%hT#wo%`*~V?i3Mz-~@HCCWc{q$zLT z#pN9eRWOB_bS68dWZuyJS%LMGeW48YlITQ1F|w3xp;@ez(jXJE#8VBtOgYdvq6}Nm znb*BbY>6m&Ae;3juZMVg*7VhKUnYF;Dj%QqhLU9LmO~bi=m95k9GJQ($$dwUOlzt8 zA?T?3Yyk%1GMQ}WyzrseJ!y=5t8+IEAK^<}vZ-jREwr;M-a#$$cg@eahgL$pCXugn z!7ThOH|f%nREFXcVNM()y{i}3XnK6AeI()*f2CZ^S#s(dI2bcBZsAwga{y7^Q6AG3 z`K32L%x~i&^!NILJ}K&ZitFkjjxEyb>t;_NI6|8YR=1!Pp?t4m{&Pjljyy;-gI|#@ z=t4$ciesPMrCdjU<8eB-bAwQ+uWQyw08Zebdta+8D^|apGrimR|3Aa^j*Sz_+GE8`-j2;#wqd`%Wy%d`NnG1nt%fg+zIl1KQy1-ab zrfMwJ`8d8`G|GI7OSS;N@bG5}?I$Y+w9A1E(ZJk`pc?-7&}kY5;Bbs?c@(XT9Rlkj7K%Vz?oQYR>=plbBR=+t-u#K9`R2d2C2 z5u@`YyXFHo+&se=f8#S@_K4~ca=(Wwf|jhCd?x~yvaSv4A(&bJbkA}a#>|+AIy$Y{ zoT!lvjK_dTL=YGzBYkR!3-^5$GQJ)EKSLy0k}dp$1OSDM`{JgS!ur|Jk}yeMf59}w z15OI;yS Date: Mon, 4 Nov 2024 10:36:20 -0500 Subject: [PATCH 2/8] updated pip install command --- docs/user/installation.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/user/installation.rst b/docs/user/installation.rst index d54a131f5..4ee703007 100644 --- a/docs/user/installation.rst +++ b/docs/user/installation.rst @@ -83,10 +83,11 @@ Installing Spinning Up cd spinningup pip install -e . - *Note* I had to use `• pip wheel --no-deps -w dist .` to move past this step. A reference was deprecated and I believe the redownloading of dependencies helped. - Will need to look into this more, getting it up and running was the priority. - -.. admonition:: You Should Know +.. admonition:: + *Note* I had to use `pip wheel --no-deps -w dist .` to move past this step. A reference was deprecated and I believe the omittion of + re-downloading of dependencies helped. I will need to look into this more, getting it up and running was the priority. + + You Should Know Spinning Up defaults to installing everything in Gym **except** the MuJoCo environments. In case you run into any trouble with the Gym installation, check out the `Gym`_ github page for help. If you want the MuJoCo environments, see the optional installation section below. From 9e10e757e21601d0e6f1eedcfc32d7ea944c2678 Mon Sep 17 00:00:00 2001 From: Alexandra McCoy Date: Mon, 4 Nov 2024 18:22:09 -0500 Subject: [PATCH 3/8] updated the tf api reference --- spinup/utils/mpi_tf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spinup/utils/mpi_tf.py b/spinup/utils/mpi_tf.py index 96cbcf5e0..73da85387 100644 --- a/spinup/utils/mpi_tf.py +++ b/spinup/utils/mpi_tf.py @@ -26,7 +26,7 @@ def sync_all_params(): return sync_params(tf.global_variables()) -class MpiAdamOptimizer(tf.train.AdamOptimizer): +class MpiAdamOptimizer(tf.compat.v1.train.AdamOptimizer): """ Adam optimizer that averages gradients across MPI processes. From 462f050b5af2cfc4fd9b90a1edfd0cf94aad4be8 Mon Sep 17 00:00:00 2001 From: Alexandra McCoy Date: Mon, 4 Nov 2024 19:16:51 -0500 Subject: [PATCH 4/8] Updated environments api and import statement --- spinup/run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spinup/run.py b/spinup/run.py index 9b8526e88..3b8b0c21b 100644 --- a/spinup/run.py +++ b/spinup/run.py @@ -3,7 +3,7 @@ from spinup.utils.run_utils import ExperimentGrid from spinup.utils.serialization_utils import convert_json import argparse -import gym +import gymnasium as gym import json import os, subprocess, sys import os.path as osp @@ -153,7 +153,7 @@ def process(arg): # Special handling for environment: make sure that env_name is a real, # registered gym environment. - valid_envs = [e.id for e in list(gym.envs.registry.all())] + valid_envs = [e.id for e in list(gym.envs.registry.keys())] assert 'env_name' in arg_dict, \ friendly_err("You did not give a value for --env_name! Add one and try again.") for env_name in arg_dict['env_name']: From e9c3647ca5e51144d6b4bcc35296aa64247d2dec Mon Sep 17 00:00:00 2001 From: Alexandra McCoy Date: Mon, 11 Nov 2024 22:03:12 -0500 Subject: [PATCH 5/8] Updated line 156 --- spinup/run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spinup/run.py b/spinup/run.py index 3b8b0c21b..6b88c7869 100644 --- a/spinup/run.py +++ b/spinup/run.py @@ -153,7 +153,7 @@ def process(arg): # Special handling for environment: make sure that env_name is a real, # registered gym environment. - valid_envs = [e.id for e in list(gym.envs.registry.keys())] + valid_envs = [id for e in list(gym.envs.registry.keys())] assert 'env_name' in arg_dict, \ friendly_err("You did not give a value for --env_name! Add one and try again.") for env_name in arg_dict['env_name']: @@ -245,4 +245,4 @@ def process(arg): # Assume that the user plans to execute an algorithm. Run custom # parsing on the arguments and build a grid search to execute. args = sys.argv[2:] - parse_and_execute_grid_search(cmd, args) + parse_and_execute_grid_search(cmd, args) \ No newline at end of file From 89b449688c7ea82855c44f33a7bc0313676c507f Mon Sep 17 00:00:00 2001 From: Alexandra McCoy Date: Thu, 6 Feb 2025 11:01:59 -0500 Subject: [PATCH 6/8] Updated package versioning on pip install --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 16116a784..31ff24307 100644 --- a/setup.py +++ b/setup.py @@ -18,16 +18,16 @@ 'gym[atari,box2d,classic_control]~=0.15.3', 'ipython', 'joblib', - 'matplotlib==3.1.1', + 'matplotlib==3.10.0', 'mpi4py', 'numpy', 'pandas', 'pytest', 'psutil', 'scipy', - 'seaborn==0.8.1', - 'tensorflow>=1.8.0,<2.0', - 'torch==1.3.1', + 'seaborn==0.13.2', + 'tensorflow==2.18.0', + 'torch==2.6.0', 'tqdm' ], description="Teaching tools for introducing people to deep RL.", From f7b55327c3c4aa25d64f343fa6dfb0fd1c33b05c Mon Sep 17 00:00:00 2001 From: Alexandra McCoy Date: Thu, 6 Feb 2025 11:09:51 -0500 Subject: [PATCH 7/8] changes to updated python version. 3.13 does not support tf yet. --- dist/spinup-0.2.0-py3.12.egg | Bin 0 -> 1293 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dist/spinup-0.2.0-py3.12.egg diff --git a/dist/spinup-0.2.0-py3.12.egg b/dist/spinup-0.2.0-py3.12.egg new file mode 100644 index 0000000000000000000000000000000000000000..f64dead9ee257e0c271476b4a76b49322d5bbcac GIT binary patch literal 1293 zcmWIWW@Zs#U|`^2=m~U-daRZ-U4fB-!JLVKK@ceF>h7-V>F4IJAK(pPC)GZLO&s)m(<@Whzztr(%o_sE^X!`3-lRe_TC7)kiZx%Bpaen|xaK22CdXfVS#%(|h3S@Y2 z2K$EwIlBhyl~j~`{#a7>mAmYzmY=Ss?gi}?Pqg$-oMGM+bop|r@#jmQzB2E*TWb6F z&L2aSroYb3b7GsndTDtXJP8Wo4*DDv^m&r@<6@)Fo4Pk@X?f}DoYnCRn_P{K(4s(;=LR0o8Sr*{&Ng16>7-Zw6Up*QKNuq~@ih<|S9g=Vaz( z7lWMn7+rVtN0sCmKwW!*SQJ@zQEFjnW>G3wmuTN!zC#8A&EKo1X=O1vvmfeKX!#VJ z@n917$CbmX$h|qw=aIceb5FsxFzv-AHrr|n-$Y5-)cVRW?YbAdgH`Je$9j8f zt;JV4R_5&qXjHHCk=yjR>qydCTMgYMF_$;y1zgjKitSw2T=MK(!0%I>3)veT=FeRo zwx&US<;NJSt=5;Gr(Cg^^Ypq(v5&6K?~{k;RUYT5M-7Ou?MG*F0=>Wv#A3)^DakL0 z&q*yy%>jjgHZWeabswOI19B*$WSOeW0^Q=ov{Z1&F*1oT>zd$R=P*2?2S#z`&A5V_+JGI|CLe0p6@^ASG--I0@+GR8U4>0047N BpydDn literal 0 HcmV?d00001 From d672e95be8f7b01306bcd752a7fb5dbd0337a34f Mon Sep 17 00:00:00 2001 From: Alexandra McCoy Date: Thu, 6 Feb 2025 11:46:34 -0500 Subject: [PATCH 8/8] Updated packages and imports to gymnasium --- spinup/algos/pytorch/ddpg/ddpg.py | 2 +- spinup/algos/pytorch/ppo/core.py | 2 +- spinup/algos/pytorch/ppo/ppo.py | 2 +- spinup/algos/pytorch/sac/sac.py | 2 +- spinup/algos/pytorch/td3/td3.py | 2 +- spinup/algos/pytorch/vpg/core.py | 2 +- spinup/algos/pytorch/vpg/vpg.py | 2 +- spinup/algos/tf1/ddpg/ddpg.py | 2 +- spinup/algos/tf1/ppo/core.py | 2 +- spinup/algos/tf1/ppo/ppo.py | 2 +- spinup/algos/tf1/sac/sac.py | 2 +- spinup/algos/tf1/td3/td3.py | 2 +- spinup/algos/tf1/trpo/core.py | 2 +- spinup/algos/tf1/trpo/trpo.py | 2 +- spinup/algos/tf1/vpg/core.py | 2 +- spinup/algos/tf1/vpg/vpg.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spinup/algos/pytorch/ddpg/ddpg.py b/spinup/algos/pytorch/ddpg/ddpg.py index 1416a2123..a18673431 100644 --- a/spinup/algos/pytorch/ddpg/ddpg.py +++ b/spinup/algos/pytorch/ddpg/ddpg.py @@ -2,7 +2,7 @@ import numpy as np import torch from torch.optim import Adam -import gym +import gymnasium import time import spinup.algos.pytorch.ddpg.core as core from spinup.utils.logx import EpochLogger diff --git a/spinup/algos/pytorch/ppo/core.py b/spinup/algos/pytorch/ppo/core.py index 84e9f9889..1710eb36a 100644 --- a/spinup/algos/pytorch/ppo/core.py +++ b/spinup/algos/pytorch/ppo/core.py @@ -1,6 +1,6 @@ import numpy as np import scipy.signal -from gym.spaces import Box, Discrete +from gymnasium.spaces import Box, Discrete import torch import torch.nn as nn diff --git a/spinup/algos/pytorch/ppo/ppo.py b/spinup/algos/pytorch/ppo/ppo.py index a77ed9daf..c67069009 100644 --- a/spinup/algos/pytorch/ppo/ppo.py +++ b/spinup/algos/pytorch/ppo/ppo.py @@ -1,7 +1,7 @@ import numpy as np import torch from torch.optim import Adam -import gym +import gymnasium import time import spinup.algos.pytorch.ppo.core as core from spinup.utils.logx import EpochLogger diff --git a/spinup/algos/pytorch/sac/sac.py b/spinup/algos/pytorch/sac/sac.py index e463d39f2..693446734 100644 --- a/spinup/algos/pytorch/sac/sac.py +++ b/spinup/algos/pytorch/sac/sac.py @@ -3,7 +3,7 @@ import numpy as np import torch from torch.optim import Adam -import gym +import gymnasium import time import spinup.algos.pytorch.sac.core as core from spinup.utils.logx import EpochLogger diff --git a/spinup/algos/pytorch/td3/td3.py b/spinup/algos/pytorch/td3/td3.py index 2d59875c2..cb314a822 100644 --- a/spinup/algos/pytorch/td3/td3.py +++ b/spinup/algos/pytorch/td3/td3.py @@ -3,7 +3,7 @@ import numpy as np import torch from torch.optim import Adam -import gym +import gymnasium import time import spinup.algos.pytorch.td3.core as core from spinup.utils.logx import EpochLogger diff --git a/spinup/algos/pytorch/vpg/core.py b/spinup/algos/pytorch/vpg/core.py index 84e9f9889..1710eb36a 100644 --- a/spinup/algos/pytorch/vpg/core.py +++ b/spinup/algos/pytorch/vpg/core.py @@ -1,6 +1,6 @@ import numpy as np import scipy.signal -from gym.spaces import Box, Discrete +from gymnasium.spaces import Box, Discrete import torch import torch.nn as nn diff --git a/spinup/algos/pytorch/vpg/vpg.py b/spinup/algos/pytorch/vpg/vpg.py index 4639b56ae..2c3c54c95 100644 --- a/spinup/algos/pytorch/vpg/vpg.py +++ b/spinup/algos/pytorch/vpg/vpg.py @@ -1,7 +1,7 @@ import numpy as np import torch from torch.optim import Adam -import gym +import gymnasium import time import spinup.algos.pytorch.vpg.core as core from spinup.utils.logx import EpochLogger diff --git a/spinup/algos/tf1/ddpg/ddpg.py b/spinup/algos/tf1/ddpg/ddpg.py index 90dabaa2d..28585fbe0 100644 --- a/spinup/algos/tf1/ddpg/ddpg.py +++ b/spinup/algos/tf1/ddpg/ddpg.py @@ -1,6 +1,6 @@ import numpy as np import tensorflow as tf -import gym +import gymnasium import time from spinup.algos.tf1.ddpg import core from spinup.algos.tf1.ddpg.core import get_vars diff --git a/spinup/algos/tf1/ppo/core.py b/spinup/algos/tf1/ppo/core.py index 4cb360f46..e862a7916 100644 --- a/spinup/algos/tf1/ppo/core.py +++ b/spinup/algos/tf1/ppo/core.py @@ -1,7 +1,7 @@ import numpy as np import tensorflow as tf import scipy.signal -from gym.spaces import Box, Discrete +from gymnasium.spaces import Box, Discrete EPS = 1e-8 diff --git a/spinup/algos/tf1/ppo/ppo.py b/spinup/algos/tf1/ppo/ppo.py index 70ec8859b..94dca2507 100644 --- a/spinup/algos/tf1/ppo/ppo.py +++ b/spinup/algos/tf1/ppo/ppo.py @@ -1,6 +1,6 @@ import numpy as np import tensorflow as tf -import gym +import gymnasium as gym import time import spinup.algos.tf1.ppo.core as core from spinup.utils.logx import EpochLogger diff --git a/spinup/algos/tf1/sac/sac.py b/spinup/algos/tf1/sac/sac.py index e31a09dd2..136e72868 100644 --- a/spinup/algos/tf1/sac/sac.py +++ b/spinup/algos/tf1/sac/sac.py @@ -1,6 +1,6 @@ import numpy as np import tensorflow as tf -import gym +import gymnasium import time from spinup.algos.tf1.sac import core from spinup.algos.tf1.sac.core import get_vars diff --git a/spinup/algos/tf1/td3/td3.py b/spinup/algos/tf1/td3/td3.py index 32257e990..e969d7bec 100644 --- a/spinup/algos/tf1/td3/td3.py +++ b/spinup/algos/tf1/td3/td3.py @@ -1,6 +1,6 @@ import numpy as np import tensorflow as tf -import gym +import gymnasium import time from spinup.algos.tf1.td3 import core from spinup.algos.tf1.td3.core import get_vars diff --git a/spinup/algos/tf1/trpo/core.py b/spinup/algos/tf1/trpo/core.py index 6fc865921..2395a5153 100644 --- a/spinup/algos/tf1/trpo/core.py +++ b/spinup/algos/tf1/trpo/core.py @@ -1,7 +1,7 @@ import numpy as np import tensorflow as tf import scipy.signal -from gym.spaces import Box, Discrete +from gymnasium.spaces import Box, Discrete EPS = 1e-8 diff --git a/spinup/algos/tf1/trpo/trpo.py b/spinup/algos/tf1/trpo/trpo.py index 9e09f1348..288c3cede 100644 --- a/spinup/algos/tf1/trpo/trpo.py +++ b/spinup/algos/tf1/trpo/trpo.py @@ -1,6 +1,6 @@ import numpy as np import tensorflow as tf -import gym +import gymnasium import time import spinup.algos.tf1.trpo.core as core from spinup.utils.logx import EpochLogger diff --git a/spinup/algos/tf1/vpg/core.py b/spinup/algos/tf1/vpg/core.py index 4cb360f46..e862a7916 100644 --- a/spinup/algos/tf1/vpg/core.py +++ b/spinup/algos/tf1/vpg/core.py @@ -1,7 +1,7 @@ import numpy as np import tensorflow as tf import scipy.signal -from gym.spaces import Box, Discrete +from gymnasium.spaces import Box, Discrete EPS = 1e-8 diff --git a/spinup/algos/tf1/vpg/vpg.py b/spinup/algos/tf1/vpg/vpg.py index 5d4ecd183..840225197 100644 --- a/spinup/algos/tf1/vpg/vpg.py +++ b/spinup/algos/tf1/vpg/vpg.py @@ -1,6 +1,6 @@ import numpy as np import tensorflow as tf -import gym +import gymnasium import time import spinup.algos.tf1.vpg.core as core from spinup.utils.logx import EpochLogger