From 29fe4430eccf146e5c524dd05a84c9f3e52ba03c Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Thu, 24 Apr 2025 09:21:13 +0100 Subject: [PATCH 1/8] Update [ghstack-poisoned] --- .github/scripts/pre-build-script-win.sh | 2 +- .github/scripts/td_script.sh | 2 +- .github/scripts/version_script.bat | 2 +- README.md | 26 ++++++++++++++++++++++--- setup.py | 9 +++------ version.txt | 2 +- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/.github/scripts/pre-build-script-win.sh b/.github/scripts/pre-build-script-win.sh index 9f5859c5cfe..e1225595623 100644 --- a/.github/scripts/pre-build-script-win.sh +++ b/.github/scripts/pre-build-script-win.sh @@ -2,6 +2,6 @@ pip install --upgrade setuptools -export TORCHRL_BUILD_VERSION=0.7.0 +export TORCHRL_BUILD_VERSION=0.8.0 ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U diff --git a/.github/scripts/td_script.sh b/.github/scripts/td_script.sh index 9cfe298cd1c..6b1ace72c2f 100644 --- a/.github/scripts/td_script.sh +++ b/.github/scripts/td_script.sh @@ -1,6 +1,6 @@ #!/bin/bash -export TORCHRL_BUILD_VERSION=0.7.0 +export TORCHRL_BUILD_VERSION=0.8.0 pip install --upgrade setuptools # Check if ARCH is set to aarch64 diff --git a/.github/scripts/version_script.bat b/.github/scripts/version_script.bat index db887873488..a98f45dfb5e 100644 --- a/.github/scripts/version_script.bat +++ b/.github/scripts/version_script.bat @@ -1,5 +1,5 @@ @echo off -set TORCHRL_BUILD_VERSION=0.7.0 +set TORCHRL_BUILD_VERSION=0.8.0 echo TORCHRL_BUILD_VERSION is set to %TORCHRL_BUILD_VERSION% @echo on diff --git a/README.md b/README.md index 633637ac462..ea83478c2fa 100644 --- a/README.md +++ b/README.md @@ -849,11 +849,17 @@ pip3 install torchrl This should work on linux, Windows 10 and OsX (Intel or Silicon chips). On certain Windows machines (Windows 11), one should install the library locally (see below). +For AArch64 machines, the binaries are not yet stored on PyPI so you will need to download them directly from +the [release page](https://github.com/pytorch/rl/releases/) or install the library via +``` +pip3 install git+https://github.com/pytorch/rl@v0.8.0 +``` + The **nightly build** can be installed via ```bash -pip3 install torchrl-nightly +pip3 install tensordict-nightly torchrl-nightly ``` -which we currently only ship for Linux and OsX (Intel) machines. +which we currently only ship for Linux machines. Importantly, the nightly builds require the nightly builds of PyTorch too. To install extra dependencies, call @@ -862,13 +868,27 @@ pip3 install "torchrl[atari,dm_control,gym_continuous,rendering,tests,utils,marl ``` or a subset of these. +To install torchrl with the latest pytorch, use +```bash +pip3 install "torchrl[replay_buffer]" +``` +since some features in the replay buffer require PyTorch 2.7.0 or above. + One may also desire to install the library locally. Three main reasons can motivate this: - the nightly/stable release isn't available for one's platform (eg, Windows 11, nightlies for Apple Silicon etc.); - contributing to the code; -- install torchrl with a previous version of PyTorch (any version >= 2.0) (note that this should also be doable via a regular install followed +- install torchrl with a previous version of PyTorch (any version >= 2.1) (note that this should also be doable via a regular install followed by a downgrade to a previous pytorch version -- but the C++ binaries will not be available so some feature will not work, such as prioritized replay buffers and the like.) + **Disclaimer**: As of today, TorchRL is roughly compatible with any pytorch version >= 2.1 and installing it will not + directly require a newer version of pytorch to be installed. Indirectly though, tensordict still requires the latest + PyTorch to be installed and we are working hard to loosen that requirement. + The C++ binaries of TorchRL (mainly for prioritized replay buffers) will only work with PyTorch 2.7.0 and above. + Some features (e.g., working with nested jagged tensors) may also + be limited with older versions of pytorch. It is recommended to use the latest TorchRL with the latest PyTorch version + unless there is a strong reason not to do so. + To install the library locally, start by cloning the repo: ```bash git clone https://github.com/pytorch/rl diff --git a/setup.py b/setup.py index 873531006e4..59f9a454011 100644 --- a/setup.py +++ b/setup.py @@ -71,11 +71,7 @@ def write_version_file(version): def _get_pytorch_version(is_nightly, is_local): # if "PYTORCH_VERSION" in os.environ: # return f"torch=={os.environ['PYTORCH_VERSION']}" - if is_nightly: - return "torch>=2.7.0.dev" - elif is_local: - return "torch" - return "torch>=2.6.0" + return "torch>=2.1.0" def _get_packages(): @@ -176,7 +172,7 @@ def _main(argv): if is_nightly: tensordict_dep = "tensordict-nightly" else: - tensordict_dep = "tensordict>=0.7.0" + tensordict_dep = "tensordict>=0.8.0" if is_nightly: version = get_nightly_version() @@ -207,6 +203,7 @@ def _main(argv): "pygame", ], "dm_control": ["dm_control"], + "replay_buffer": ["torch>=2.7.0"], "gym_continuous": ["gymnasium<1.0", "mujoco"], "rendering": ["moviepy<2.0.0"], "tests": [ diff --git a/version.txt b/version.txt index faef31a4357..a3df0a6959e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.7.0 +0.8.0 From 7b842b4a506fbc4d22c20b2d68192e37038b90e6 Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Thu, 24 Apr 2025 21:42:24 +0100 Subject: [PATCH 2/8] Update [ghstack-poisoned] --- .github/unittest/linux/scripts/environment.yml | 1 + .github/unittest/linux/scripts/run_all.sh | 2 +- .github/unittest/linux_distributed/scripts/environment.yml | 1 + .github/unittest/linux_libs/scripts_ataridqn/environment.yml | 1 + .github/unittest/linux_libs/scripts_ataridqn/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_ataridqn/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_brax/environment.yml | 1 + .github/unittest/linux_libs/scripts_brax/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_chess/environment.yml | 1 + .github/unittest/linux_libs/scripts_chess/install.sh | 1 + .github/unittest/linux_libs/scripts_chess/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_chess/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_d4rl/environment.yml | 1 + .github/unittest/linux_libs/scripts_d4rl/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_d4rl/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_envpool/environment.yml | 1 + .github/unittest/linux_libs/scripts_envpool/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_gen-dgrl/environment.yml | 1 + .github/unittest/linux_libs/scripts_gen-dgrl/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_gen-dgrl/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_gym/batch_scripts.sh | 2 +- .github/unittest/linux_libs/scripts_gym/environment.yml | 1 + .github/unittest/linux_libs/scripts_gym/install.sh | 2 +- .github/unittest/linux_libs/scripts_gym/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_habitat/environment.yml | 1 + .github/unittest/linux_libs/scripts_habitat/run_all.sh | 2 +- .github/unittest/linux_libs/scripts_jumanji/environment.yml | 1 + .github/unittest/linux_libs/scripts_jumanji/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_jumanji/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_llm/environment.yml | 1 + .github/unittest/linux_libs/scripts_llm/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_llm/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_meltingpot/environment.yml | 1 + .github/unittest/linux_libs/scripts_meltingpot/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_meltingpot/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_minari/environment.yml | 1 + .github/unittest/linux_libs/scripts_minari/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_minari/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_open_spiel/environment.yml | 1 + .github/unittest/linux_libs/scripts_open_spiel/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_open_spiel/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_openx/environment.yml | 1 + .github/unittest/linux_libs/scripts_openx/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_openx/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_pettingzoo/environment.yml | 1 + .github/unittest/linux_libs/scripts_pettingzoo/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_pettingzoo/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_robohive/environment.yml | 1 + .../linux_libs/scripts_robohive/install_and_run_test.sh | 2 +- .github/unittest/linux_libs/scripts_robohive/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_roboset/environment.yml | 1 + .github/unittest/linux_libs/scripts_roboset/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_roboset/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_sklearn/environment.yml | 1 + .github/unittest/linux_libs/scripts_sklearn/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_sklearn/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_smacv2/environment.yml | 1 + .github/unittest/linux_libs/scripts_smacv2/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_smacv2/setup_env.sh | 2 +- .../unittest/linux_libs/scripts_unity_mlagents/environment.yml | 1 + .github/unittest/linux_libs/scripts_unity_mlagents/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_unity_mlagents/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_vd4rl/environment.yml | 1 + .github/unittest/linux_libs/scripts_vd4rl/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_vd4rl/setup_env.sh | 2 +- .github/unittest/linux_libs/scripts_vmas/environment.yml | 1 + .github/unittest/linux_libs/scripts_vmas/run_test.sh | 2 +- .github/unittest/linux_libs/scripts_vmas/setup_env.sh | 2 +- .github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml | 1 + .github/unittest/linux_olddeps/scripts_gym_0_13/install.sh | 2 +- .github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh | 2 +- .github/unittest/linux_optdeps/scripts/environment.yml | 1 + .github/unittest/linux_optdeps/scripts/run_all.sh | 2 +- .github/unittest/linux_sota/scripts/environment.yml | 1 + .github/unittest/linux_sota/scripts/run_all.sh | 2 +- .github/unittest/windows_optdepts/scripts/environment.yml | 1 + .github/workflows/benchmarks.yml | 2 +- .github/workflows/benchmarks_pr.yml | 2 +- .github/workflows/docs.yml | 2 +- 79 files changed, 79 insertions(+), 50 deletions(-) diff --git a/.github/unittest/linux/scripts/environment.yml b/.github/unittest/linux/scripts/environment.yml index c7de1618f8d..e3c79e4569e 100644 --- a/.github/unittest/linux/scripts/environment.yml +++ b/.github/unittest/linux/scripts/environment.yml @@ -19,6 +19,7 @@ dependencies: - pytest-timeout - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux/scripts/run_all.sh b/.github/unittest/linux/scripts/run_all.sh index 7343427dd78..fb33e255c1b 100755 --- a/.github/unittest/linux/scripts/run_all.sh +++ b/.github/unittest/linux/scripts/run_all.sh @@ -9,7 +9,7 @@ set -v if [[ $OSTYPE != 'darwin'* ]]; then apt-get update && apt-get upgrade -y - apt-get install -y vim git wget libsdl2-dev libsdl2-2.0-0 + apt-get install -y vim git wget libsdl2-dev libsdl2-2.0-0 cmake apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 diff --git a/.github/unittest/linux_distributed/scripts/environment.yml b/.github/unittest/linux_distributed/scripts/environment.yml index 3bf22d760f1..6da87525327 100644 --- a/.github/unittest/linux_distributed/scripts/environment.yml +++ b/.github/unittest/linux_distributed/scripts/environment.yml @@ -18,6 +18,7 @@ dependencies: - pytest-rerunfailures - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_ataridqn/environment.yml b/.github/unittest/linux_libs/scripts_ataridqn/environment.yml index 79e7bc265f5..ea3ec1d0328 100644 --- a/.github/unittest/linux_libs/scripts_ataridqn/environment.yml +++ b/.github/unittest/linux_libs/scripts_ataridqn/environment.yml @@ -17,6 +17,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_ataridqn/run_test.sh b/.github/unittest/linux_libs/scripts_ataridqn/run_test.sh index d30e71112a8..8b7a1858f14 100755 --- a/.github/unittest/linux_libs/scripts_ataridqn/run_test.sh +++ b/.github/unittest/linux_libs/scripts_ataridqn/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 +apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export LAZY_LEGACY_OP=False diff --git a/.github/unittest/linux_libs/scripts_ataridqn/setup_env.sh b/.github/unittest/linux_libs/scripts_ataridqn/setup_env.sh index 3cbf2e7baa6..8739dc861fd 100755 --- a/.github/unittest/linux_libs/scripts_ataridqn/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_ataridqn/setup_env.sh @@ -9,7 +9,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_brax/environment.yml b/.github/unittest/linux_libs/scripts_brax/environment.yml index c3b0a302c95..c4b7bb37267 100644 --- a/.github/unittest/linux_libs/scripts_brax/environment.yml +++ b/.github/unittest/linux_libs/scripts_brax/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_brax/setup_env.sh b/.github/unittest/linux_libs/scripts_brax/setup_env.sh index 80b1c9927eb..edbb11de15d 100755 --- a/.github/unittest/linux_libs/scripts_brax/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_brax/setup_env.sh @@ -7,7 +7,7 @@ set -euxo pipefail -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_chess/environment.yml b/.github/unittest/linux_libs/scripts_chess/environment.yml index b67fe8259d3..bf1e689c516 100644 --- a/.github/unittest/linux_libs/scripts_chess/environment.yml +++ b/.github/unittest/linux_libs/scripts_chess/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_chess/install.sh b/.github/unittest/linux_libs/scripts_chess/install.sh index 9fabfcaa74e..2339fb14bde 100755 --- a/.github/unittest/linux_libs/scripts_chess/install.sh +++ b/.github/unittest/linux_libs/scripts_chess/install.sh @@ -5,6 +5,7 @@ unset PYTORCH_VERSION # so no need to set PYTORCH_VERSION. # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config. apt-get update && apt-get install -y \ + cmake \ git \ wget \ gcc \ diff --git a/.github/unittest/linux_libs/scripts_chess/run_test.sh b/.github/unittest/linux_libs/scripts_chess/run_test.sh index 8c5473023de..dbf769e6ee9 100755 --- a/.github/unittest/linux_libs/scripts_chess/run_test.sh +++ b/.github/unittest/linux_libs/scripts_chess/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' export LAZY_LEGACY_OP=False diff --git a/.github/unittest/linux_libs/scripts_chess/setup_env.sh b/.github/unittest/linux_libs/scripts_chess/setup_env.sh index 7d517c04758..e62891418bd 100755 --- a/.github/unittest/linux_libs/scripts_chess/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_chess/setup_env.sh @@ -9,7 +9,7 @@ set -e set -v this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_d4rl/environment.yml b/.github/unittest/linux_libs/scripts_d4rl/environment.yml index fb046d9d55a..fa74af321dc 100644 --- a/.github/unittest/linux_libs/scripts_d4rl/environment.yml +++ b/.github/unittest/linux_libs/scripts_d4rl/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_d4rl/run_test.sh b/.github/unittest/linux_libs/scripts_d4rl/run_test.sh index 062341eacd7..dfa14393249 100755 --- a/.github/unittest/linux_libs/scripts_d4rl/run_test.sh +++ b/.github/unittest/linux_libs/scripts_d4rl/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 +apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 cmake ln -s /usr/bin/swig3.0 /usr/bin/swig # we install d4rl here bc env variables have been updated diff --git a/.github/unittest/linux_libs/scripts_d4rl/setup_env.sh b/.github/unittest/linux_libs/scripts_d4rl/setup_env.sh index d5c5a21e817..5fe476714a3 100755 --- a/.github/unittest/linux_libs/scripts_d4rl/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_d4rl/setup_env.sh @@ -9,7 +9,7 @@ set -e set -v this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_envpool/environment.yml b/.github/unittest/linux_libs/scripts_envpool/environment.yml index 58aeee315c2..4810372059a 100644 --- a/.github/unittest/linux_libs/scripts_envpool/environment.yml +++ b/.github/unittest/linux_libs/scripts_envpool/environment.yml @@ -17,6 +17,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - dm_control diff --git a/.github/unittest/linux_libs/scripts_envpool/setup_env.sh b/.github/unittest/linux_libs/scripts_envpool/setup_env.sh index 0407df2fd0c..49ac816c3a8 100755 --- a/.github/unittest/linux_libs/scripts_envpool/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_envpool/setup_env.sh @@ -6,7 +6,7 @@ # Do not install PyTorch and torchvision here, otherwise they also get cached. set -e -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_gen-dgrl/environment.yml b/.github/unittest/linux_libs/scripts_gen-dgrl/environment.yml index 0a4c2fb1cb2..258ee278448 100644 --- a/.github/unittest/linux_libs/scripts_gen-dgrl/environment.yml +++ b/.github/unittest/linux_libs/scripts_gen-dgrl/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_gen-dgrl/run_test.sh b/.github/unittest/linux_libs/scripts_gen-dgrl/run_test.sh index 0b72f134751..8d53f4e6a58 100755 --- a/.github/unittest/linux_libs/scripts_gen-dgrl/run_test.sh +++ b/.github/unittest/linux_libs/scripts_gen-dgrl/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 +apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_gen-dgrl/setup_env.sh b/.github/unittest/linux_libs/scripts_gen-dgrl/setup_env.sh index 9ebd6bf9e3a..f3df1452583 100755 --- a/.github/unittest/linux_libs/scripts_gen-dgrl/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_gen-dgrl/setup_env.sh @@ -8,7 +8,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_gym/batch_scripts.sh b/.github/unittest/linux_libs/scripts_gym/batch_scripts.sh index 6838afe2be7..cd08d8584c7 100755 --- a/.github/unittest/linux_libs/scripts_gym/batch_scripts.sh +++ b/.github/unittest/linux_libs/scripts_gym/batch_scripts.sh @@ -15,7 +15,7 @@ conda activate ./env $DIR/install.sh # Extracted from run_test.sh to run once. -apt-get update && apt-get install -y git wget libglew-dev libx11-dev x11proto-dev g++ +apt-get update && apt-get install -y git wget libglew-dev libx11-dev x11proto-dev g++ cmake # solves "'extras_require' must be a dictionary" pip install setuptools==65.3.0 diff --git a/.github/unittest/linux_libs/scripts_gym/environment.yml b/.github/unittest/linux_libs/scripts_gym/environment.yml index 06706d43c01..09cef01dec2 100644 --- a/.github/unittest/linux_libs/scripts_gym/environment.yml +++ b/.github/unittest/linux_libs/scripts_gym/environment.yml @@ -21,6 +21,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_gym/install.sh b/.github/unittest/linux_libs/scripts_gym/install.sh index a66fe5fddd1..300db696eaa 100755 --- a/.github/unittest/linux_libs/scripts_gym/install.sh +++ b/.github/unittest/linux_libs/scripts_gym/install.sh @@ -4,7 +4,7 @@ unset PYTORCH_VERSION # For unittest, nightly PyTorch is used as the following section, # so no need to set PYTORCH_VERSION. # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config. -apt-get update && apt-get install -y git wget gcc g++ +apt-get update && apt-get install -y git wget gcc g++ cmake set -e set -v diff --git a/.github/unittest/linux_libs/scripts_gym/setup_env.sh b/.github/unittest/linux_libs/scripts_gym/setup_env.sh index 7fc411f5643..b7c6e490abd 100755 --- a/.github/unittest/linux_libs/scripts_gym/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_gym/setup_env.sh @@ -9,7 +9,7 @@ set -e this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Avoid error: "fatal: unsafe repository" -apt-get update && apt-get install -y git wget gcc g++ +apt-get update && apt-get install -y git wget gcc g++ cmake git config --global --add safe.directory '*' root_dir="$(git rev-parse --show-toplevel)" diff --git a/.github/unittest/linux_libs/scripts_habitat/environment.yml b/.github/unittest/linux_libs/scripts_habitat/environment.yml index 8bb81c7b010..5a3b65e6aa4 100644 --- a/.github/unittest/linux_libs/scripts_habitat/environment.yml +++ b/.github/unittest/linux_libs/scripts_habitat/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-rerunfailures - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy==1.9.1 - hydra-core diff --git a/.github/unittest/linux_libs/scripts_habitat/run_all.sh b/.github/unittest/linux_libs/scripts_habitat/run_all.sh index 69204455a69..4ba362d9efa 100755 --- a/.github/unittest/linux_libs/scripts_habitat/run_all.sh +++ b/.github/unittest/linux_libs/scripts_habitat/run_all.sh @@ -5,7 +5,7 @@ set -v apt-get update && apt-get upgrade -y -apt-get install -y vim git wget +apt-get install -y vim git wget cmake apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 diff --git a/.github/unittest/linux_libs/scripts_jumanji/environment.yml b/.github/unittest/linux_libs/scripts_jumanji/environment.yml index 75c8e647b51..014c7956ec2 100644 --- a/.github/unittest/linux_libs/scripts_jumanji/environment.yml +++ b/.github/unittest/linux_libs/scripts_jumanji/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_jumanji/run_test.sh b/.github/unittest/linux_libs/scripts_jumanji/run_test.sh index e62c1935430..5ac898e8a8f 100755 --- a/.github/unittest/linux_libs/scripts_jumanji/run_test.sh +++ b/.github/unittest/linux_libs/scripts_jumanji/run_test.sh @@ -4,7 +4,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_jumanji/setup_env.sh b/.github/unittest/linux_libs/scripts_jumanji/setup_env.sh index 3fc3f5cef44..4e87b2e9ed1 100755 --- a/.github/unittest/linux_libs/scripts_jumanji/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_jumanji/setup_env.sh @@ -6,7 +6,7 @@ # Do not install PyTorch and torchvision here, otherwise they also get cached. set -e -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_llm/environment.yml b/.github/unittest/linux_libs/scripts_llm/environment.yml index cf5c28d5d14..2e6b3c6e173 100644 --- a/.github/unittest/linux_libs/scripts_llm/environment.yml +++ b/.github/unittest/linux_libs/scripts_llm/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_llm/run_test.sh b/.github/unittest/linux_libs/scripts_llm/run_test.sh index 5940fc99bc7..ac60ae37f1e 100644 --- a/.github/unittest/linux_libs/scripts_llm/run_test.sh +++ b/.github/unittest/linux_libs/scripts_llm/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git gcc +apt-get update && apt-get install -y git gcc cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_llm/setup_env.sh b/.github/unittest/linux_libs/scripts_llm/setup_env.sh index 9220d700651..53dfc0bd50b 100644 --- a/.github/unittest/linux_libs/scripts_llm/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_llm/setup_env.sh @@ -6,7 +6,7 @@ # Do not install PyTorch and torchvision here, otherwise they also get cached. set -e -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_meltingpot/environment.yml b/.github/unittest/linux_libs/scripts_meltingpot/environment.yml index 85a1c2425e7..e003419348c 100644 --- a/.github/unittest/linux_libs/scripts_meltingpot/environment.yml +++ b/.github/unittest/linux_libs/scripts_meltingpot/environment.yml @@ -14,3 +14,4 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] diff --git a/.github/unittest/linux_libs/scripts_meltingpot/run_test.sh b/.github/unittest/linux_libs/scripts_meltingpot/run_test.sh index 6f7ec265f74..0636639a613 100755 --- a/.github/unittest/linux_libs/scripts_meltingpot/run_test.sh +++ b/.github/unittest/linux_libs/scripts_meltingpot/run_test.sh @@ -4,7 +4,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_meltingpot/setup_env.sh b/.github/unittest/linux_libs/scripts_meltingpot/setup_env.sh index daa3fff5e58..305659eb26b 100755 --- a/.github/unittest/linux_libs/scripts_meltingpot/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_meltingpot/setup_env.sh @@ -6,7 +6,7 @@ # Do not install PyTorch and torchvision here, otherwise they also get cached. set -e -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_minari/environment.yml b/.github/unittest/linux_libs/scripts_minari/environment.yml index aa37ed6a855..ce6bdba3c24 100644 --- a/.github/unittest/linux_libs/scripts_minari/environment.yml +++ b/.github/unittest/linux_libs/scripts_minari/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_minari/run_test.sh b/.github/unittest/linux_libs/scripts_minari/run_test.sh index 30aabf36ac7..6282e7d57eb 100755 --- a/.github/unittest/linux_libs/scripts_minari/run_test.sh +++ b/.github/unittest/linux_libs/scripts_minari/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 +apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_minari/setup_env.sh b/.github/unittest/linux_libs/scripts_minari/setup_env.sh index af9502150b8..a7afd646646 100755 --- a/.github/unittest/linux_libs/scripts_minari/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_minari/setup_env.sh @@ -8,7 +8,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_open_spiel/environment.yml b/.github/unittest/linux_libs/scripts_open_spiel/environment.yml index 937c37d58f6..0ed33d56f31 100644 --- a/.github/unittest/linux_libs/scripts_open_spiel/environment.yml +++ b/.github/unittest/linux_libs/scripts_open_spiel/environment.yml @@ -14,6 +14,7 @@ dependencies: - pytest-rerunfailures - pytest-error-for-skips - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_open_spiel/run_test.sh b/.github/unittest/linux_libs/scripts_open_spiel/run_test.sh index a09229bf59a..98952d1d4b0 100755 --- a/.github/unittest/linux_libs/scripts_open_spiel/run_test.sh +++ b/.github/unittest/linux_libs/scripts_open_spiel/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' export LAZY_LEGACY_OP=False diff --git a/.github/unittest/linux_libs/scripts_open_spiel/setup_env.sh b/.github/unittest/linux_libs/scripts_open_spiel/setup_env.sh index e33989fa5de..19c821637de 100755 --- a/.github/unittest/linux_libs/scripts_open_spiel/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_open_spiel/setup_env.sh @@ -8,7 +8,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_openx/environment.yml b/.github/unittest/linux_libs/scripts_openx/environment.yml index 322eb9d25ac..9182a92d24c 100644 --- a/.github/unittest/linux_libs/scripts_openx/environment.yml +++ b/.github/unittest/linux_libs/scripts_openx/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_openx/run_test.sh b/.github/unittest/linux_libs/scripts_openx/run_test.sh index f80bd4cc71a..2eaf66553bd 100755 --- a/.github/unittest/linux_libs/scripts_openx/run_test.sh +++ b/.github/unittest/linux_libs/scripts_openx/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 +apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_openx/setup_env.sh b/.github/unittest/linux_libs/scripts_openx/setup_env.sh index af9502150b8..a7afd646646 100755 --- a/.github/unittest/linux_libs/scripts_openx/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_openx/setup_env.sh @@ -8,7 +8,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_pettingzoo/environment.yml b/.github/unittest/linux_libs/scripts_pettingzoo/environment.yml index 8f4e35c8efa..92edaf1aa7a 100644 --- a/.github/unittest/linux_libs/scripts_pettingzoo/environment.yml +++ b/.github/unittest/linux_libs/scripts_pettingzoo/environment.yml @@ -17,6 +17,7 @@ dependencies: - pytest-rerunfailures - pytest-error-for-skips - expecttest + - pybind11[global] - pyyaml - autorom[accept-rom-license] - pettingzoo[all]==1.24.3 diff --git a/.github/unittest/linux_libs/scripts_pettingzoo/run_test.sh b/.github/unittest/linux_libs/scripts_pettingzoo/run_test.sh index 7b15bc9113f..5e4ea0ec31b 100755 --- a/.github/unittest/linux_libs/scripts_pettingzoo/run_test.sh +++ b/.github/unittest/linux_libs/scripts_pettingzoo/run_test.sh @@ -4,7 +4,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_pettingzoo/setup_env.sh b/.github/unittest/linux_libs/scripts_pettingzoo/setup_env.sh index f311267e4d6..75c4d4e861a 100755 --- a/.github/unittest/linux_libs/scripts_pettingzoo/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_pettingzoo/setup_env.sh @@ -7,7 +7,7 @@ set -e -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_robohive/environment.yml b/.github/unittest/linux_libs/scripts_robohive/environment.yml index 53575fa7381..a667b841525 100644 --- a/.github/unittest/linux_libs/scripts_robohive/environment.yml +++ b/.github/unittest/linux_libs/scripts_robohive/environment.yml @@ -21,6 +21,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_robohive/install_and_run_test.sh b/.github/unittest/linux_libs/scripts_robohive/install_and_run_test.sh index 3470e96fd91..b5078acee7f 100755 --- a/.github/unittest/linux_libs/scripts_robohive/install_and_run_test.sh +++ b/.github/unittest/linux_libs/scripts_robohive/install_and_run_test.sh @@ -4,7 +4,7 @@ unset PYTORCH_VERSION # For unittest, nightly PyTorch is used as the following section, # so no need to set PYTORCH_VERSION. # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config. -apt-get update && apt-get install -y git wget libglew-dev libx11-dev x11proto-dev g++ gcc libosmesa6-dev +apt-get update && apt-get install -y git wget libglew-dev libx11-dev x11proto-dev g++ gcc libosmesa6-dev cmake set -e set -v diff --git a/.github/unittest/linux_libs/scripts_robohive/setup_env.sh b/.github/unittest/linux_libs/scripts_robohive/setup_env.sh index c42c976a9a9..ffc4642f5b0 100755 --- a/.github/unittest/linux_libs/scripts_robohive/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_robohive/setup_env.sh @@ -9,7 +9,7 @@ set -e this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Avoid error: "fatal: unsafe repository" -apt-get update && apt-get install -y git wget gcc g++ +apt-get update && apt-get install -y git wget gcc g++ cmake git config --global --add safe.directory '*' root_dir="$(git rev-parse --show-toplevel)" diff --git a/.github/unittest/linux_libs/scripts_roboset/environment.yml b/.github/unittest/linux_libs/scripts_roboset/environment.yml index ed1e1c86128..386ec24b3c2 100644 --- a/.github/unittest/linux_libs/scripts_roboset/environment.yml +++ b/.github/unittest/linux_libs/scripts_roboset/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_roboset/run_test.sh b/.github/unittest/linux_libs/scripts_roboset/run_test.sh index 2d954032c3e..1203390a1c9 100755 --- a/.github/unittest/linux_libs/scripts_roboset/run_test.sh +++ b/.github/unittest/linux_libs/scripts_roboset/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 +apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_roboset/setup_env.sh b/.github/unittest/linux_libs/scripts_roboset/setup_env.sh index af9502150b8..a7afd646646 100755 --- a/.github/unittest/linux_libs/scripts_roboset/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_roboset/setup_env.sh @@ -8,7 +8,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_sklearn/environment.yml b/.github/unittest/linux_libs/scripts_sklearn/environment.yml index 3ac11da60d3..251f66c8765 100644 --- a/.github/unittest/linux_libs/scripts_sklearn/environment.yml +++ b/.github/unittest/linux_libs/scripts_sklearn/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_sklearn/run_test.sh b/.github/unittest/linux_libs/scripts_sklearn/run_test.sh index ec3b9ed31e6..ed946e36d60 100755 --- a/.github/unittest/linux_libs/scripts_sklearn/run_test.sh +++ b/.github/unittest/linux_libs/scripts_sklearn/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git gcc +apt-get update && apt-get install -y git gcc cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_sklearn/setup_env.sh b/.github/unittest/linux_libs/scripts_sklearn/setup_env.sh index 755923497bd..ac629308266 100755 --- a/.github/unittest/linux_libs/scripts_sklearn/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_sklearn/setup_env.sh @@ -7,7 +7,7 @@ set -e -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_smacv2/environment.yml b/.github/unittest/linux_libs/scripts_smacv2/environment.yml index 6ca1b6706d6..45d9815885f 100644 --- a/.github/unittest/linux_libs/scripts_smacv2/environment.yml +++ b/.github/unittest/linux_libs/scripts_smacv2/environment.yml @@ -16,6 +16,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - numpy==1.23.0 - git+https://github.com/oxwhirl/smacv2.git diff --git a/.github/unittest/linux_libs/scripts_smacv2/run_test.sh b/.github/unittest/linux_libs/scripts_smacv2/run_test.sh index f1f130e488a..7d063305dc0 100755 --- a/.github/unittest/linux_libs/scripts_smacv2/run_test.sh +++ b/.github/unittest/linux_libs/scripts_smacv2/run_test.sh @@ -4,7 +4,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_smacv2/setup_env.sh b/.github/unittest/linux_libs/scripts_smacv2/setup_env.sh index dfd2413d6e3..ca18a0342c2 100755 --- a/.github/unittest/linux_libs/scripts_smacv2/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_smacv2/setup_env.sh @@ -8,7 +8,7 @@ set -e this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_unity_mlagents/environment.yml b/.github/unittest/linux_libs/scripts_unity_mlagents/environment.yml index 6dc82afbc25..4bfe74674eb 100644 --- a/.github/unittest/linux_libs/scripts_unity_mlagents/environment.yml +++ b/.github/unittest/linux_libs/scripts_unity_mlagents/environment.yml @@ -16,6 +16,7 @@ dependencies: - pytest-rerunfailures - pytest-error-for-skips - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_unity_mlagents/run_test.sh b/.github/unittest/linux_libs/scripts_unity_mlagents/run_test.sh index 05eb63c2b51..02c8a36b5be 100755 --- a/.github/unittest/linux_libs/scripts_unity_mlagents/run_test.sh +++ b/.github/unittest/linux_libs/scripts_unity_mlagents/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' export LAZY_LEGACY_OP=False diff --git a/.github/unittest/linux_libs/scripts_unity_mlagents/setup_env.sh b/.github/unittest/linux_libs/scripts_unity_mlagents/setup_env.sh index e33989fa5de..19c821637de 100755 --- a/.github/unittest/linux_libs/scripts_unity_mlagents/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_unity_mlagents/setup_env.sh @@ -8,7 +8,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_vd4rl/environment.yml b/.github/unittest/linux_libs/scripts_vd4rl/environment.yml index ed1e1c86128..386ec24b3c2 100644 --- a/.github/unittest/linux_libs/scripts_vd4rl/environment.yml +++ b/.github/unittest/linux_libs/scripts_vd4rl/environment.yml @@ -15,6 +15,7 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_libs/scripts_vd4rl/run_test.sh b/.github/unittest/linux_libs/scripts_vd4rl/run_test.sh index f4684ff5f30..83424d83058 100755 --- a/.github/unittest/linux_libs/scripts_vd4rl/run_test.sh +++ b/.github/unittest/linux_libs/scripts_vd4rl/run_test.sh @@ -5,7 +5,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 +apt-get update && apt-get remove swig -y && apt-get install -y git gcc patchelf libosmesa6-dev libgl1-mesa-glx libglfw3 swig3.0 cmake ln -s /usr/bin/swig3.0 /usr/bin/swig export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_vd4rl/setup_env.sh b/.github/unittest/linux_libs/scripts_vd4rl/setup_env.sh index af9502150b8..a7afd646646 100755 --- a/.github/unittest/linux_libs/scripts_vd4rl/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_vd4rl/setup_env.sh @@ -8,7 +8,7 @@ set -e set -v -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_libs/scripts_vmas/environment.yml b/.github/unittest/linux_libs/scripts_vmas/environment.yml index ae2657797b3..58c4a00400c 100644 --- a/.github/unittest/linux_libs/scripts_vmas/environment.yml +++ b/.github/unittest/linux_libs/scripts_vmas/environment.yml @@ -21,5 +21,6 @@ dependencies: - pytest-error-for-skips - pytest-asyncio - expecttest + - pybind11[global] - pyyaml - scipy diff --git a/.github/unittest/linux_libs/scripts_vmas/run_test.sh b/.github/unittest/linux_libs/scripts_vmas/run_test.sh index 7bcef426e6f..fd933bcdf58 100755 --- a/.github/unittest/linux_libs/scripts_vmas/run_test.sh +++ b/.github/unittest/linux_libs/scripts_vmas/run_test.sh @@ -4,7 +4,7 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -apt-get update && apt-get install -y git wget +apt-get update && apt-get install -y git wget cmake export PYTORCH_TEST_WITH_SLOW='1' diff --git a/.github/unittest/linux_libs/scripts_vmas/setup_env.sh b/.github/unittest/linux_libs/scripts_vmas/setup_env.sh index aa7e3ea0e0e..8cfc8d349ec 100755 --- a/.github/unittest/linux_libs/scripts_vmas/setup_env.sh +++ b/.github/unittest/linux_libs/scripts_vmas/setup_env.sh @@ -6,7 +6,7 @@ # Do not install PyTorch and torchvision here, otherwise they also get cached. set -e -apt-get update && apt-get upgrade -y && apt-get install -y git +apt-get update && apt-get upgrade -y && apt-get install -y git cmake # Avoid error: "fatal: unsafe repository" git config --global --add safe.directory '*' apt-get install -y wget \ diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml b/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml index a79a009ad0c..105914f9e66 100644 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml @@ -18,6 +18,7 @@ dependencies: - pytest-instafail - pytest-rerunfailures - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh index a43332f8204..7def0e28f5e 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh @@ -4,7 +4,7 @@ unset PYTORCH_VERSION # For unittest, nightly PyTorch is used as the following section, # so no need to set PYTORCH_VERSION. # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config. -apt-get update && apt-get install -y git wget libglew-dev libx11-dev x11proto-dev g++ gcc +apt-get update && apt-get install -y git wget libglew-dev libx11-dev x11proto-dev g++ gcc cmake set -e diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh index 7992898b809..2f55ece8b27 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh @@ -9,7 +9,7 @@ set -e this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Avoid error: "fatal: unsafe repository" -apt-get update && apt-get install -y git wget gcc g++ +apt-get update && apt-get install -y git wget gcc g++ cmake git config --global --add safe.directory '*' root_dir="$(git rev-parse --show-toplevel)" diff --git a/.github/unittest/linux_optdeps/scripts/environment.yml b/.github/unittest/linux_optdeps/scripts/environment.yml index fcc3c3481d0..3c16131fec9 100644 --- a/.github/unittest/linux_optdeps/scripts/environment.yml +++ b/.github/unittest/linux_optdeps/scripts/environment.yml @@ -14,6 +14,7 @@ dependencies: - pytest-rerunfailures - pytest-timeout - expecttest + - pybind11[global] - pyyaml - scipy - coverage diff --git a/.github/unittest/linux_optdeps/scripts/run_all.sh b/.github/unittest/linux_optdeps/scripts/run_all.sh index 7f34ffd42fd..7c09919495a 100755 --- a/.github/unittest/linux_optdeps/scripts/run_all.sh +++ b/.github/unittest/linux_optdeps/scripts/run_all.sh @@ -10,7 +10,7 @@ set -e if [[ $OSTYPE != 'darwin'* ]]; then apt-get update && apt-get upgrade -y - apt-get install -y vim git wget + apt-get install -y vim git wget cmake apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 diff --git a/.github/unittest/linux_sota/scripts/environment.yml b/.github/unittest/linux_sota/scripts/environment.yml index 12b16ccb54e..e1a8dadc1e8 100644 --- a/.github/unittest/linux_sota/scripts/environment.yml +++ b/.github/unittest/linux_sota/scripts/environment.yml @@ -17,6 +17,7 @@ dependencies: - pytest-instafail - pytest-rerunfailures - expecttest + - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_sota/scripts/run_all.sh b/.github/unittest/linux_sota/scripts/run_all.sh index e5e1029c609..969e3a527d8 100755 --- a/.github/unittest/linux_sota/scripts/run_all.sh +++ b/.github/unittest/linux_sota/scripts/run_all.sh @@ -8,7 +8,7 @@ set -v apt-get update && apt-get upgrade -y -apt-get install -y vim git wget +apt-get install -y vim git wget cmake apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev libosmesa6-dev apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 diff --git a/.github/unittest/windows_optdepts/scripts/environment.yml b/.github/unittest/windows_optdepts/scripts/environment.yml index 2740c77f434..2b1abf1650a 100644 --- a/.github/unittest/windows_optdepts/scripts/environment.yml +++ b/.github/unittest/windows_optdepts/scripts/environment.yml @@ -13,6 +13,7 @@ dependencies: - pytest-instafail - pytest-rerunfailures - expecttest + - pybind11[global] - pyyaml - scipy - coverage diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 8a27a8d076f..f90b02055fe 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -97,7 +97,7 @@ jobs: export TZ=Europe/London export DEBIAN_FRONTEND=noninteractive # tzdata bug apt-get update -y - apt-get install software-properties-common -y + apt-get install software-properties-common cmake -y add-apt-repository ppa:git-core/candidate -y apt-get update -y apt-get upgrade -y diff --git a/.github/workflows/benchmarks_pr.yml b/.github/workflows/benchmarks_pr.yml index e57483f3095..e6e063c340f 100644 --- a/.github/workflows/benchmarks_pr.yml +++ b/.github/workflows/benchmarks_pr.yml @@ -106,7 +106,7 @@ jobs: export TZ=Europe/London export DEBIAN_FRONTEND=noninteractive # tzdata bug apt-get update -y - apt-get install software-properties-common -y + apt-get install software-properties-common cmake -y add-apt-repository ppa:git-core/candidate -y apt-get update -y apt-get upgrade -y diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index eb9b05bbb32..f35a247ef74 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,7 +37,7 @@ jobs: script: | set -e set -v - # apt-get update && apt-get install -y -f git wget gcc g++ dialog apt-utils + # apt-get update && apt-get install -y -f git wget gcc g++ dialog apt-utils cmake yum makecache # Install Mesa and OpenGL Libraries: yum install -y glfw mesa-libGL mesa-libGL-devel egl-utils freeglut mesa-libGLU mesa-libEGL From b0c58e9461cf08890b391dfe45c42c4aa6240231 Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Fri, 25 Apr 2025 08:15:36 +0100 Subject: [PATCH 3/8] Update [ghstack-poisoned] --- .github/scripts/pre-build-script-win.sh | 2 ++ .github/scripts/pre-build-script.sh | 2 ++ .github/scripts/td_script.sh | 4 ++++ .../linux_olddeps/scripts_gym_0_13/install.sh | 2 +- .../scripts_gym_0_13/post_process.sh | 1 + .../linux_olddeps/scripts_gym_0_13/run_test.sh | 1 + .../scripts_gym_0_13/setup_env.sh | 18 ++++++++++++++++-- 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/scripts/pre-build-script-win.sh b/.github/scripts/pre-build-script-win.sh index e1225595623..7d9db18efae 100644 --- a/.github/scripts/pre-build-script-win.sh +++ b/.github/scripts/pre-build-script-win.sh @@ -4,4 +4,6 @@ pip install --upgrade setuptools export TORCHRL_BUILD_VERSION=0.8.0 +${CONDA_RUN} pip install "pybind11[global]" +${CONDA_RUN} conda install anaconda::cmake ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U diff --git a/.github/scripts/pre-build-script.sh b/.github/scripts/pre-build-script.sh index 5d19a6054ce..a822e20ef4e 100644 --- a/.github/scripts/pre-build-script.sh +++ b/.github/scripts/pre-build-script.sh @@ -2,4 +2,6 @@ pip install --upgrade setuptools +${CONDA_RUN} pip install "pybind11[global]" +${CONDA_RUN} conda install anaconda::cmake ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U diff --git a/.github/scripts/td_script.sh b/.github/scripts/td_script.sh index 6b1ace72c2f..00091ef250c 100644 --- a/.github/scripts/td_script.sh +++ b/.github/scripts/td_script.sh @@ -9,6 +9,8 @@ ARCH=${ARCH:-} # This sets ARCH to an empty string if it's not defined if pip list | grep -q torch; then echo "Torch is installed." if [[ "$ARCH" == "aarch64" ]]; then + ${CONDA_RUN} pip install "pybind11[global]" + ${CONDA_RUN} conda install anaconda::cmake ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps else ${CONDA_RUN} pip install tensordict-nightly -U @@ -16,6 +18,8 @@ if pip list | grep -q torch; then elif [[ -n "${SMOKE_TEST_SCRIPT:-}" ]]; then ${CONDA_RUN} ${PIP_INSTALL_TORCH} if [[ "$ARCH" == "aarch64" ]]; then + ${CONDA_RUN} pip install "pybind11[global]" + ${CONDA_RUN} conda install anaconda::cmake ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps else ${CONDA_RUN} pip install tensordict-nightly -U diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh index 7def0e28f5e..470e67b0ba3 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh @@ -4,9 +4,9 @@ unset PYTORCH_VERSION # For unittest, nightly PyTorch is used as the following section, # so no need to set PYTORCH_VERSION. # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config. -apt-get update && apt-get install -y git wget libglew-dev libx11-dev x11proto-dev g++ gcc cmake set -e +set -v eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/post_process.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/post_process.sh index e97bf2a7b1b..a30db0d17d4 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/post_process.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/post_process.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -e +set -v eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/run_test.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/run_test.sh index 2d81f8b614f..48ea0aac221 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/run_test.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/run_test.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -e +set -v eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh index 2f55ece8b27..7ef14ba30af 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh @@ -6,10 +6,24 @@ # Do not install PyTorch and torchvision here, otherwise they also get cached. set -e +set -v this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -# Avoid error: "fatal: unsafe repository" -apt-get update && apt-get install -y git wget gcc g++ cmake + +apt-get update && apt-get upgrade -y +apt-get install -y vim git wget libsdl2-dev libsdl2-2.0-0 cmake + +apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev +apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 + +if [ "${CU_VERSION:-}" == cpu ] ; then + # solves version `GLIBCXX_3.4.29' not found for tensorboard +# apt-get install -y gcc-4.9 + apt-get upgrade -y libstdc++6 + apt-get dist-upgrade -y +else + apt-get install -y g++ gcc +fi git config --global --add safe.directory '*' root_dir="$(git rev-parse --show-toplevel)" From 905a02251b856d3213bd22fd0d1d5e39b96fbd1a Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Fri, 25 Apr 2025 08:33:05 +0100 Subject: [PATCH 4/8] Update [ghstack-poisoned] --- .github/scripts/pre-build-script-win.sh | 2 +- .github/scripts/pre-build-script.sh | 2 +- .github/scripts/td_script.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/pre-build-script-win.sh b/.github/scripts/pre-build-script-win.sh index 7d9db18efae..d30410431b9 100644 --- a/.github/scripts/pre-build-script-win.sh +++ b/.github/scripts/pre-build-script-win.sh @@ -5,5 +5,5 @@ pip install --upgrade setuptools export TORCHRL_BUILD_VERSION=0.8.0 ${CONDA_RUN} pip install "pybind11[global]" -${CONDA_RUN} conda install anaconda::cmake +${CONDA_RUN} conda install anaconda::cmake -y ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U diff --git a/.github/scripts/pre-build-script.sh b/.github/scripts/pre-build-script.sh index a822e20ef4e..0763073ec50 100644 --- a/.github/scripts/pre-build-script.sh +++ b/.github/scripts/pre-build-script.sh @@ -3,5 +3,5 @@ pip install --upgrade setuptools ${CONDA_RUN} pip install "pybind11[global]" -${CONDA_RUN} conda install anaconda::cmake +${CONDA_RUN} conda install anaconda::cmake -y ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U diff --git a/.github/scripts/td_script.sh b/.github/scripts/td_script.sh index 00091ef250c..58a34d5824f 100644 --- a/.github/scripts/td_script.sh +++ b/.github/scripts/td_script.sh @@ -10,7 +10,7 @@ if pip list | grep -q torch; then echo "Torch is installed." if [[ "$ARCH" == "aarch64" ]]; then ${CONDA_RUN} pip install "pybind11[global]" - ${CONDA_RUN} conda install anaconda::cmake + ${CONDA_RUN} conda install anaconda::cmake -y ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps else ${CONDA_RUN} pip install tensordict-nightly -U @@ -19,7 +19,7 @@ elif [[ -n "${SMOKE_TEST_SCRIPT:-}" ]]; then ${CONDA_RUN} ${PIP_INSTALL_TORCH} if [[ "$ARCH" == "aarch64" ]]; then ${CONDA_RUN} pip install "pybind11[global]" - ${CONDA_RUN} conda install anaconda::cmake + ${CONDA_RUN} conda install anaconda::cmake -y ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps else ${CONDA_RUN} pip install tensordict-nightly -U From 72cfbb9a16c24405f2958344b01cc3b3ebdb821c Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Fri, 25 Apr 2025 09:04:19 +0100 Subject: [PATCH 5/8] Update [ghstack-poisoned] --- .../unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh | 8 ++++++-- .github/workflows/test-linux.yml | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh index 7ef14ba30af..d5e8770a2a3 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh @@ -11,11 +11,15 @@ set -v this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" apt-get update && apt-get upgrade -y -apt-get install -y vim git wget libsdl2-dev libsdl2-2.0-0 cmake +printf "* Installing vim - git - wget - cmake\n" +apt-get install -y vim git wget cmake -apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev +printf "* Installing glfw - glew - osmesa part 1\n" apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 +printf "* Installing glfw - glew - osmesa part 2\n" +apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev libsdl2-dev libsdl2-2.0-0 + if [ "${CU_VERSION:-}" == cpu ] ; then # solves version `GLIBCXX_3.4.29' not found for tensorboard # apt-get install -y gcc-4.9 diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 17d946aaa47..717214c30ff 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -98,10 +98,12 @@ jobs: cuda_arch_version: ["11.6"] uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main with: + runner: linux.g5.4xlarge.nvidia.gpu repository: pytorch/rl - runner: "linux.g5.4xlarge.nvidia.gpu" docker-image: "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04" - timeout: 120 + gpu-arch-type: cuda + gpu-arch-version: ${{ matrix.cuda_arch_version }} + timeout: 90 script: | set -euo pipefail export PYTHON_VERSION="3.9" From d58addd42f80a0f6f7cdd3ca80d2de64a91695be Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Fri, 25 Apr 2025 09:51:55 +0100 Subject: [PATCH 6/8] Update [ghstack-poisoned] --- .../unittest/linux_olddeps/scripts_gym_0_13/environment.yml | 1 - .github/unittest/linux_olddeps/scripts_gym_0_13/install.sh | 2 ++ .github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml b/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml index 105914f9e66..a79a009ad0c 100644 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/environment.yml @@ -18,7 +18,6 @@ dependencies: - pytest-instafail - pytest-rerunfailures - expecttest - - pybind11[global] - pyyaml - scipy - hydra-core diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh index 470e67b0ba3..bf74d774d68 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/install.sh @@ -48,6 +48,8 @@ fi # install tensordict if [[ "$RELEASE" == 0 ]]; then + conda install anaconda::cmake -y + python3 -m pip install "pybind11[global]" python3 -m pip install git+https://github.com/pytorch/tensordict.git else python3 -m pip install tensordict diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh index d5e8770a2a3..1d44f61f23b 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh @@ -11,8 +11,8 @@ set -v this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" apt-get update && apt-get upgrade -y -printf "* Installing vim - git - wget - cmake\n" -apt-get install -y vim git wget cmake +printf "* Installing vim - git - wget\n" +apt-get install -y vim git wget printf "* Installing glfw - glew - osmesa part 1\n" apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 From 09ad67d2bbf89b988349609f9218d832d84c899f Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Fri, 25 Apr 2025 11:37:45 +0100 Subject: [PATCH 7/8] Update [ghstack-poisoned] --- .github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh index 1d44f61f23b..2a2835e3b8b 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh @@ -17,8 +17,8 @@ apt-get install -y vim git wget printf "* Installing glfw - glew - osmesa part 1\n" apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 -printf "* Installing glfw - glew - osmesa part 2\n" -apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev libsdl2-dev libsdl2-2.0-0 +#printf "* Installing glfw - glew - osmesa part 2\n" +#apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev libsdl2-dev libsdl2-2.0-0 if [ "${CU_VERSION:-}" == cpu ] ; then # solves version `GLIBCXX_3.4.29' not found for tensorboard From 2d861c51390f0a0cdef2c3d4f5ed2ff0f8dbb0ef Mon Sep 17 00:00:00 2001 From: Vincent Moens Date: Fri, 25 Apr 2025 13:01:44 +0100 Subject: [PATCH 8/8] Update [ghstack-poisoned] --- .github/scripts/td_script.sh | 22 +++++++------------ .../scripts_gym_0_13/setup_env.sh | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/scripts/td_script.sh b/.github/scripts/td_script.sh index 58a34d5824f..8a845ad3289 100644 --- a/.github/scripts/td_script.sh +++ b/.github/scripts/td_script.sh @@ -8,22 +8,16 @@ ARCH=${ARCH:-} # This sets ARCH to an empty string if it's not defined if pip list | grep -q torch; then echo "Torch is installed." - if [[ "$ARCH" == "aarch64" ]]; then - ${CONDA_RUN} pip install "pybind11[global]" - ${CONDA_RUN} conda install anaconda::cmake -y - ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps - else - ${CONDA_RUN} pip install tensordict-nightly -U - fi + ${CONDA_RUN} pip install "pybind11[global]" + ${CONDA_RUN} conda install anaconda::cmake -y + ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps elif [[ -n "${SMOKE_TEST_SCRIPT:-}" ]]; then ${CONDA_RUN} ${PIP_INSTALL_TORCH} - if [[ "$ARCH" == "aarch64" ]]; then - ${CONDA_RUN} pip install "pybind11[global]" - ${CONDA_RUN} conda install anaconda::cmake -y - ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps - else - ${CONDA_RUN} pip install tensordict-nightly -U - fi + # TODO: revert when nightlies of tensordict are fixed + # if [[ "$ARCH" == "aarch64" ]]; then + ${CONDA_RUN} pip install "pybind11[global]" + ${CONDA_RUN} conda install anaconda::cmake -y + ${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U --no-deps else echo "Torch is not installed - tensordict will be installed later." fi diff --git a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh index 2a2835e3b8b..ba410d5e5ca 100755 --- a/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh +++ b/.github/unittest/linux_olddeps/scripts_gym_0_13/setup_env.sh @@ -15,7 +15,7 @@ printf "* Installing vim - git - wget\n" apt-get install -y vim git wget printf "* Installing glfw - glew - osmesa part 1\n" -apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 +apt-get install -y libglvnd0 libgl1 libglx0 libegl1 libgles2 xvfb #printf "* Installing glfw - glew - osmesa part 2\n" #apt-get install -y libglfw3 libgl1-mesa-glx libosmesa6 libglew-dev libsdl2-dev libsdl2-2.0-0