Skip to content

Commit

Permalink
Changing dependency package name (#65)
Browse files Browse the repository at this point in the history
* Changing dependency package name

* Fix version number for rocm-dev
  • Loading branch information
eidenyoshida authored and saadrahim committed Dec 6, 2019
1 parent b5aa987 commit 6ee0aed
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ test:rocm_install:
- wget -qO - http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | $SUDO_CMD apt-key add -
- echo 'deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main' | $SUDO_CMD tee /etc/apt/sources.list.d/rocm.list
- $SUDO_CMD apt-get update -qq
- $SUDO_CMD apt-get install -y hip_base
# Install hip_nvcc ignoring dependencies because it depends on cuda metapackage
- $SUDO_CMD apt-get install -y hip-base
# Install hip-nvcc ignoring dependencies because it depends on cuda metapackage
# (with heavy libraries, tools etc. that also require GUI and other packages)
- apt-get download hip_nvcc
- apt-get download hip-nvcc
- $SUDO_CMD dpkg -i --ignore-depends=cuda hip*.deb
- export PATH=$PATH:/opt/rocm/bin
- hipconfig
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ endif()

# Package
if(HIP_PLATFORM STREQUAL "hcc")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_hcc (>= 1.5), rocprim (>= 2.5)")
set(CPACK_RPM_PACKAGE_REQUIRES "hip_hcc >= 1.5, rocprim >= 2.5")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-dev (>= 2.5.27), rocprim (>= 2.5)")
set(CPACK_RPM_PACKAGE_REQUIRES "rocm-dev >= 2.5.27, rocprim >= 2.5")
set(CPACK_DEBIAN_PACKAGE_REPLACES "cub-hip")
set(CPACK_RPM_PACKAGE_OBSOLETES "cub-hip")
else()
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_nvcc (>= 1.5)")
set(CPACK_RPM_PACKAGE_REQUIRES "hip_nvcc >= 1.5")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-nvcc (>= 1.5)")
set(CPACK_RPM_PACKAGE_REQUIRES "hip-nvcc >= 1.5")
endif()
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
if(NOT CPACK_PACKAGING_INSTALL_PREFIX)
Expand Down

0 comments on commit 6ee0aed

Please sign in to comment.