From 25e367ec48da4e82d92b7919fc5707abe43a2dfb Mon Sep 17 00:00:00 2001 From: Raghuraman Krishnamoorthi Date: Tue, 1 Dec 2020 17:42:07 -0800 Subject: [PATCH] Revert D25246563: [pytorch][PR] [ROCm] remove builds for versions less than 3.8 Test Plan: revert-hammer Differential Revision: D25246563 (https://github.com/pytorch/pytorch/commit/c5f1117be2c4a71dc5ed7d8c119543d613ddc795) Original commit changeset: cd6142286813 fbshipit-source-id: fec302da9802736cb88ae25c3b58705d93cd9920 --- .circleci/cimodel/data/pytorch_build_data.py | 2 +- .../cimodel/data/simple/docker_definitions.py | 1 + .circleci/config.yml | 27 +++++++++++++------ .circleci/docker/build.sh | 7 +++++ .../job-specs/pytorch-job-specs.yml | 16 ++++++++--- 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/.circleci/cimodel/data/pytorch_build_data.py b/.circleci/cimodel/data/pytorch_build_data.py index 8b129533765ab..4339d26a6d3c9 100644 --- a/.circleci/cimodel/data/pytorch_build_data.py +++ b/.circleci/cimodel/data/pytorch_build_data.py @@ -93,7 +93,7 @@ ]), ]), ("rocm", [ - ("3.9", [ + ("3.7", [ ("3.6", [ ('build_only', [XImportant(True)]), ]), diff --git a/.circleci/cimodel/data/simple/docker_definitions.py b/.circleci/cimodel/data/simple/docker_definitions.py index 9ba9fb0a8c0c0..91f7572079159 100644 --- a/.circleci/cimodel/data/simple/docker_definitions.py +++ b/.circleci/cimodel/data/simple/docker_definitions.py @@ -29,6 +29,7 @@ "pytorch-linux-xenial-py3.6-gcc5.4", # this one is used in doc builds "pytorch-linux-xenial-py3.6-gcc7.2", "pytorch-linux-xenial-py3.6-gcc7", + "pytorch-linux-bionic-rocm3.7-py3.6", "pytorch-linux-bionic-rocm3.8-py3.6", "pytorch-linux-bionic-rocm3.9-py3.6", ] diff --git a/.circleci/config.yml b/.circleci/config.yml index 59a26f30d1bab..f4b694afe964d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -453,8 +453,12 @@ jobs: no_output_timeout: "1h" command: | set -e - if [[ "${DOCKER_IMAGE}" == *rocm3.9* ]]; then - export DOCKER_TAG="f3d89a32912f62815e4feaeed47e564e887dffd6" + # TODO: Remove this after we figure out why rocm tests are failing + if [[ "${DOCKER_IMAGE}" == *rocm3.5* ]]; then + export DOCKER_TAG="ab1632df-fa59-40e6-8c23-98e004f61148" + fi + if [[ "${DOCKER_IMAGE}" == *rocm3.7* ]]; then + export DOCKER_TAG="1045c7b891104cb4fd23399eab413b6213e48aeb" fi if [[ ${BUILD_ENVIRONMENT} == *"pure_torch"* ]]; then echo 'BUILD_CAFFE2=OFF' >> "${BASH_ENV}" @@ -534,8 +538,12 @@ jobs: command: | set -e export PYTHONUNBUFFERED=1 - if [[ "${DOCKER_IMAGE}" == *rocm3.9* ]]; then - export DOCKER_TAG="f3d89a32912f62815e4feaeed47e564e887dffd6" + # TODO: Remove this after we figure out why rocm tests are failing + if [[ "${DOCKER_IMAGE}" == *rocm3.5* ]]; then + export DOCKER_TAG="ab1632df-fa59-40e6-8c23-98e004f61148" + fi + if [[ "${DOCKER_IMAGE}" == *rocm3.7* ]]; then + export DOCKER_TAG="1045c7b891104cb4fd23399eab413b6213e48aeb" fi # See Note [Special build images] output_image=${DOCKER_IMAGE}:${DOCKER_TAG}-${CIRCLE_SHA1} @@ -7272,6 +7280,9 @@ workflows: - docker_build_job: name: "docker-pytorch-linux-xenial-py3.6-gcc7" image_name: "pytorch-linux-xenial-py3.6-gcc7" + - docker_build_job: + name: "docker-pytorch-linux-bionic-rocm3.7-py3.6" + image_name: "pytorch-linux-bionic-rocm3.7-py3.6" - docker_build_job: name: "docker-pytorch-linux-bionic-rocm3.8-py3.6" image_name: "pytorch-linux-bionic-rocm3.8-py3.6" @@ -7702,11 +7713,11 @@ workflows: docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-bionic-py3.8-gcc9" resource_class: large - pytorch_linux_build: - name: pytorch_linux_bionic_rocm3_9_py3_6_build + name: pytorch_linux_bionic_rocm3_7_py3_6_build requires: - - "docker-pytorch-linux-bionic-rocm3.9-py3.6" - build_environment: "pytorch-linux-bionic-rocm3.9-py3.6-build" - docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-bionic-rocm3.9-py3.6" + - "docker-pytorch-linux-bionic-rocm3.7-py3.6" + build_environment: "pytorch-linux-bionic-rocm3.7-py3.6-build" + docker_image: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-bionic-rocm3.7-py3.6" resource_class: xlarge - pytorch_macos_10_13_py3_build: name: pytorch_macos_10_13_py3_build diff --git a/.circleci/docker/build.sh b/.circleci/docker/build.sh index 150e2bb9f3802..019c7f6e9d1cf 100755 --- a/.circleci/docker/build.sh +++ b/.circleci/docker/build.sh @@ -274,6 +274,13 @@ case "$image" in VISION=yes KATEX=yes ;; + pytorch-linux-bionic-rocm3.7-py3.6) + ANACONDA_PYTHON_VERSION=3.6 + PROTOBUF=yes + DB=yes + VISION=yes + ROCM_VERSION=3.7 + ;; pytorch-linux-bionic-rocm3.8-py3.6) ANACONDA_PYTHON_VERSION=3.6 PROTOBUF=yes diff --git a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml index 6c978987f7799..a5876c3af738f 100644 --- a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml +++ b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml @@ -15,8 +15,12 @@ jobs: no_output_timeout: "1h" command: | set -e - if [[ "${DOCKER_IMAGE}" == *rocm3.9* ]]; then - export DOCKER_TAG="f3d89a32912f62815e4feaeed47e564e887dffd6" + # TODO: Remove this after we figure out why rocm tests are failing + if [[ "${DOCKER_IMAGE}" == *rocm3.5* ]]; then + export DOCKER_TAG="ab1632df-fa59-40e6-8c23-98e004f61148" + fi + if [[ "${DOCKER_IMAGE}" == *rocm3.7* ]]; then + export DOCKER_TAG="1045c7b891104cb4fd23399eab413b6213e48aeb" fi if [[ ${BUILD_ENVIRONMENT} == *"pure_torch"* ]]; then echo 'BUILD_CAFFE2=OFF' >> "${BASH_ENV}" @@ -96,8 +100,12 @@ jobs: command: | set -e export PYTHONUNBUFFERED=1 - if [[ "${DOCKER_IMAGE}" == *rocm3.9* ]]; then - export DOCKER_TAG="f3d89a32912f62815e4feaeed47e564e887dffd6" + # TODO: Remove this after we figure out why rocm tests are failing + if [[ "${DOCKER_IMAGE}" == *rocm3.5* ]]; then + export DOCKER_TAG="ab1632df-fa59-40e6-8c23-98e004f61148" + fi + if [[ "${DOCKER_IMAGE}" == *rocm3.7* ]]; then + export DOCKER_TAG="1045c7b891104cb4fd23399eab413b6213e48aeb" fi # See Note [Special build images] output_image=${DOCKER_IMAGE}:${DOCKER_TAG}-${CIRCLE_SHA1}