Skip to content

Commit 721a99a

Browse files
author
Vincent Moens
committed
Update (base update)
[ghstack-poisoned]
2 parents bbe0c1d + b538c66 commit 721a99a

File tree

182 files changed

+7944
-4124
lines changed

Some content is hidden

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

182 files changed

+7944
-4124
lines changed

.github/scripts/td_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
export TORCHRL_BUILD_VERSION=0.6.1
3+
export TORCHRL_BUILD_VERSION=0.7.0
44

55
${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U

.github/scripts/version_script.bat

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
11
@echo off
2-
set TORCHRL_BUILD_VERSION=0.6.1
2+
set TORCHRL_BUILD_VERSION=0.7.0
33
echo TORCHRL_BUILD_VERSION is set to %TORCHRL_BUILD_VERSION%
4+
5+
@echo on
6+
7+
set VC_VERSION_LOWER=17
8+
set VC_VERSION_UPPER=18
9+
if "%VC_YEAR%" == "2019" (
10+
set VC_VERSION_LOWER=16
11+
set VC_VERSION_UPPER=17
12+
)
13+
if "%VC_YEAR%" == "2017" (
14+
set VC_VERSION_LOWER=15
15+
set VC_VERSION_UPPER=16
16+
)
17+
18+
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -legacy -products * -version [%VC_VERSION_LOWER%^,%VC_VERSION_UPPER%^) -property installationPath`) do (
19+
if exist "%%i" if exist "%%i\VC\Auxiliary\Build\vcvarsall.bat" (
20+
set "VS15INSTALLDIR=%%i"
21+
set "VS15VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat"
22+
goto vswhere
23+
)
24+
)
25+
26+
:vswhere
27+
if "%VSDEVCMD_ARGS%" == "" (
28+
call "%VS15VCVARSALL%" x64 || exit /b 1
29+
) else (
30+
call "%VS15VCVARSALL%" x64 %VSDEVCMD_ARGS% || exit /b 1
31+
)
32+
33+
@echo on
34+
35+
if "%CU_VERSION%" == "xpu" call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
36+
37+
set DISTUTILS_USE_SDK=1
38+
39+
set args=%1
40+
shift
41+
:start
42+
if [%1] == [] goto done
43+
set args=%args% %1
44+
shift
45+
goto start
46+
47+
:done
48+
if "%args%" == "" (
49+
echo Usage: vc_env_helper.bat [command] [args]
50+
echo e.g. vc_env_helper.bat cl /c test.cpp
51+
)
52+
53+
%args% || exit /b 1

.github/unittest/linux/scripts/run_all.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ export DISPLAY=:0
8080
export SDL_VIDEODRIVER=dummy
8181

8282
# legacy from bash scripts: remove?
83-
conda env config vars set MUJOCO_GL=$MUJOCO_GL PYOPENGL_PLATFORM=$MUJOCO_GL DISPLAY=:0 SDL_VIDEODRIVER=dummy LAZY_LEGACY_OP=False RL_LOGGING_LEVEL=DEBUG TOKENIZERS_PARALLELISM=true
83+
conda env config vars set \
84+
MAX_IDLE_COUNT=1000 \
85+
MUJOCO_GL=$MUJOCO_GL PYOPENGL_PLATFORM=$MUJOCO_GL DISPLAY=:0 SDL_VIDEODRIVER=dummy LAZY_LEGACY_OP=False RL_LOGGING_LEVEL=DEBUG TOKENIZERS_PARALLELISM=true
8486

8587
pip3 install pip --upgrade
8688
pip install virtualenv

.github/unittest/linux_distributed/scripts/setup_env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ fi
6464

6565
export MUJOCO_GL=$PRIVATE_MUJOCO_GL
6666
conda env config vars set MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco210 \
67+
MAX_IDLE_COUNT=1000 \
6768
DISPLAY=unix:0.0 \
6869
MJLIB_PATH=$root_dir/.mujoco/mujoco-2.1.1/lib/libmujoco.so.2.1.1 \
6970
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root_dir/.mujoco/mujoco210/bin \

.github/unittest/linux_libs/scripts_ataridqn/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ fi
2828
# submodules
2929
git submodule sync && git submodule update --init --recursive
3030

31-
printf "Installing PyTorch with cu121"
31+
printf "Installing PyTorch with cu124"
3232
if [[ "$TORCH_VERSION" == "nightly" ]]; then
3333
if [ "${CU_VERSION:-}" == cpu ] ; then
3434
pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cpu -U
3535
else
36-
pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu121 -U
36+
pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu124 -U
3737
fi
3838
elif [[ "$TORCH_VERSION" == "stable" ]]; then
3939
if [ "${CU_VERSION:-}" == cpu ] ; then
4040
pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cpu
4141
else
42-
pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu121
42+
pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu124
4343
fi
4444
else
4545
printf "Failed to install pytorch"

.github/unittest/linux_libs/scripts_brax/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ fi
2525
# submodules
2626
git submodule sync && git submodule update --init --recursive
2727

28-
printf "Installing PyTorch with cu121"
28+
printf "Installing PyTorch with cu124"
2929
if [[ "$TORCH_VERSION" == "nightly" ]]; then
3030
if [ "${CU_VERSION:-}" == cpu ] ; then
3131
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu -U
3232
else
33-
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cu121 -U
33+
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cu124 -U
3434
fi
3535
elif [[ "$TORCH_VERSION" == "stable" ]]; then
3636
if [ "${CU_VERSION:-}" == cpu ] ; then
3737
pip3 install torch --index-url https://download.pytorch.org/whl/cpu -U
3838
else
39-
pip3 install torch --index-url https://download.pytorch.org/whl/cu121
39+
pip3 install torch --index-url https://download.pytorch.org/whl/cu124
4040
fi
4141
else
4242
printf "Failed to install pytorch"

.github/unittest/linux_libs/scripts_chess/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ fi
2525
# submodules
2626
git submodule sync && git submodule update --init --recursive
2727

28-
printf "Installing PyTorch with cu121"
28+
printf "Installing PyTorch with cu124"
2929
if [[ "$TORCH_VERSION" == "nightly" ]]; then
3030
if [ "${CU_VERSION:-}" == cpu ] ; then
3131
pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cpu -U
3232
else
33-
pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu121 -U
33+
pip3 install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu124 -U
3434
fi
3535
elif [[ "$TORCH_VERSION" == "stable" ]]; then
3636
if [ "${CU_VERSION:-}" == cpu ] ; then
3737
pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cpu
3838
else
39-
pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu121
39+
pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu124
4040
fi
4141
else
4242
printf "Failed to install pytorch"

.github/unittest/linux_libs/scripts_d4rl/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ fi
2828
# submodules
2929
git submodule sync && git submodule update --init --recursive
3030

31-
printf "Installing PyTorch with cu121"
31+
printf "Installing PyTorch with cu124"
3232
if [[ "$TORCH_VERSION" == "nightly" ]]; then
3333
if [ "${CU_VERSION:-}" == cpu ] ; then
3434
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu -U
3535
else
36-
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cu121 -U
36+
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cu124 -U
3737
fi
3838
elif [[ "$TORCH_VERSION" == "stable" ]]; then
3939
if [ "${CU_VERSION:-}" == cpu ] ; then
4040
pip3 install torch --index-url https://download.pytorch.org/whl/cpu
4141
else
42-
pip3 install torch --index-url https://download.pytorch.org/whl/cu121
42+
pip3 install torch --index-url https://download.pytorch.org/whl/cu124
4343
fi
4444
else
4545
printf "Failed to install pytorch"

.github/unittest/linux_libs/scripts_d4rl/setup_env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ fi
8585

8686
export MUJOCO_GL=$PRIVATE_MUJOCO_GL
8787
conda env config vars set \
88+
MAX_IDLE_COUNT=1000 \
8889
MUJOCO_PY_MUJOCO_PATH=$root_dir/.mujoco/mujoco200_linux \
8990
DISPLAY=unix:0.0 \
9091
MJLIB_PATH=$root_dir/.mujoco/mujoco200_linux/bin/libmujoco200.so \

.github/unittest/linux_libs/scripts_envpool/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ fi
2626
# submodules
2727
git submodule sync && git submodule update --init --recursive
2828

29-
printf "Installing PyTorch with cu121"
29+
printf "Installing PyTorch with cu124"
3030
if [ "${CU_VERSION:-}" == cpu ] ; then
3131
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu -U
3232
else
33-
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cu121 -U
33+
pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cu124 -U
3434
fi
3535

3636
# smoke test

0 commit comments

Comments
 (0)