From 668678e753cfd76fe1f0bf36831f7d77dfb4b321 Mon Sep 17 00:00:00 2001 From: SsnL Date: Mon, 7 Jan 2019 12:29:17 -0800 Subject: [PATCH] Bump CircleCI docker version to 278 (#15795) Summary: Just changing the version number doesn't seem to work. I needed to also fix macos brew parallel conflict should this merge together with https://github.com/pytorch/ossci-job-dsl/pull/36 ? Pull Request resolved: https://github.com/pytorch/pytorch/pull/15795 Differential Revision: D13591839 Pulled By: yf225 fbshipit-source-id: 6b2a90943e63c8dcc4b6d9159eb54f1b5974c9ac --- .circleci/config.yml | 87 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 57213eb..e8eff41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # IMPORTANT: To update Docker image version, please search and update ":{previous_version}" # in this file to the new version number, and **ALSO** update the version number below: -# PyTorchDockerVersion:262 +# PyTorchDockerVersion:278 # Caffe2DockerVersion:238 docker_config_defaults: &docker_config_defaults @@ -307,8 +307,11 @@ caffe2_macos_build_defaults: &caffe2_macos_build_defaults export IN_CIRCLECI=1 - # moreutils installs a `parallel` executable by default, which conflicts with the executable from the `parallel` formulae + # moreutils installs a `parallel` executable by default, which conflicts with the executable from the GNU `parallel` + # so we must unlink GNU `parallel` first, and relink it afterwards + brew unlink parallel brew install moreutils --without-parallel + brew link parallel --overwrite brew install cmake brew install expect @@ -456,8 +459,11 @@ smoke_mac_build: &smoke_mac_build set -ex export DATE=today export NIGHTLIES_DATE_PREAMBLE=1.0.0.dev - # moreutils installs a `parallel` executable by default, which conflicts with the executable from the `parallel` formulae + # moreutils installs a `parallel` executable by default, which conflicts with the executable from the GNU `parallel` + # so we must unlink GNU `parallel` first, and relink it afterwards + brew unlink parallel brew install moreutils --without-parallel + brew link parallel --overwrite brew install expect IFS=_ confs=($JOB_BASE_NAME) export PACKAGE_TYPE=${confs[2]} @@ -478,105 +484,105 @@ jobs: pytorch_linux_trusty_py2_7_9_build: environment: JOB_BASE_NAME: pytorch-linux-trusty-py2.7.9-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:278" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py2_7_9_test: environment: JOB_BASE_NAME: pytorch-linux-trusty-py2.7.9-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:278" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py2_7_build: environment: JOB_BASE_NAME: pytorch-linux-trusty-py2.7-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:278" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py2_7_test: environment: JOB_BASE_NAME: pytorch-linux-trusty-py2.7-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:278" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_5_build: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.5-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:278" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_5_test: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.5-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:278" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_6_gcc4_8_build: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.6-gcc4.8-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc4.8:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc4.8:278" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_6_gcc4_8_test: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.6-gcc4.8-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc4.8:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc4.8:278" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_6_gcc5_4_build: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.6-gcc5.4-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:278" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_6_gcc5_4_test: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.6-gcc5.4-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:278" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_6_gcc7_build: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.6-gcc7-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:278" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_6_gcc7_test: environment: JOB_BASE_NAME: pytorch-linux-trusty-py3.6-gcc7-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:278" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_pynightly_build: environment: JOB_BASE_NAME: pytorch-linux-trusty-pynightly-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:278" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_pynightly_test: environment: JOB_BASE_NAME: pytorch-linux-trusty-pynightly-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:278" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_xenial_py3_clang5_asan_build: environment: JOB_BASE_NAME: pytorch-linux-xenial-py3-clang5-asan-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:278" PYTHON_VERSION: "3.6" <<: *pytorch_linux_build_defaults pytorch_linux_xenial_py3_clang5_asan_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-py3-clang5-asan-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:278" PYTHON_VERSION: "3.6" resource_class: large <<: *pytorch_linux_test_defaults @@ -584,7 +590,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn6_py3_build: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda8-cudnn6-py3-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "9" <<: *pytorch_linux_build_defaults @@ -592,7 +598,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn6_py3_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda8-cudnn6-py3-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "8" resource_class: gpu.medium @@ -601,7 +607,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn6_py3_multigpu_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda8-cudnn6-py3-multigpu-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "8" MULTI_GPU: "1" @@ -611,7 +617,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn6_py3_NO_AVX2_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda8-cudnn6-py3-NO_AVX2-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "8" resource_class: gpu.medium @@ -620,7 +626,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn6_py3_NO_AVX_NO_AVX2_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda8-cudnn6-py3-NO_AVX-NO_AVX2-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "8" resource_class: gpu.medium @@ -629,7 +635,7 @@ jobs: pytorch_linux_xenial_cuda9_cudnn7_py2_build: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda9-cudnn7-py2-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:278" PYTHON_VERSION: "2.7" CUDA_VERSION: "9" <<: *pytorch_linux_build_defaults @@ -637,7 +643,7 @@ jobs: pytorch_linux_xenial_cuda9_cudnn7_py2_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda9-cudnn7-py2-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:278" PYTHON_VERSION: "2.7" CUDA_VERSION: "9" resource_class: gpu.medium @@ -646,7 +652,7 @@ jobs: pytorch_linux_xenial_cuda9_cudnn7_py3_build: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda9-cudnn7-py3-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "9" <<: *pytorch_linux_build_defaults @@ -654,7 +660,7 @@ jobs: pytorch_linux_xenial_cuda9_cudnn7_py3_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda9-cudnn7-py3-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "9" resource_class: gpu.medium @@ -663,7 +669,7 @@ jobs: pytorch_linux_xenial_cuda9_2_cudnn7_py3_gcc7_build: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "9.2" <<: *pytorch_linux_build_defaults @@ -671,7 +677,7 @@ jobs: pytorch_linux_xenial_cuda9_2_cudnn7_py3_gcc7_test: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "9.2" resource_class: gpu.medium @@ -680,7 +686,7 @@ jobs: pytorch_linux_xenial_cuda10_cudnn7_py3_gcc7_build: environment: JOB_BASE_NAME: pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "10" <<: *pytorch_linux_build_defaults @@ -688,7 +694,7 @@ jobs: pytorch_short_perf_test_gpu: environment: JOB_BASE_NAME: pytorch-short-perf-test-gpu - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:278" PYTHON_VERSION: "3.6" CUDA_VERSION: "8" resource_class: gpu.medium @@ -719,7 +725,7 @@ jobs: pytorch_doc_push: environment: JOB_BASE_NAME: pytorch-doc-push - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:262" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn6-py3:278" resource_class: large machine: image: default @@ -808,8 +814,11 @@ jobs: set -e export IN_CIRCLECI=1 - # moreutils installs a `parallel` executable by default, which conflicts with the executable from the `parallel` formulae + # moreutils installs a `parallel` executable by default, which conflicts with the executable from the GNU `parallel` + # so we must unlink GNU `parallel` first, and relink it afterwards + brew unlink parallel brew install moreutils --without-parallel + brew link parallel --overwrite brew install expect # Install sccache @@ -852,8 +861,11 @@ jobs: command: | set -e export IN_CIRCLECI=1 - # moreutils installs a `parallel` executable by default, which conflicts with the executable from the `parallel` formulae + # moreutils installs a `parallel` executable by default, which conflicts with the executable from the GNU `parallel` + # so we must unlink GNU `parallel` first, and relink it afterwards + brew unlink parallel brew install moreutils --without-parallel + brew link parallel --overwrite brew install expect cp -r /Users/distiller/pytorch-ci-env/workspace/. /Users/distiller/project @@ -877,8 +889,11 @@ jobs: export IN_CIRCLECI=1 - # moreutils installs a `parallel` executable by default, which conflicts with the executable from the `parallel` formulae + # moreutils installs a `parallel` executable by default, which conflicts with the executable from the GNU `parallel` + # so we must unlink GNU `parallel` first, and relink it afterwards + brew unlink parallel brew install moreutils --without-parallel + brew link parallel --overwrite brew install expect # Install CUDA 9.2 -- 2.7.4