Skip to content

Commit 0e88b21

Browse files
bottlerfacebook-github-bot
authored andcommitted
Use newer circleci image
Summary: Run the circleci tests with a non depracated circleci image. Small fix for PyTorch 1.7. We no longer need to manually install nvidia-docker or the CUDA driver. Reviewed By: patricklabatut Differential Revision: D34426816 fbshipit-source-id: d6c67bfb0ff86dff8d8f7fe7b8801657c2e80030
1 parent 1cbf80d commit 0e88b21

File tree

2 files changed

+4
-84
lines changed

2 files changed

+4
-84
lines changed

.circleci/config.in.yml

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -128,55 +128,15 @@ jobs:
128128
binary_linux_conda_cuda:
129129
<<: *binary_common
130130
machine:
131-
image: ubuntu-1604:201903-01
131+
image: ubuntu-1604-cuda-10.2:202012-01
132132
resource_class: gpu.nvidia.small.multi
133133
steps:
134134
- checkout
135-
- run:
136-
name: Setup environment
137-
command: |
138-
set -e
139-
140-
curl -L https://packagecloud.io/circleci/trusty/gpgkey | sudo apt-key add -
141-
curl -L https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
142-
143-
sudo apt-get update
144-
145-
sudo apt-get install \
146-
apt-transport-https \
147-
ca-certificates \
148-
curl \
149-
gnupg-agent \
150-
software-properties-common
151-
152-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
153-
154-
sudo add-apt-repository \
155-
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
156-
$(lsb_release -cs) \
157-
stable"
158-
159-
sudo apt-get update
160-
export DOCKER_VERSION="5:19.03.2~3-0~ubuntu-xenial"
161-
sudo apt-get install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION} containerd.io=1.2.6-3
162-
163-
# Add the package repositories
164-
distribution=$(. /etc/os-release;echo $ID$VERSION_ID)
165-
curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add -
166-
curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list
167-
168-
export NVIDIA_CONTAINER_VERSION="1.0.3-1"
169-
sudo apt-get update && sudo apt-get install -y nvidia-container-toolkit=${NVIDIA_CONTAINER_VERSION}
170-
sudo systemctl restart docker
171-
172-
DRIVER_FN="NVIDIA-Linux-x86_64-460.84.run"
173-
wget "https://us.download.nvidia.com/XFree86/Linux-x86_64/460.84/$DRIVER_FN"
174-
sudo /bin/bash "$DRIVER_FN" -s --no-drm || (sudo cat /var/log/nvidia-installer.log && false)
175-
nvidia-smi
176135

177136
- run:
178137
name: Pull docker image
179138
command: |
139+
nvidia-smi
180140
set -e
181141
182142
{ docker login -u="$DOCKERHUB_USERNAME" -p="$DOCKERHUB_TOKEN" ; } 2> /dev/null

.circleci/config.yml

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -128,55 +128,15 @@ jobs:
128128
binary_linux_conda_cuda:
129129
<<: *binary_common
130130
machine:
131-
image: ubuntu-1604:201903-01
131+
image: ubuntu-1604-cuda-10.2:202012-01
132132
resource_class: gpu.nvidia.small.multi
133133
steps:
134134
- checkout
135-
- run:
136-
name: Setup environment
137-
command: |
138-
set -e
139-
140-
curl -L https://packagecloud.io/circleci/trusty/gpgkey | sudo apt-key add -
141-
curl -L https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
142-
143-
sudo apt-get update
144-
145-
sudo apt-get install \
146-
apt-transport-https \
147-
ca-certificates \
148-
curl \
149-
gnupg-agent \
150-
software-properties-common
151-
152-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
153-
154-
sudo add-apt-repository \
155-
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
156-
$(lsb_release -cs) \
157-
stable"
158-
159-
sudo apt-get update
160-
export DOCKER_VERSION="5:19.03.2~3-0~ubuntu-xenial"
161-
sudo apt-get install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION} containerd.io=1.2.6-3
162-
163-
# Add the package repositories
164-
distribution=$(. /etc/os-release;echo $ID$VERSION_ID)
165-
curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add -
166-
curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list
167-
168-
export NVIDIA_CONTAINER_VERSION="1.0.3-1"
169-
sudo apt-get update && sudo apt-get install -y nvidia-container-toolkit=${NVIDIA_CONTAINER_VERSION}
170-
sudo systemctl restart docker
171-
172-
DRIVER_FN="NVIDIA-Linux-x86_64-460.84.run"
173-
wget "https://us.download.nvidia.com/XFree86/Linux-x86_64/460.84/$DRIVER_FN"
174-
sudo /bin/bash "$DRIVER_FN" -s --no-drm || (sudo cat /var/log/nvidia-installer.log && false)
175-
nvidia-smi
176135

177136
- run:
178137
name: Pull docker image
179138
command: |
139+
nvidia-smi
180140
set -e
181141
182142
{ docker login -u="$DOCKERHUB_USERNAME" -p="$DOCKERHUB_TOKEN" ; } 2> /dev/null

0 commit comments

Comments
 (0)