Skip to content

Commit 38c577d

Browse files
committed
Update
[ghstack-poisoned]
2 parents c5997a3 + 64409f2 commit 38c577d

File tree

42 files changed

+2053
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2053
-433
lines changed

.github/unittest/linux_libs/scripts_isaaclab/isaac.sh

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export TF_CPP_MIN_LOG_LEVEL=0
2020
export BATCHED_PIPE_TIMEOUT=60
2121
export TD_GET_DEFAULTS_TO_NONE=1
2222
export OMNI_KIT_ACCEPT_EULA=yes
23+
export PIP_DISABLE_PIP_VERSION_CHECK=1
24+
export PYTHONNOUSERSITE=1
2325

2426
nvidia-smi
2527

@@ -46,36 +48,49 @@ eval "$(${conda_dir}/bin/conda shell.bash hook)"
4648
conda create --prefix ${env_dir} python=3.10 -y
4749
conda activate ${env_dir}
4850

51+
# Set LD_LIBRARY_PATH to prioritize conda environment libraries
52+
export LD_LIBRARY_PATH=${lib_dir}:${LD_LIBRARY_PATH:-}
53+
54+
# Install a compatible version of expat (< 2.6.0 to avoid XML_SetReparseDeferralEnabled symbol issues)
55+
conda install -c conda-forge "expat<2.6" -y
56+
57+
# Reinstall Python to ensure it's properly linked against the conda expat
58+
conda install --force-reinstall python=3.10 -y
59+
60+
# Verify the expat linkage
61+
echo "* Checking pyexpat linkage:"
62+
python -c "import pyexpat; print('pyexpat imported successfully')" || echo "WARNING: pyexpat import failed"
63+
4964
# Pin pytorch to 2.5.1 for IsaacLab
5065
conda install pytorch==2.5.1 torchvision==0.20.1 pytorch-cuda=12.4 -c pytorch -c nvidia -y
5166

52-
conda run -p ${env_dir} pip install --upgrade pip
53-
conda run -p ${env_dir} pip install 'isaacsim[all,extscache]==4.5.0' --extra-index-url https://pypi.nvidia.com
67+
python -m pip install --upgrade pip --disable-pip-version-check
68+
python -m pip install 'isaacsim[all,extscache]==4.5.0' --extra-index-url https://pypi.nvidia.com --disable-pip-version-check
5469
conda install conda-forge::"cmake>3.22" -y
5570

5671
git clone https://github.com/isaac-sim/IsaacLab.git
5772
cd IsaacLab
58-
conda run -p ${env_dir} ./isaaclab.sh --install sb3
73+
./isaaclab.sh --install sb3
5974
cd ../
6075

6176
# install tensordict
6277
if [[ "$RELEASE" == 0 ]]; then
6378
conda install "anaconda::cmake>=3.22" -y
64-
conda run -p ${env_dir} python -m pip install "pybind11[global]"
65-
conda run -p ${env_dir} python -m pip install git+https://github.com/pytorch/tensordict.git
79+
python -m pip install "pybind11[global]" --disable-pip-version-check
80+
python -m pip install git+https://github.com/pytorch/tensordict.git --disable-pip-version-check
6681
else
67-
conda run -p ${env_dir} python -m pip install tensordict
82+
python -m pip install tensordict --disable-pip-version-check
6883
fi
6984

7085
# smoke test
71-
conda run -p ${env_dir} python -c "import tensordict"
86+
python -c "import tensordict"
7287

7388
printf "* Installing torchrl\n"
74-
conda run -p ${env_dir} python -m pip install -e . --no-build-isolation
75-
conda run -p ${env_dir} python -c "import torchrl"
89+
python -m pip install -e . --no-build-isolation --disable-pip-version-check
90+
python -c "import torchrl"
7691

7792
# Install pytest
78-
conda run -p ${env_dir} python -m pip install pytest pytest-cov pytest-mock pytest-instafail pytest-rerunfailures pytest-error-for-skips pytest-asyncio
93+
python -m pip install pytest pytest-cov pytest-mock pytest-instafail pytest-rerunfailures pytest-error-for-skips pytest-asyncio --disable-pip-version-check
7994

