From 789c0b828e37e2a7b3f0f6fd84aa80a660de4466 Mon Sep 17 00:00:00 2001 From: saadrahim <44449863+saadrahim@users.noreply.github.com> Date: Mon, 24 Jun 2019 14:22:16 -0600 Subject: [PATCH] Fixing Centos 7 Packaging and package versioning/maintainer (#82) - Fixing Centos 7 Packaging - standardizing version numbers for release to use rocm versioning - removing maintainer email based on legal's input [ROCm/rccl commit: 1c7b0bd878a7cb3a8c5380bb24c018a202f858b6] --- projects/rccl/CMakeLists.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/projects/rccl/CMakeLists.txt b/projects/rccl/CMakeLists.txt index 258ebe47de..6c622f2aa0 100644 --- a/projects/rccl/CMakeLists.txt +++ b/projects/rccl/CMakeLists.txt @@ -54,8 +54,17 @@ else() set(NCCL_VERSION "${NCCL_MAJOR}${NCCL_MINOR}0${NCCL_PATCH}") endif() -rocm_setup_version(VERSION - "${NCCL_MAJOR}.${NCCL_MINOR}.${NCCL_PATCH}-${PKG_REVISION}") +# Setup VERSION +set(VERSION_STRING "2.6.0.") + +# Check if BUILD_NUMBER is defined in a Jenkins environment +if($ENV{BUILD_NUMBER}) + string(CONCAT BUILD_VERSION ${VERSION_STRING} $ENV{BUILD_NUMBER}) +else() + string(CONCAT BUILD_VERSION ${VERSION_STRING} "0") +endif() + +rocm_setup_version(VERSION ${BUILD_VERSION} NO_GIT_TAG_VERSION) list(APPEND CMAKE_PREFIX_PATH /opt/rocm @@ -63,6 +72,8 @@ list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hcc) find_package(hip REQUIRED) +message(STATUS "HIP compiler: ${HIP_COMPILER}") +message(STATUS "HIP runtime: ${HIP_RUNTIME}") option(BUILD_SHARED_LIBS "Build as a shared library" ON) @@ -161,13 +172,13 @@ rocm_export_targets(NAMESPACE set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_hcc") set(CPACK_RPM_PACKAGE_REQUIRES "hip_hcc") +set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt" "/opt/rocm") + rocm_create_package( NAME rccl DESCRIPTION "Optimized primitives for collective multi-GPU communication" - MAINTAINER - "Jeff Daily " LDCONFIG) rocm_install_symlink_subdir(rccl)