From 75a2d8e2de4a73e16c3ea22f781673ea3e15a1f9 Mon Sep 17 00:00:00 2001 From: Johannes M Dieterich Date: Thu, 6 Dec 2018 10:04:37 -0800 Subject: [PATCH] Upgrade CI to ROCm 1.9.2 (#14216) Summary: Drop custom hcc/hip as the 1.9.2 release should contain the relevant patches therein. Most notable feature in 1.9.2 is mixed precision support in rocBLAS and MIOpen. These features will be enabled by subsequent PRs. bddppq ezyang Pull Request resolved: https://github.com/pytorch/pytorch/pull/14216 Differential Revision: D13354294 Pulled By: bddppq fbshipit-source-id: 2541d4a196af21c9432c1aff7f6e65b572628028 --- .circleci/config.yml | 42 ++++++++++++------------ .jenkins/caffe2/build.sh | 8 +++++ docker/caffe2/jenkins/centos-rocm/Dockerfile | 9 +++-- docker/caffe2/jenkins/common/add_jenkins_user.sh | 6 ++-- docker/caffe2/jenkins/common/install_ccache.sh | 30 ++--------------- docker/caffe2/jenkins/common/install_rocm.sh | 34 +++++++++---------- docker/caffe2/jenkins/ubuntu-rocm/Dockerfile | 9 +++-- 7 files changed, 59 insertions(+), 79 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ac2025..ec65da4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ # 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 -# Caffe2DockerVersion:230 +# Caffe2DockerVersion:238 docker_config_defaults: &docker_config_defaults user: jenkins @@ -800,7 +800,7 @@ jobs: caffe2_py2_cuda8_0_cudnn6_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-cuda8.0-cudnn6-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn6-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn6-ubuntu16.04:238" CUDA_VERSION: "8" BUILD_ENVIRONMENT: "py2-cuda8.0-cudnn6-ubuntu16.04" <<: *caffe2_linux_build_defaults @@ -808,7 +808,7 @@ jobs: caffe2_py2_cuda8_0_cudnn6_ubuntu16_04_test: environment: JOB_BASE_NAME: caffe2-py2-cuda8.0-cudnn6-ubuntu16.04-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn6-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn6-ubuntu16.04:238" CUDA_VERSION: "8" BUILD_ENVIRONMENT: "py2-cuda8.0-cudnn6-ubuntu16.04" resource_class: gpu.medium @@ -817,7 +817,7 @@ jobs: caffe2_py2_cuda9_0_cudnn7_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-cuda9.0-cudnn7-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:238" CUDA_VERSION: "9" BUILD_ENVIRONMENT: "py2-cuda9.0-cudnn7-ubuntu16.04" <<: *caffe2_linux_build_defaults @@ -825,7 +825,7 @@ jobs: caffe2_py2_cuda9_0_cudnn7_ubuntu16_04_test: environment: JOB_BASE_NAME: caffe2-py2-cuda9.0-cudnn7-ubuntu16.04-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:238" CUDA_VERSION: "9" BUILD_ENVIRONMENT: "py2-cuda9.0-cudnn7-ubuntu16.04" resource_class: gpu.medium @@ -834,7 +834,7 @@ jobs: caffe2_py2_cuda9_1_cudnn7_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-cuda9.1-cudnn7-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:238" CUDA_VERSION: "9.1" BUILD_ENVIRONMENT: "py2-cuda9.1-cudnn7-ubuntu16.04" <<: *caffe2_linux_build_defaults @@ -842,7 +842,7 @@ jobs: caffe2_py2_cuda9_1_cudnn7_ubuntu16_04_test: environment: JOB_BASE_NAME: caffe2-py2-cuda9.1-cudnn7-ubuntu16.04-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:238" CUDA_VERSION: "9.1" BUILD_ENVIRONMENT: "py2-cuda9.1-cudnn7-ubuntu16.04" resource_class: gpu.medium @@ -851,14 +851,14 @@ jobs: caffe2_py2_mkl_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-mkl-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:238" BUILD_ENVIRONMENT: "py2-mkl-ubuntu16.04" <<: *caffe2_linux_build_defaults caffe2_py2_mkl_ubuntu16_04_test: environment: JOB_BASE_NAME: caffe2-py2-mkl-ubuntu16.04-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:238" BUILD_ENVIRONMENT: "py2-mkl-ubuntu16.04" resource_class: large <<: *caffe2_linux_test_defaults @@ -866,14 +866,14 @@ jobs: caffe2_py2_gcc4_8_ubuntu14_04_build: environment: JOB_BASE_NAME: caffe2-py2-gcc4.8-ubuntu14.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:238" BUILD_ENVIRONMENT: "py2-gcc4.8-ubuntu14.04" <<: *caffe2_linux_build_defaults caffe2_py2_gcc4_8_ubuntu14_04_test: environment: JOB_BASE_NAME: caffe2-py2-gcc4.8-ubuntu14.04-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:238" BUILD_ENVIRONMENT: "py2-gcc4.8-ubuntu14.04" resource_class: large <<: *caffe2_linux_test_defaults @@ -881,14 +881,14 @@ jobs: caffe2_onnx_py2_gcc5_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-onnx-py2-gcc5-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:238" BUILD_ENVIRONMENT: "onnx-py2-gcc5-ubuntu16.04" <<: *caffe2_linux_build_defaults caffe2_onnx_py2_gcc5_ubuntu16_04_test: environment: JOB_BASE_NAME: caffe2-onnx-py2-gcc5-ubuntu16.04-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:238" BUILD_ENVIRONMENT: "onnx-py2-gcc5-ubuntu16.04" resource_class: large <<: *caffe2_linux_test_defaults @@ -896,7 +896,7 @@ jobs: caffe2_py2_cuda8_0_cudnn7_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-cuda8.0-cudnn7-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn7-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn7-ubuntu16.04:238" BUILD_ENVIRONMENT: "py2-cuda8.0-cudnn7-ubuntu16.04" BUILD_ONLY: "1" <<: *caffe2_linux_build_defaults @@ -904,7 +904,7 @@ jobs: caffe2_py2_gcc4_9_ubuntu14_04_build: environment: JOB_BASE_NAME: caffe2-py2-gcc4.9-ubuntu14.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.9-ubuntu14.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.9-ubuntu14.04:238" BUILD_ENVIRONMENT: "py2-gcc4.9-ubuntu14.04" BUILD_ONLY: "1" <<: *caffe2_linux_build_defaults @@ -912,7 +912,7 @@ jobs: caffe2_py2_clang3_8_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-clang3.8-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.8-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.8-ubuntu16.04:238" BUILD_ENVIRONMENT: "py2-clang3.8-ubuntu16.04" BUILD_ONLY: "1" <<: *caffe2_linux_build_defaults @@ -920,7 +920,7 @@ jobs: caffe2_py2_clang3_9_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-clang3.9-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.9-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.9-ubuntu16.04:238" BUILD_ENVIRONMENT: "py2-clang3.9-ubuntu16.04" BUILD_ONLY: "1" <<: *caffe2_linux_build_defaults @@ -928,7 +928,7 @@ jobs: caffe2_py2_clang7_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-clang7-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang7-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang7-ubuntu16.04:238" BUILD_ENVIRONMENT: "py2-clang7-ubuntu16.04" BUILD_ONLY: "1" <<: *caffe2_linux_build_defaults @@ -936,7 +936,7 @@ jobs: caffe2_py2_android_ubuntu16_04_build: environment: JOB_BASE_NAME: caffe2-py2-android-ubuntu16.04-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-android-ubuntu16.04:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-android-ubuntu16.04:238" BUILD_ENVIRONMENT: "py2-android-ubuntu16.04" BUILD_ONLY: "1" <<: *caffe2_linux_build_defaults @@ -944,14 +944,14 @@ jobs: caffe2_py2_cuda9_0_cudnn7_centos7_build: environment: JOB_BASE_NAME: caffe2-py2-cuda9.0-cudnn7-centos7-build - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:238" BUILD_ENVIRONMENT: "py2-cuda9.0-cudnn7-centos7" <<: *caffe2_linux_build_defaults caffe2_py2_cuda9_0_cudnn7_centos7_test: environment: JOB_BASE_NAME: caffe2-py2-cuda9.0-cudnn7-centos7-test - DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:230" + DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:238" CUDA_VERSION: "9.0" BUILD_ENVIRONMENT: "py2-cuda9.0-cudnn7-centos7" resource_class: gpu.medium diff --git a/.jenkins/caffe2/build.sh b/.jenkins/caffe2/build.sh index bf2ea87..89e8e39 100755 --- a/.jenkins/caffe2/build.sh +++ b/.jenkins/caffe2/build.sh @@ -2,6 +2,14 @@ set -ex +# TODO: Migrate all centos jobs to use proper devtoolset +if [[ "$BUILD_ENVIRONMENT" == "py2-cuda9.0-cudnn7-centos7" ]]; then + # There is a bug in pango packge on Centos7 that causes undefined + # symbols, upgrading glib2 to >=2.56.1 solves the issue. See + # https://bugs.centos.org/view.php?id=15495 + sudo yum install -y -q glib2-2.56.1 +fi + pip install --user --no-cache-dir hypothesis==3.59.0 # The INSTALL_PREFIX here must match up with test.sh diff --git a/docker/caffe2/jenkins/centos-rocm/Dockerfile b/docker/caffe2/jenkins/centos-rocm/Dockerfile index 4b62208..da9ede7 100644 --- a/docker/caffe2/jenkins/centos-rocm/Dockerfile +++ b/docker/caffe2/jenkins/centos-rocm/Dockerfile @@ -1,6 +1,10 @@ ARG CENTOS_VERSION FROM centos:${CENTOS_VERSION} +# Include BUILD_ENVIRONMENT environment variable in image +ARG BUILD_ENVIRONMENT +ENV BUILD_ENVIRONMENT ${BUILD_ENVIRONMENT} + # Install required packages to build Caffe2 ARG EC2 ADD ./install_base.sh install_base.sh @@ -22,7 +26,6 @@ ENV PATH /opt/rocm/bin:$PATH ENV PATH /opt/rocm/hcc/bin:$PATH ENV PATH /opt/rocm/hip/bin:$PATH ENV PATH /opt/rocm/opencl/bin:$PATH -ENV MIOPEN_DISABLE_CACHE 1 ENV HIP_PLATFORM hcc ENV LC_ALL en_US.utf8 ENV LANG en_US.utf8 @@ -50,7 +53,3 @@ ARG JENKINS_GID ADD ./add_jenkins_user.sh add_jenkins_user.sh RUN if [ -n "${JENKINS}" ]; then bash ./add_jenkins_user.sh; fi RUN rm add_jenkins_user.sh - -# Include BUILD_ENVIRONMENT environment variable in image -ARG BUILD_ENVIRONMENT -ENV BUILD_ENVIRONMENT ${BUILD_ENVIRONMENT} diff --git a/docker/caffe2/jenkins/common/add_jenkins_user.sh b/docker/caffe2/jenkins/common/add_jenkins_user.sh index 50258f6..5e1d05e 100755 --- a/docker/caffe2/jenkins/common/add_jenkins_user.sh +++ b/docker/caffe2/jenkins/common/add_jenkins_user.sh @@ -3,11 +3,9 @@ set -ex # Mirror jenkins user in container -echo "jenkins:x:$JENKINS_UID:$JENKINS_GID::/var/lib/jenkins:" >> /etc/passwd -echo "jenkins:x:$JENKINS_GID:" >> /etc/group +groupadd -g 1014 jenkins +useradd -u 1014 -g 1014 -d /var/lib/jenkins -m jenkins -# Create $HOME -mkdir -p /var/lib/jenkins chown jenkins:jenkins /var/lib/jenkins mkdir -p /var/lib/jenkins/.ccache chown jenkins:jenkins /var/lib/jenkins/.ccache diff --git a/docker/caffe2/jenkins/common/install_ccache.sh b/docker/caffe2/jenkins/common/install_ccache.sh index 6fe147a..2b54ab6 100755 --- a/docker/caffe2/jenkins/common/install_ccache.sh +++ b/docker/caffe2/jenkins/common/install_ccache.sh @@ -21,47 +21,23 @@ chmod a+x /usr/local/bin/sccache # Setup SCCACHE ############################################################################### -mkdir -p ./sccache - SCCACHE="$(which sccache)" if [ -z "${SCCACHE}" ]; then echo "Unable to find sccache..." exit 1 fi -# List of compilers to use sccache on. -declare -a compilers=("cc" "c++" "gcc" "g++" "x86_64-linux-gnu-gcc") - -# If cuda build, add nvcc to sccache. -if [[ "${BUILD_ENVIRONMENT}" == *-cuda* ]]; then - compilers+=("nvcc") -fi - # If rocm build, add hcc to sccache. if [[ "${BUILD_ENVIRONMENT}" == *-rocm* ]]; then # HCC's symlink path: /opt/rocm/hcc/bin/hcc -> /opt/rocm/hcc/bin/clang -> /opt/rocm/hcc/bin/clang-7.0 HCC_DEST_PATH="$(readlink -f $(which hcc))" HCC_REAL_BINARY="$(dirname $HCC_DEST_PATH)/clang-7.0_original" - mv $HCC_DEST_PATH $HCC_REAL_BINARY + mv "$HCC_DEST_PATH" "$HCC_REAL_BINARY" # Create sccache wrapper. ( echo "#!/bin/sh" - echo "exec $SCCACHE "$HCC_REAL_BINARY" \"\$@\"" - ) > $HCC_DEST_PATH + echo "exec $SCCACHE $HCC_REAL_BINARY \"\$@\"" + ) > "$HCC_DEST_PATH" chmod +x "$HCC_DEST_PATH" fi - -# Setup wrapper scripts -for compiler in "${compilers[@]}"; do - ( - echo "#!/bin/sh" - echo "exec $SCCACHE $(which $compiler) \"\$@\"" - ) > "./sccache/$compiler" - chmod +x "./sccache/$compiler" -done - -export CACHE_WRAPPER_DIR="$PWD/sccache" - -# CMake must find these wrapper scripts -export PATH="$CACHE_WRAPPER_DIR:$PATH" diff --git a/docker/caffe2/jenkins/common/install_rocm.sh b/docker/caffe2/jenkins/common/install_rocm.sh index ea779d7..e24c588 100644 --- a/docker/caffe2/jenkins/common/install_rocm.sh +++ b/docker/caffe2/jenkins/common/install_rocm.sh @@ -11,7 +11,7 @@ install_ubuntu() { apt-get install libc++1 apt-get install libc++abi1 - DEB_ROCM_REPO=http://repo.radeon.com/rocm/misc/facebook/apt/.apt_1.9.white_rabbit/debian + DEB_ROCM_REPO=http://repo.radeon.com/rocm/apt/debian # Add rocm repository wget -qO - $DEB_ROCM_REPO/rocm.gpg.key | apt-key add - echo "deb [arch=amd64] $DEB_ROCM_REPO xenial main" > /etc/apt/sources.list.d/rocm.list @@ -33,12 +33,12 @@ install_ubuntu() { hip-thrust pushd /tmp - wget https://github.com/scchan/hcc/releases/download/19-host_linker_relative_path_rocdl/rocm19wb_20181109.tgz - tar -xzf rocm19wb_20181109.tgz - pushd rocm19wb_20181109/deb - apt install -y ./hcc-1.2.18445-Linux.deb ./hip_base-1.5.18435.deb ./hip_hcc-1.5.18435.deb ./hip_doc-1.5.18435.deb ./hip_samples-1.5.18435.deb - popd - rm -rf rocm19wb_20181109.tgz rocm19wb_20181109 + wget https://github.com/RadeonOpenCompute/hcc/releases/download/roc-1.9.2-pytorch-eap/hcc-1.2.18473-Linux.deb + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_base-1.5.18462.deb + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_doc-1.5.18462.deb + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_hcc-1.5.18462.deb + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_samples-1.5.18462.deb + apt install -y ./hcc-1.2.18473-Linux.deb ./hip_base-1.5.18462.deb ./hip_hcc-1.5.18462.deb ./hip_doc-1.5.18462.deb ./hip_samples-1.5.18462.deb popd # HIP has a bug that drops DEBUG symbols in generated MakeFiles. @@ -65,7 +65,7 @@ install_centos() { echo "[ROCm]" > /etc/yum.repos.d/rocm.repo echo "name=ROCm" >> /etc/yum.repos.d/rocm.repo - echo "baseurl=http://repo.radeon.com/rocm/misc/facebook/yum/.yum_1.9.white_rabbit/" >> /etc/yum.repos.d/rocm.repo + echo "baseurl=http://repo.radeon.com/rocm/yum/rpm/" >> /etc/yum.repos.d/rocm.repo echo "enabled=1" >> /etc/yum.repos.d/rocm.repo echo "gpgcheck=0" >> /etc/yum.repos.d/rocm.repo @@ -83,18 +83,18 @@ install_centos() { cxlactivitylogger \ rocsparse \ hipsparse \ - rocrand - + rocrand \ + rccl pushd /tmp - wget https://github.com/scchan/hcc/releases/download/19-host_linker_relative_path_rocdl/rocm19wb_20181109.tgz - tar -xzf rocm19wb_20181109.tgz - pushd rocm19wb_20181109/rpm - rpm -i --replacefiles hcc-1.2.18445-Linux.rpm hip_base-1.5.18435.rpm hip_hcc-1.5.18435.rpm hip_doc-1.5.18435.rpm hip_samples-1.5.18435.rpm + wget https://github.com/RadeonOpenCompute/hcc/releases/download/roc-1.9.2-pytorch-eap/hcc-1.2.18473-Linux.rpm + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_base-1.5.18462.rpm + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_doc-1.5.18462.rpm + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_hcc-1.5.18462.rpm + wget https://github.com/ROCm-Developer-Tools/HIP/releases/download/roc-1.9.2-pytorch-eap/hip_samples-1.5.18462.rpm + rpm -i --replacefiles ./hcc-1.2.18473-Linux.rpm ./hip_base-1.5.18462.rpm ./hip_hcc-1.5.18462.rpm ./hip_doc-1.5.18462.rpm ./hip_samples-1.5.18462.rpm popd - rm -rf rocm19wb_20181109.tgz rocm19wb_20181109 - popd - + # Cleanup yum clean all rm -rf /var/cache/yum diff --git a/docker/caffe2/jenkins/ubuntu-rocm/Dockerfile b/docker/caffe2/jenkins/ubuntu-rocm/Dockerfile index d15373c..dbec35e 100644 --- a/docker/caffe2/jenkins/ubuntu-rocm/Dockerfile +++ b/docker/caffe2/jenkins/ubuntu-rocm/Dockerfile @@ -1,15 +1,15 @@ ARG UBUNTU_VERSION FROM ubuntu:${UBUNTU_VERSION} +# Include BUILD_ENVIRONMENT environment variable in image +ARG BUILD_ENVIRONMENT +ENV BUILD_ENVIRONMENT ${BUILD_ENVIRONMENT} + ARG EC2 ARG UBUNTU_VERSION ADD ./install_base.sh install_base.sh RUN bash ./install_base.sh && rm install_base.sh -# Include BUILD_ENVIRONMENT environment variable in image -ARG BUILD_ENVIRONMENT -ENV BUILD_ENVIRONMENT ${BUILD_ENVIRONMENT} - # Install Python ARG PYTHON_VERSION ADD ./install_python.sh install_python.sh @@ -60,7 +60,6 @@ ENV PATH /opt/rocm/bin:$PATH ENV PATH /opt/rocm/hcc/bin:$PATH ENV PATH /opt/rocm/hip/bin:$PATH ENV PATH /opt/rocm/opencl/bin:$PATH -ENV MIOPEN_DISABLE_CACHE 1 ENV HIP_PLATFORM hcc ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 -- 2.7.4