From bca358ad02fe7a3cdedbb3551326c10898076280 Mon Sep 17 00:00:00 2001 From: Johannes M Dieterich Date: Thu, 7 Feb 2019 14:17:14 -0800 Subject: [PATCH] Update CI to recently released ROCm 2.1 release (#16808) Summary: * we do not need EAP packages any longer as the antistatic feature is now in the release * consistently install the rccl package * Skip one unit test that has regressed with 2.1 * Follow-up PRs will use 2.1 features once deployed on CI Pull Request resolved: https://github.com/pytorch/pytorch/pull/16808 Differential Revision: D13992645 Pulled By: bddppq fbshipit-source-id: 37ca9a1f104bb140bd2b56d403e32f04c4fbf4f0 --- docker/caffe2/jenkins/common/install_rocm.sh | 27 ++------------------------- test/test_distributions.py | 1 + 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/docker/caffe2/jenkins/common/install_rocm.sh b/docker/caffe2/jenkins/common/install_rocm.sh index e24c588..e1d6690 100644 --- a/docker/caffe2/jenkins/common/install_rocm.sh +++ b/docker/caffe2/jenkins/common/install_rocm.sh @@ -30,16 +30,8 @@ install_ubuntu() { rocsparse \ hipsparse \ rocrand \ - hip-thrust - - pushd /tmp - 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-thrust \ + rccl # HIP has a bug that drops DEBUG symbols in generated MakeFiles. # https://github.com/ROCm-Developer-Tools/HIP/pull/588 @@ -86,21 +78,6 @@ install_centos() { rocrand \ rccl - pushd /tmp - 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 - - # Cleanup - yum clean all - rm -rf /var/cache/yum - rm -rf /var/lib/yum/yumdb - rm -rf /var/lib/yum/history - # Needed for now, will be replaced once hip-thrust is packaged for CentOS git clone --recursive https://github.com/ROCmSoftwarePlatform/Thrust.git /data/Thrust rm -rf /data/Thrust/thrust/system/cuda/detail/cub-hip diff --git a/test/test_distributions.py b/test/test_distributions.py index fa94493..fb289bd 100644 --- a/test/test_distributions.py +++ b/test/test_distributions.py @@ -1975,6 +1975,7 @@ class TestDistributions(TestCase): @unittest.skipIf(not TEST_CUDA, "CUDA not found") @unittest.skipIf(not TEST_NUMPY, "Numpy not found") + @skipIfRocm def test_gamma_gpu_sample(self): set_rng_seed(0) for alpha, beta in product([0.1, 1.0, 5.0], [0.1, 1.0, 10.0]): -- 2.7.4