diff --git a/hipamd/packaging/CMakeLists.txt b/hipamd/packaging/CMakeLists.txt index 8484795d5c..523d2503b8 100644 --- a/hipamd/packaging/CMakeLists.txt +++ b/hipamd/packaging/CMakeLists.txt @@ -21,11 +21,7 @@ cmake_minimum_required(VERSION 3.16.8) #set components for HIP -if(HIP_CATCH_TEST EQUAL "1") - set(CPACK_COMPONENTS_ALL binary dev doc samples runtime-nvidia test) -else() - set(CPACK_COMPONENTS_ALL binary dev doc samples runtime-nvidia) -endif() +set(CPACK_COMPONENTS_ALL binary dev doc samples runtime-nvidia) ###############Install Required files for all compnents######## @@ -108,14 +104,6 @@ endif() install(DIRECTORY ${HIP_COMMON_DIR}/samples DESTINATION ${CMAKE_INSTALL_DATADIR}/hip COMPONENT samples) #End samples files install -#Begin test files install -if(HIP_CATCH_TEST EQUAL "1") -install(DIRECTORY ${CMAKE_BINARY_DIR}/catch - DESTINATION . COMPONENT test - USE_SOURCE_PERMISSIONS) -endif() -#End test files install - ################################## # Packaging steps COMMON Variables @@ -200,22 +188,6 @@ set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hip-base") set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hip-base") #End dev Packaging setting -#Begin test Packaging setting -if(HIP_CATCH_TEST EQUAL "1") -set(CPACK_TEST_DEB "ON") -set(CPACK_TEST_RPM "ON") -set(CPACK_DEBIAN_TEST_PACKAGE_NAME "hip-catch-tests") -set(CPACK_RPM_TEST_PACKAGE_NAME "hip-catch-tests") -set(CPACK_COMPONENT_TEST_DESCRIPTION "HIP: Heterogenous-computing Interface for Portability [TESTS]") - -set(CPACK_DEBIAN_TEST_PACKAGE_DEPENDS "hip-dev (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), rocm-core") -set(CPACK_DEBIAN_TEST_PACKAGE_PROVIDES "hip-catch-tests") - -string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_TEST_PACKAGE_REQUIRES "hip-devel = ${HIP_BASE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}, rocm-core") -endif() -#End test Packaging setting - #Begin doc Packaging setting set(CPACK_DOC_DEB "ON") set(CPACK_DOC_RPM "ON") @@ -271,12 +243,6 @@ if(NOT ROCM_DEP_ROCMCORE) string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_SAMPLES_PACKAGE_DEPENDS ${CPACK_DEBIAN_SAMPLES_PACKAGE_DEPENDS}) string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_RUNTIME-NVIDIA_PACKAGE_REQUIRES ${CPACK_RPM_RUNTIME-NVIDIA_PACKAGE_REQUIRES}) string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_RUNTIME-NVIDIA_PACKAGE_DEPENDS ${CPACK_DEBIAN_RUNTIME-NVIDIA_PACKAGE_DEPENDS}) - -if(HIP_CATCH_TEST EQUAL "1") - string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_TEST_PACKAGE_REQUIRES ${CPACK_RPM_TEST_PACKAGE_REQUIRES}) - string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_TEST_PACKAGE_DEPENDS ${CPACK_DEBIAN_TEST_PACKAGE_DEPENDS}) -endif()#HIPC_CATCH_TEST - endif() include(CPack) diff --git a/hipamd/packaging/hip-tests.txt b/hipamd/packaging/hip-tests.txt deleted file mode 100644 index 1ca6031f59..0000000000 --- a/hipamd/packaging/hip-tests.txt +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -cmake_minimum_required(VERSION 3.16.8) -project(hip_catch_tests) -include(GNUInstallDirs) - -install(DIRECTORY @PROJECT_BINARY_DIR@/catch - DESTINATION . - USE_SOURCE_PERMISSIONS) - -############################# -# Packaging steps -############################# -set(CPACK_SET_DESTDIR TRUE) -set(CPACK_INSTALL_PREFIX @CPACK_INSTALL_PREFIX@ ) -set(CPACK_PACKAGE_NAME "hip-catch-tests") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [CATCH TESTS]") -set(CPACK_PACKAGE_DESCRIPTION "HIP: - Heterogenous-computing Interface for Portability [CATCH TESTS]") -set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") -set(CPACK_PACKAGE_CONTACT "HIP Support ") -set(CPACK_PACKAGE_VERSION_MAJOR @HIP_VERSION_MAJOR@) -set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@) -set(CPACK_PACKAGE_VERSION_PATCH @HIP_VERSION_PATCH@) -set(CPACK_PACKAGE_VERSION @HIP_VERSION_MAJOR@.@HIP_VERSION_MINOR@.@HIP_PACKAGING_VERSION_PATCH@) -set(CPACK_GENERATOR "TGZ;DEB;RPM") - -set(CPACK_BINARY_DEB "ON") -set(CPACK_DEBIAN_PACKAGE_RELEASE @CPACK_DEBIAN_PACKAGE_RELEASE@) -set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-dev (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), rocm-core") -set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-catch-tests") - -set(CPACK_BINARY_RPM "ON") -set(CPACK_RPM_PACKAGE_RELEASE @CPACK_RPM_PACKAGE_RELEASE@) -set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") -set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") -set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") -string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_PACKAGE_REQUIRES "hip-devel = ${HIP_BASE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}, rocm-core") -set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") -set(CPACK_SOURCE_GENERATOR "TGZ") -# Remove dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON not given to cmake -set(ROCM_DEP_ROCMCORE "@ROCM_DEP_ROCMCORE@") -if(NOT ROCM_DEP_ROCMCORE) - string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES}) - string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}) -endif() - -set ( CPACK_RESOURCE_FILE_LICENSE "@hip_SOURCE_DIR@/LICENSE.txt" ) -# Install license file -install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}) -set(CPACK_RPM_PACKAGE_LICENSE "MIT") -include(CPack)