8095
# Run tests
81-
conda run -p ${env_dir} python -m pytest test/test_libs.py -k isaac -s
96+
python -m pytest test/test_libs.py -k isaac -s

.github/unittest/linux_libs/scripts_minari/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ dependencies:
2525
- gymnasium-robotics
2626
- minari[create]
2727
- jax>=0.7.0
28-
- mujoco<3.3.6
28+
- mujoco>=2.3.0,<3.0.0
2929
- mujoco-py<2.2,>=2.1
3030
- minigrid

.github/workflows/test-linux-libs.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -91,40 +91,40 @@ jobs:
9191
9292
bash .github/unittest/linux_libs/scripts_brax/run_all.sh
9393
94-
unittests-d4rl:
95-
strategy:
96-
matrix:
97-
python_version: ["3.10"]
98-
cuda_arch_version: ["12.8"]
99-
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'Data') }}
100-
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
101-
with:
102-
repository: pytorch/rl
103-
runner: "linux.g5.4xlarge.nvidia.gpu"
104-
docker-image: "nvidia/cuda:12.4.0-devel-ubuntu22.04"
105-
timeout: 120
106-
script: |
107-
if [[ "${{ github.ref }}" =~ release/* ]]; then
108-
export RELEASE=1
109-
export TORCH_VERSION=stable
110-
else
111-
export RELEASE=0
112-
export TORCH_VERSION=nightly
113-
fi
94+
# unittests-d4rl:
95+
# strategy:
96+
# matrix:
97+
# python_version: ["3.10"]
98+
# cuda_arch_version: ["12.8"]
99+
# if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'Data') }}
100+
# uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
101+
# with:
102+
# repository: pytorch/rl
103+
# runner: "linux.g5.4xlarge.nvidia.gpu"
104+
# docker-image: "nvidia/cuda:12.4.0-devel-ubuntu22.04"
105+
# timeout: 120
106+
# script: |
107+
# if [[ "${{ github.ref }}" =~ release/* ]]; then
108+
# export RELEASE=1
109+
# export TORCH_VERSION=stable
110+
# else
111+
# export RELEASE=0
112+
# export TORCH_VERSION=nightly
113+
# fi
114114

115-
set -euo pipefail
116-
export PYTHON_VERSION="3.10"
117-
export CU_VERSION="cu128"
118-
export TAR_OPTIONS="--no-same-owner"
119-
export UPLOAD_CHANNEL="nightly"
120-
export TF_CPP_MIN_LOG_LEVEL=0
121-
export BATCHED_PIPE_TIMEOUT=60
122-
export TD_GET_DEFAULTS_TO_NONE=1
115+
# set -euo pipefail
116+
# export PYTHON_VERSION="3.10"
117+
# export CU_VERSION="cu128"
118+
# export TAR_OPTIONS="--no-same-owner"
119+
# export UPLOAD_CHANNEL="nightly"
120+
# export TF_CPP_MIN_LOG_LEVEL=0
121+
# export BATCHED_PIPE_TIMEOUT=60
122+
# export TD_GET_DEFAULTS_TO_NONE=1
123123

124-
bash .github/unittest/linux_libs/scripts_d4rl/setup_env.sh
125-
bash .github/unittest/linux_libs/scripts_d4rl/install.sh
126-
bash .github/unittest/linux_libs/scripts_d4rl/run_test.sh
127-
bash .github/unittest/linux_libs/scripts_d4rl/post_process.sh
124+
# bash .github/unittest/linux_libs/scripts_d4rl/setup_env.sh
125+
# bash .github/unittest/linux_libs/scripts_d4rl/install.sh
126+
# bash .github/unittest/linux_libs/scripts_d4rl/run_test.sh
127+
# bash .github/unittest/linux_libs/scripts_d4rl/post_process.sh
128128

129129
unittests-envpool:
130130
strategy:
@@ -156,10 +156,10 @@ jobs:
156156
export BATCHED_PIPE_TIMEOUT=60
157157
export TD_GET_DEFAULTS_TO_NONE=1
158158
159-
bash .github/unittest/linux_libs/scripts_d4rl/setup_env.sh
160-
bash .github/unittest/linux_libs/scripts_d4rl/install.sh
161-
bash .github/unittest/linux_libs/scripts_d4rl/run_test.sh
162-
bash .github/unittest/linux_libs/scripts_d4rl/post_process.sh
159+
bash .github/unittest/linux_libs/scripts_envpool/setup_env.sh
160+
bash .github/unittest/linux_libs/scripts_envpool/install.sh
161+
bash .github/unittest/linux_libs/scripts_envpool/run_test.sh
162+
bash .github/unittest/linux_libs/scripts_envpool/post_process.sh
163163
164164
unittests-gendgrl:
165165
strategy:

docs/source/reference/envs.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,6 +1130,7 @@ to be able to create this other composition:
11301130
InitTracker
11311131
KLRewardTransform
11321132
LineariseRewards
1133+
ModuleTransform
11331134
MultiAction
11341135
NoopResetEnv
11351136
ObservationNorm

examples/distributed/collectors/multi_nodes/delayed_dist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def make_env():
150150
if i == 10:
151151
t0 = time.time()
152152
t1 = time.time()
153-
torchrl_logger.info(f"time elapsed: {t1-t0}s, rate: {counter/(t1-t0)} fps")
153+
torchrl_logger.info(f"time elapsed: {t1 - t0}s, rate: {counter / (t1 - t0)} fps")
154154
collector.shutdown()
155155
exit()
156156

examples/distributed/collectors/multi_nodes/delayed_rpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def make_env():
148148
if i == 10:
149149
t0 = time.time()
150150
t1 = time.time()
151-
torchrl_logger.info(f"time elapsed: {t1-t0}s, rate: {counter/(t1-t0)} fps")
151+
torchrl_logger.info(f"time elapsed: {t1 - t0}s, rate: {counter / (t1 - t0)} fps")
152152
collector.shutdown()
153153
exit()
154154

examples/distributed/collectors/multi_nodes/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,5 @@ def gym_make():
125125
t0 = time.time()
126126
collector.shutdown()
127127
t1 = time.time()
128-
torchrl_logger.info(f"time elapsed: {t1-t0}s, rate: {counter/(t1-t0)} fps")
128+
torchrl_logger.info(f"time elapsed: {t1 - t0}s, rate: {counter / (t1 - t0)} fps")
129129
exit()

examples/distributed/collectors/multi_nodes/rpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,5 @@ def gym_make():
113113
t0 = time.time()
114114
collector.shutdown()
115115
t1 = time.time()
116-
torchrl_logger.info(f"time elapsed: {t1-t0}s, rate: {counter/(t1-t0)} fps")
116+
torchrl_logger.info(f"time elapsed: {t1 - t0}s, rate: {counter / (t1 - t0)} fps")
117117
exit()

examples/distributed/collectors/multi_nodes/sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,5 @@ def gym_make():
119119
t0 = time.time()
120120
collector.shutdown()
121121
t1 = time.time()
122-
torchrl_logger.info(f"time elapsed: {t1-t0}s, rate: {counter/(t1-t0)} fps")
122+
torchrl_logger.info(f"time elapsed: {t1 - t0}s, rate: {counter / (t1 - t0)} fps")
123123
exit()

examples/distributed/collectors/single_machine/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,5 @@ def gym_make():
160160
t0 = time.time()
161161
collector.shutdown()
162162
t1 = time.time()
163-
torchrl_logger.info(f"time elapsed: {t1-t0}s, rate: {counter/(t1-t0)} fps")
163+
torchrl_logger.info(f"time elapsed: {t1 - t0}s, rate: {counter / (t1 - t0)} fps")
164164
exit()

0 commit comments

Comments
 (0)