From f176450d604be41ca42c1597cf1af1c2ca69a598 Mon Sep 17 00:00:00 2001 From: Soumith Chintala Date: Mon, 4 Mar 2019 20:28:06 -0800 Subject: [PATCH] bump docker build to upgrade magma to 2.5.0 (#17674) Summary: upgrades magma in docker build. vishwakftw Pull Request resolved: https://github.com/pytorch/pytorch/pull/17674 Differential Revision: D14320187 Pulled By: soumith fbshipit-source-id: 7887f65fb703b802fc6231408b55ad9c4039882b --- .../cimodel/pytorch_build_definitions.py | 2 +- .circleci/config.yml | 64 +++++++++---------- .../verbatim-sources/job-specs-custom.yml | 4 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.circleci/cimodel/pytorch_build_definitions.py b/.circleci/cimodel/pytorch_build_definitions.py index fb8da242014..d9c276ecaba 100644 --- a/.circleci/cimodel/pytorch_build_definitions.py +++ b/.circleci/cimodel/pytorch_build_definitions.py @@ -11,7 +11,7 @@ from cimodel.conf_tree import ConfigNode DOCKER_IMAGE_PATH_BASE = "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/" -DOCKER_IMAGE_VERSION = 282 +DOCKER_IMAGE_VERSION = 291 class Conf(object): diff --git a/.circleci/config.yml b/.circleci/config.yml index 17ed28bf36e..0ff2833b26a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1087,118 +1087,118 @@ jobs: pytorch_linux_trusty_py2_7_9_build: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py2.7.9-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:291" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py2_7_9_test: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py2.7.9-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7.9:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py2_7_build: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py2.7-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:291" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py2_7_test: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py2.7-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py2.7:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_5_build: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py3.5-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:291" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_5_test: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py3.5-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.5:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_6_gcc4_8_build: environment: BUILD_ENVIRONMENT: 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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc4.8:291" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_6_gcc4_8_test: environment: BUILD_ENVIRONMENT: 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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc4.8:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_6_gcc5_4_build: environment: BUILD_ENVIRONMENT: 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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:291" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_6_gcc5_4_test: environment: BUILD_ENVIRONMENT: 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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_xla_linux_trusty_py3_6_gcc5_4_build: environment: BUILD_ENVIRONMENT: pytorch-xla-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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:291" <<: *pytorch_linux_build_defaults pytorch_xla_linux_trusty_py3_6_gcc5_4_test: environment: BUILD_ENVIRONMENT: pytorch-xla-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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_py3_6_gcc7_build: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py3.6-gcc7-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:291" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_py3_6_gcc7_test: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-py3.6-gcc7-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc7:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_trusty_pynightly_build: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-pynightly-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:291" <<: *pytorch_linux_build_defaults pytorch_linux_trusty_pynightly_test: environment: BUILD_ENVIRONMENT: pytorch-linux-trusty-pynightly-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-pynightly:291" resource_class: large <<: *pytorch_linux_test_defaults pytorch_linux_xenial_py3_clang5_asan_build: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-asan-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:291" PYTHON_VERSION: "3.6" <<: *pytorch_linux_build_defaults pytorch_linux_xenial_py3_clang5_asan_test: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-asan-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-asan:291" PYTHON_VERSION: "3.6" resource_class: large <<: *pytorch_linux_test_defaults @@ -1206,14 +1206,14 @@ jobs: pytorch_linux_xenial_cuda8_cudnn7_py3_build: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda8-cudnn7-py3-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" PYTHON_VERSION: "3.6" <<: *pytorch_linux_build_defaults pytorch_linux_xenial_cuda8_cudnn7_py3_test: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda8-cudnn7-py3-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1222,7 +1222,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn7_py3_multigpu_test: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda8-cudnn7-py3-multigpu-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" MULTI_GPU: "1" @@ -1232,7 +1232,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn7_py3_NO_AVX2_test: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda8-cudnn7-py3-NO_AVX2-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1241,7 +1241,7 @@ jobs: pytorch_linux_xenial_cuda8_cudnn7_py3_NO_AVX_NO_AVX2_test: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda8-cudnn7-py3-NO_AVX-NO_AVX2-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1250,14 +1250,14 @@ jobs: pytorch_linux_xenial_cuda9_cudnn7_py2_build: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda9-cudnn7-py2-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:291" PYTHON_VERSION: "2.7" <<: *pytorch_linux_build_defaults pytorch_linux_xenial_cuda9_cudnn7_py2_test: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda9-cudnn7-py2-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py2:291" PYTHON_VERSION: "2.7" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1266,14 +1266,14 @@ jobs: pytorch_linux_xenial_cuda9_cudnn7_py3_build: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda9-cudnn7-py3-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:291" PYTHON_VERSION: "3.6" <<: *pytorch_linux_build_defaults pytorch_linux_xenial_cuda9_cudnn7_py3_test: environment: BUILD_ENVIRONMENT: pytorch-linux-xenial-cuda9-cudnn7-py3-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1282,14 +1282,14 @@ jobs: pytorch_linux_xenial_cuda9_2_cudnn7_py3_gcc7_build: environment: BUILD_ENVIRONMENT: 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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:291" PYTHON_VERSION: "3.6" <<: *pytorch_linux_build_defaults pytorch_linux_xenial_cuda9_2_cudnn7_py3_gcc7_test: environment: BUILD_ENVIRONMENT: 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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9.2-cudnn7-py3-gcc7:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1298,14 +1298,14 @@ jobs: pytorch_linux_xenial_cuda10_cudnn7_py3_gcc7_build: environment: BUILD_ENVIRONMENT: 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:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10-cudnn7-py3-gcc7:291" PYTHON_VERSION: "3.6" <<: *pytorch_linux_build_defaults pytorch_short_perf_test_gpu: environment: BUILD_ENVIRONMENT: pytorch-short-perf-test-gpu - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1338,7 +1338,7 @@ jobs: pytorch_doc_push: environment: BUILD_ENVIRONMENT: pytorch-doc-push - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" resource_class: large machine: image: default diff --git a/.circleci/verbatim-sources/job-specs-custom.yml b/.circleci/verbatim-sources/job-specs-custom.yml index 77cde1fa40a..3d708584494 100644 --- a/.circleci/verbatim-sources/job-specs-custom.yml +++ b/.circleci/verbatim-sources/job-specs-custom.yml @@ -1,7 +1,7 @@ pytorch_short_perf_test_gpu: environment: BUILD_ENVIRONMENT: pytorch-short-perf-test-gpu - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" PYTHON_VERSION: "3.6" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -34,7 +34,7 @@ pytorch_doc_push: environment: BUILD_ENVIRONMENT: pytorch-doc-push - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:282" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda8-cudnn7-py3:291" resource_class: large machine: image: default