From c24a948f93fc21e1039c8b2dd862b35c73cc07b0 Mon Sep 17 00:00:00 2001 From: Tucker Date: Tue, 21 Mar 2023 20:19:27 -0400 Subject: [PATCH 1/2] Fix racing example. --- examples/rl/racing/run.py | 5 ++++- examples/rl/racing/setup.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/rl/racing/run.py b/examples/rl/racing/run.py index b9bdac2559..93c25a24dd 100644 --- a/examples/rl/racing/run.py +++ b/examples/rl/racing/run.py @@ -21,7 +21,10 @@ from cli.studio import build_scenarios -from . import utils +try: + import utils +except ImportError: + from . import utils warnings.simplefilter("ignore", category=DeprecationWarning) warnings.simplefilter("ignore", category=PendingDeprecationWarning) diff --git a/examples/rl/racing/setup.py b/examples/rl/racing/setup.py index fa94560725..3a10cd227d 100644 --- a/examples/rl/racing/setup.py +++ b/examples/rl/racing/setup.py @@ -21,7 +21,7 @@ "smarts[camera_obs]==1.0.0", "numpy<=1.23.0,>=1.19", "dreamerv2==2.2.0", - "tensorflow==2.4.0", + "tensorflow~=2.7.0", "tensorflow-probability==0.12.2", ], ) From 5f9e57670e09beb14f870b2ba38e41b30eb0039f Mon Sep 17 00:00:00 2001 From: Tucker Date: Tue, 21 Mar 2023 20:41:42 -0400 Subject: [PATCH 2/2] update requirements --- CHANGELOG.md | 1 + examples/rl/racing/requirements.txt | 131 +++++++++++++++------------- 2 files changed, 72 insertions(+), 60 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78cdcc88c7..02974d5c59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Copy and pasting the git commit messages is __NOT__ enough. ### Changed ### Deprecated ### Fixed +- Fixed "rl/racing" `numpy` incompatibility. ### Removed ### Security diff --git a/examples/rl/racing/requirements.txt b/examples/rl/racing/requirements.txt index fae11fb422..1e3f02497c 100644 --- a/examples/rl/racing/requirements.txt +++ b/examples/rl/racing/requirements.txt @@ -1,107 +1,118 @@ -absl-py==0.15.0 +absl-py==1.4.0 astunparse==1.6.3 atari-py==0.2.6 -attrs==22.1.0 +attrs==22.2.0 Automat==22.10.0 cached-property==1.5.2 -cachetools==5.2.0 -certifi==2022.9.24 -charset-normalizer==2.1.1 +cachetools==5.3.0 +certifi==2022.12.7 +charset-normalizer==3.1.0 click==8.1.3 cloudpickle==1.6.0 -commonmark==0.9.1 constantly==15.1.0 +contourpy==1.0.7 crafter==1.8.0 cycler==0.11.0 decorator==5.1.1 -dm-control==1.0.8 -dm-env==1.5 -dm-tree==0.1.7 +dm-control==1.0.10 +dm-env==1.6 +dm-tree==0.1.8 dreamerv2==2.2.0 -eclipse-sumo==1.10.0 -flatbuffers==1.12 -fonttools==4.38.0 -future==0.18.2 -gast==0.3.3 -glfw==2.5.5 -google-auth==2.14.1 +eclipse-sumo==1.16.0 +flatbuffers==2.0.7 +fonttools==4.39.2 +future==0.18.3 +gast==0.4.0 +glfw==2.5.7 +google-auth==2.16.2 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 -grpcio==1.32.0 +grpcio==1.51.3 gym==0.19.0 -h5py==2.10.0 +gymnasium==0.27.0 +gymnasium-notices==0.0.1 +h5py==3.8.0 hyperlink==21.0.0 idna==3.4 -ijson==3.1.4 -imageio==2.22.4 -importlib-metadata==5.1.0 +ijson==3.2.0.post0 +imageio==2.26.1 +importlib-metadata==6.1.0 +importlib-resources==5.12.0 incremental==22.10.0 +jax-jumpy==1.0.0 jsonpatch==1.32 jsonpointer==2.3 +keras==2.7.0 Keras-Preprocessing==1.1.2 kiwisolver==1.4.4 -labmaze==1.0.5 +labmaze==1.0.6 +libclang==15.0.6.1 llvmlite==0.39.1 -lxml==4.9.1 +lxml==4.9.2 Markdown==3.4.1 -MarkupSafe==2.1.1 -matplotlib==3.5.3 -mujoco==2.3.0 -networkx==2.6.3 +markdown-it-py==2.2.0 +MarkupSafe==2.1.2 +matplotlib==3.7.1 +mdurl==0.1.2 +mujoco==2.3.3 +networkx==3.0 numba==0.56.4 -numpy==1.19.5 +numpy==1.23.0 oauthlib==3.2.2 -opencv-python==4.6.0.66 -opensimplex==0.3 +opencv-python==4.7.0.72 +opensimplex==0.4.4 opt-einsum==3.3.0 -packaging==21.3 +packaging==23.0 Panda3D==1.10.9 panda3d-gltf==0.13 panda3d-simplepbr==0.10 -pandas==1.3.5 -Pillow==9.3.0 -protobuf==3.20.3 +pandas==1.5.3 +Pillow==9.4.0 +protobuf==3.19.6 psutil==5.9.4 pyasn1==0.4.8 pyasn1-modules==0.2.8 pybullet==3.0.6 -Pygments==2.13.0 +Pygments==2.14.0 PyOpenGL==3.1.6 -pyparsing==2.4.7 +pyparsing==3.0.9 python-dateutil==2.8.2 -pytz==2022.6 +pytz==2022.7.1 PyYAML==6.0 -requests==2.28.1 +-e git+ssh://git@github.com/huawei-noah/SMARTS.git@c24a948f93fc21e1039c8b2dd862b35c73cc07b0#egg=racing&subdirectory=examples/rl/racing +requests==2.28.2 requests-oauthlib==1.3.1 -rich==12.0.1 +rich==13.3.2 rsa==4.9 Rtree==1.0.1 ruamel.yaml==0.17.21 ruamel.yaml.clib==0.2.7 -scipy==1.7.3 -sh==1.14.3 -Shapely==1.8.5.post1 -six==1.15.0 -smarts==0.7.0rc0 +scipy==1.10.1 +sh==2.0.3 +shapely==2.0.1 +Shimmy==0.2.1 +six==1.16.0 +smarts==1.0.0 tableprint==0.9.1 -tensorboard==2.11.0 -tensorboard-data-server==0.6.1 +tensorboard==2.12.0 +tensorboard-data-server==0.7.0 tensorboard-plugin-wit==1.8.1 -tensorflow==2.4.0 -tensorflow-estimator==2.4.0 +tensorflow==2.7.4 +tensorflow-estimator==2.7.0 +tensorflow-io-gcs-filesystem==0.31.0 tensorflow-probability==0.12.2 -termcolor==1.1.0 +termcolor==2.2.0 tornado==6.2 -tqdm==4.64.1 +tqdm==4.65.0 trimesh==3.9.29 Twisted==22.10.0 -typing-extensions==3.7.4.3 -urllib3==1.26.13 -visdom==0.2.3 -wcwidth==0.2.5 -websocket-client==1.4.2 -Werkzeug==2.2.2 -wrapt==1.12.1 -yattag==1.14.0 -zipp==3.11.0 -zope.interface==5.5.2 +typing_extensions==4.5.0 +urllib3==1.26.15 +visdom==0.2.4 +wcwidth==0.2.6 +websocket-client==1.5.1 +Werkzeug==2.2.3 +wrapt==1.15.0 +yattag==1.15.1 +zipp==3.15.0 +zope.interface==6.0