Use standard docker image for XLA build

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/17287

Differential Revision: D14169689

Pulled By: kostmo

fbshipit-source-id: 24e255be23936542093008ed51d2c061b2924993

diff --git a/.circleci/build_env_definitions.py b/.circleci/build_env_definitions.py
index 8bb39e8..e19ca2c 100644 (file)
--- a/.circleci/build_env_definitions.py
+++ b/.circleci/build_env_definitions.py
@@ -26,8 +26,7 @@ class Conf:
                  is_xla=False,
                  restrict_phases=None,
                  cuda_docker_phases=None,
-                 gpu_resource=None,
-                 docker_version_override=None):
+                 gpu_resource=None):
 
         self.distro = distro
         self.pyver = pyver
@@ -42,9 +41,6 @@ class Conf:
 
         self.gpu_resource = gpu_resource
 
-        # FIXME is this different docker version intentional?
-        self.docker_version_override = docker_version_override
-
     def getParms(self):
         leading = ["pytorch"]
         if self.is_xla:
@@ -65,7 +61,7 @@ class Conf:
 
         base_build_env_name = "-".join(build_env_pieces)
 
-        docker_version = self.docker_version_override or DEFAULT_DOCKER_VERSION
+        docker_version = DEFAULT_DOCKER_VERSION
 
         return miniutils.quote(DOCKER_IMAGE_PATH_BASE + base_build_env_name + ":" + str(docker_version))
 
@@ -118,7 +114,7 @@ BUILD_ENV_LIST = [
     Conf("trusty", ["py3.5"]),
     Conf("trusty", ["py3.6", "gcc4.8"]),
     Conf("trusty", ["py3.6", "gcc5.4"]),
-    Conf("trusty", ["py3.6", "gcc5.4"], is_xla=True, docker_version_override=278),
+    Conf("trusty", ["py3.6", "gcc5.4"], is_xla=True),
     Conf("trusty", ["py3.6", "gcc7"]),
     Conf("trusty", ["pynightly"]),
     Conf("xenial", ["py3", "clang5", "asan"], pyver="3.6"),

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b98159e..dd8ce1d 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1122,13 +1122,13 @@ jobs:
   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:278"
+      DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:282"
     <<: *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:278"
+      DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-trusty-py3.6-gcc5.4:282"
     resource_class: large
     <<: *pytorch_linux_test_defaults