diff options
| author | Johannes M Dieterich <johannes.dieterich@amd.com> | 2019-07-30 07:12:11 -0700 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2019-07-30 07:26:48 -0700 |
| commit | 4b78ce1ba4d6fdd33c98d799f9a73395c115f480 (patch) | |
| tree | 298cd6c1dbbf6c45ab6b159bc69d3e0ded803599 /docker | |
| parent | 437a8b3eed600f35db3b292e649f09c346d14f24 (diff) | |
| download | pytorch-4b78ce1ba4d6fdd33c98d799f9a73395c115f480.tar.gz pytorch-4b78ce1ba4d6fdd33c98d799f9a73395c115f480.tar.bz2 pytorch-4b78ce1ba4d6fdd33c98d799f9a73395c115f480.zip | |
Clean cmake infrastructure up (#23527)
Summary:
Only check for cmake dependencies we directly depend on (e.g., hipsparse but not rocsparse)
Use cmake targets for ROCm where possible.
While there, update the docker CI build infrastructure to only pull in packages by name we directly depend on (anticipating the demise of, e.g., miopengemm). I do not anticipate a docker rebuild to be necessary at this stage as the changes are somewhat cosmetic.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/23527
Differential Revision: D16561010
Pulled By: ezyang
fbshipit-source-id: 87cd9d8a15a74caf9baca85a3e840e9d19ad5d9f
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/caffe2/jenkins/common/install_rocm.sh | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/docker/caffe2/jenkins/common/install_rocm.sh b/docker/caffe2/jenkins/common/install_rocm.sh index 11a4af9f2a..886d13b903 100644 --- a/docker/caffe2/jenkins/common/install_rocm.sh +++ b/docker/caffe2/jenkins/common/install_rocm.sh @@ -19,31 +19,16 @@ install_ubuntu() { DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated \ rocm-dev \ - rocm-libs \ rocm-utils \ rocfft \ miopen-hip \ - miopengemm \ rocblas \ rocm-profiler \ cxlactivitylogger \ - rocsparse \ hipsparse \ rocrand \ hip-thrust \ rccl - - # HIP has a bug that drops DEBUG symbols in generated MakeFiles. - # https://github.com/ROCm-Developer-Tools/HIP/pull/588 - if [[ -f /opt/rocm/hip/cmake/FindHIP.cmake ]]; then - sudo sed -i 's/set(_hip_build_configuration "${CMAKE_BUILD_TYPE}")/string(TOUPPER _hip_build_configuration "${CMAKE_BUILD_TYPE}")/' /opt/rocm/hip/cmake/FindHIP.cmake - fi - - # there is a case-sensitivity issue in the cmake files of some ROCm libraries. Fix this here until the fix is released - sed -i 's/find_dependency(hip)/find_dependency(HIP)/g' /opt/rocm/rocsparse/lib/cmake/rocsparse/rocsparse-config.cmake - sed -i 's/find_dependency(hip)/find_dependency(HIP)/g' /opt/rocm/rocfft/lib/cmake/rocfft/rocfft-config.cmake - sed -i 's/find_dependency(hip)/find_dependency(HIP)/g' /opt/rocm/miopen/lib/cmake/miopen/miopen-config.cmake - sed -i 's/find_dependency(hip)/find_dependency(HIP)/g' /opt/rocm/rocblas/lib/cmake/rocblas/rocblas-config.cmake } install_centos() { @@ -65,15 +50,12 @@ install_centos() { yum install -y \ rocm-dev \ - rocm-libs \ rocm-utils \ rocfft \ miopen-hip \ - miopengemm \ rocblas \ rocm-profiler \ cxlactivitylogger \ - rocsparse \ hipsparse \ rocrand \ rccl \ |