Skip to content

Commit 8503811

Browse files
authored
[BugFix]: Conda to pip for circleci (#310)
1 parent 565e868 commit 8503811

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

.circleci/unittest/linux/scripts/install.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ printf "Installing PyTorch with %s\n" "${CU_VERSION}"
3636
if [ "${CU_VERSION:-}" == cpu ] ; then
3737
# conda install -y pytorch torchvision cpuonly -c pytorch-nightly
3838
# use pip to install pytorch as conda can frequently pick older release
39-
conda install -y pytorch torchvision cpuonly -c pytorch-nightly
39+
# conda install -y pytorch torchvision cpuonly -c pytorch-nightly
40+
pip3 install --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu
4041
else
41-
conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch-nightly
42+
# conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch-nightly
43+
pip3 install --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cu113
4244
fi
4345

4446
printf "Installing functorch\n"

.circleci/unittest/linux/scripts/setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then
5757
PRIVATE_MUJOCO_GL=glfw
5858
else
5959
conda install -y -c conda-forge mesa
60-
conda install -y -c menpo osmesa
60+
conda install -y -c conda-forge mesalib
6161
PRIVATE_MUJOCO_GL=osmesa
6262
fi
6363

.circleci/unittest/linux_optdeps/scripts/install.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ printf "Installing PyTorch with %s\n" "${CU_VERSION}"
3636
if [ "${CU_VERSION:-}" == cpu ] ; then
3737
# conda install -y pytorch torchvision cpuonly -c pytorch-nightly
3838
# use pip to install pytorch as conda can frequently pick older release
39-
conda install -y pytorch cpuonly -c pytorch-nightly
39+
# conda install -y pytorch cpuonly -c pytorch-nightly
40+
pip3 install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/cpu
4041
else
41-
conda install -y pytorch cudatoolkit=11.3 -c pytorch-nightly
42+
# conda install -y pytorch cudatoolkit=11.3 -c pytorch-nightly
43+
pip3 install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/cu113
4244
fi
4345

4446
printf "Installing functorch\n"

.circleci/unittest/linux_stable/scripts/install.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ printf "Installing PyTorch with %s\n" "${CU_VERSION}"
3737
if [ "${CU_VERSION:-}" == cpu ] ; then
3838
# conda install -y pytorch torchvision cpuonly -c pytorch-nightly
3939
# use pip to install pytorch as conda can frequently pick older release
40-
conda install -y pytorch torchvision cpuonly -c pytorch
40+
# conda install -y pytorch torchvision cpuonly -c pytorch
41+
pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
4142
else
42-
conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch
43+
# conda install -y pytorch torchvision cudatoolkit=11.3 -c pytorch
44+
pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu113
4345
fi
4446

4547
printf "Installing functorch\n"

.circleci/unittest/linux_stable/scripts/setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then
5858
PRIVATE_MUJOCO_GL=glfw
5959
else
6060
conda install -y -c conda-forge mesa
61-
conda install -y -c menpo osmesa
61+
conda install -y -c conda-forge mesalib
6262
PRIVATE_MUJOCO_GL=osmesa
6363
fi
6464

test/test_transforms.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ def test_vecnorm_parallel_auto(nprc):
219219
for idx in range(nprc):
220220
queues[idx][1].put(msg)
221221

222-
for p in prcs:
223-
p.join()
224222
obs_sum = td.get("next_observation_sum").clone()
225223
obs_ssq = td.get("next_observation_ssq").clone()
226224
obs_count = td.get("next_observation_count").clone()
@@ -258,7 +256,10 @@ def test_vecnorm_parallel_auto(nprc):
258256
msg = "all_done"
259257
for idx in range(nprc):
260258
queues[idx][1].put(msg)
259+
261260
del queues
261+
for p in prcs:
262+
p.join()
262263

263264

264265
def _run_parallelenv(parallel_env, queue_in, queue_out):

0 commit comments

Comments
 (0)