Skip to content

Commit 34405ae

Browse files
author
Will Feng
committed
try to fix
1 parent 31ac199 commit 34405ae

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
162162
163163
pytorch_tutorial_build_worker_defaults: &pytorch_tutorial_build_worker_defaults
164164
environment:
165-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3"
166-
CUDA_VERSION: "9"
165+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7"
166+
CUDA_VERSION: "10"
167167
resource_class: gpu.medium
168168
<<: *pytorch_tutorial_build_defaults
169169

170170
pytorch_tutorial_build_manager_defaults: &pytorch_tutorial_build_manager_defaults
171171
environment:
172-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3"
172+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7"
173173
resource_class: medium
174174
<<: *pytorch_tutorial_build_defaults
175175

.jenkins/build.sh

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ pip install -e git+git://github.com/pytorch/pytorch_sphinx_theme.git#egg=pytorch
2525
# this is a workaround to the issue.
2626
pip install sphinx-gallery tqdm matplotlib ipython pillow==4.1.1
2727

28-
# Install torchvision from source
29-
git clone https://github.com/pytorch/vision --quiet
30-
pushd vision
31-
git checkout 76b2667958f994b7d942645285f777046d7d2d16
32-
pip install . --no-deps # We don't want it to install the stock PyTorch version from pip
33-
popd
28+
# Install torchvision from conda (and install torch along with it)
29+
if [[ $(pip show torch) ]]; then
30+
# Clean up previous PyTorch installations
31+
pip uninstall -y torch || true
32+
pip uninstall -y torch || true
33+
fi
34+
conda install -c pytorch torchvision
3435

3536
# Install torchaudio from source
3637
git clone https://github.com/pytorch/audio --quiet
@@ -40,17 +41,6 @@ popd
4041

4142
aws configure set default.s3.multipart_threshold 5120MB
4243

43-
if [[ $(pip show torch) ]]; then
44-
# Clean up previous PyTorch installations
45-
pip uninstall -y torch || true
46-
pip uninstall -y torch || true
47-
fi
48-
49-
# Install a nightly build of pytorch
50-
51-
# GPU, requires CUDA version 9.0
52-
pip install cython torch_nightly -f https://download.pytorch.org/whl/nightly/cu90/torch_nightly.html
53-
5444
# Decide whether to parallelize tutorial builds, based on $JOB_BASE_NAME
5545
export NUM_WORKERS=20
5646
if [[ "${JOB_BASE_NAME}" == *worker_* ]]; then

0 commit comments

Comments
 (0)