From 0c3c3442e056274d683817386224cab44535644d Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Wed, 15 May 2024 12:54:10 -0500 Subject: [PATCH 1/2] Azure - Add rocm-ci.yml Change-Id: If5db660729c732d96eb66897f0339850db98bb6b Signed-off-by: Galantsev, Dmitrii --- .azuredevops/rocm-ci.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .azuredevops/rocm-ci.yml diff --git a/.azuredevops/rocm-ci.yml b/.azuredevops/rocm-ci.yml new file mode 100644 index 0000000000..51ea49ec46 --- /dev/null +++ b/.azuredevops/rocm-ci.yml @@ -0,0 +1,40 @@ +resources: + repositories: + - repository: pipelines_repo + type: github + endpoint: ROCm + name: ROCm/ROCm + +variables: +- group: common +- template: /.azuredevops/variables-global.yml@pipelines_repo + +trigger: + batch: true + branches: + include: + - develop + paths: + exclude: + - .github + - docs + - '.*.y*ml' + - '*.md' + - License.txt + +pr: + autoCancel: true + branches: + include: + - develop + paths: + exclude: + - .github + - docs + - '.*.y*ml' + - '*.md' + - License.txt + drafts: false + +jobs: + - template: ${{ variables.CI_COMPONENT_PATH }}/rocm_smi_lib.yml.yml@pipelines_repo From 9f7e69bd5e813e03026bb10e7e099b4886859f50 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Fri, 12 Apr 2024 12:23:57 -0700 Subject: [PATCH 2/2] SWDEV-442738 - Static package generation for rocm_smi_lib Package name will have suffix static-dev/devel Change-Id: Ia273a66c663c56b023f6d765d024b30f1c35639d --- CMakeLists.txt | 58 +++++++++++++++++++++++------------------ rocm_smi/CMakeLists.txt | 4 +-- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad4ea6eafe..1d9fba4344 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ set(PKG_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}") set(PKG_VERSION_NUM_COMMIT 0) ## Define default variable and variables for the optional build target -## rocm_smi_lib-dev +## rocm_smi_lib set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory.") set(COMMON_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Location source code common root.") set(ROCM_SMI_PACKAGE rocm-smi-lib) @@ -184,26 +184,32 @@ endif() set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_RPM_COMPONENT_INSTALL ON) -#Component Specific Configuration/Flags -set(CPACK_DEBIAN_ASAN_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-asan) -set(CPACK_DEBIAN_DEV_PACKAGE_NAME ${ROCM_SMI_PACKAGE}) -set(CPACK_DEBIAN_TESTS_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-tests) -set(CPACK_RPM_ASAN_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-asan) -set(CPACK_RPM_DEV_PACKAGE_NAME ${ROCM_SMI_PACKAGE}) -set(CPACK_RPM_TESTS_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-tests) +set(CPACK_DEBIAN_PACKAGE_PROVIDES "${ROCM_SMI_PACKAGE}") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, rocm-core") +set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_DEBIAN_PACKAGE_PROVIDES}") +set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_DEBIAN_PACKAGE_DEPENDS}") -set (CPACK_DEBIAN_ASAN_PACKAGE_PROVIDES "${ROCM_SMI_PACKAGE}-asan") -set (CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "python3, rocm-core-asan") -set (CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "rocm-smi") -set (CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "python3, rocm-core") -set (CPACK_DEBIAN_TESTS_PACKAGE_PROVIDES "${ROCM_SMI_PACKAGE}-tests") -set (CPACK_DEBIAN_TESTS_PACKAGE_DEPENDS "python3, rocm-core") -set (CPACK_RPM_ASAN_PACKAGE_PROVIDES "${ROCM_SMI_PACKAGE}-asan") -set (CPACK_RPM_ASAN_PACKAGE_REQUIRES "python3, rocm-core-asan") -set (CPACK_RPM_DEV_PACKAGE_PROVIDES "rocm-smi") -set (CPACK_RPM_DEV_PACKAGE_REQUIRES "python3, rocm-core") -set (CPACK_RPM_TESTS_PACKAGE_PROVIDES "${ROCM_SMI_PACKAGE}-tests") -set (CPACK_RPM_TESTS_PACKAGE_REQUIRES "python3, rocm-core") +#Component Specific Configuration/Flags +set(CPACK_DEBIAN_DEV_PACKAGE_NAME ${ROCM_SMI_PACKAGE}) +set(CPACK_DEBIAN_ASAN_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-asan) +set(CPACK_DEBIAN_TESTS_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-tests) +set(CPACK_DEBIAN_STATIC_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-static-dev) +set(CPACK_RPM_DEV_PACKAGE_NAME ${ROCM_SMI_PACKAGE}) +set(CPACK_RPM_ASAN_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-asan) +set(CPACK_RPM_TESTS_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-tests) +set(CPACK_RPM_STATIC_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-static-devel) + +set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "${CPACK_DEBIAN_DEV_PACKAGE_NAME}") +set(CPACK_DEBIAN_ASAN_PACKAGE_PROVIDES "${CPACK_DEBIAN_ASAN_PACKAGE_NAME}") +set(CPACK_DEBIAN_TESTS_PACKAGE_PROVIDES "${CPACK_DEBIAN_TESTS_PACKAGE_NAME}") +set(CPACK_DEBIAN_STATIC_PACKAGE_PROVIDES "${CPACK_DEBIAN_STATIC_PACKAGE_NAME}") +set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}-asan") + +set(CPACK_RPM_DEV_PACKAGE_PROVIDES "${CPACK_RPM_DEV_PACKAGE_NAME}") +set(CPACK_RPM_ASAN_PACKAGE_PROVIDES "${CPACK_RPM_ASAN_PACKAGE_NAME}") +set(CPACK_RPM_TESTS_PACKAGE_PROVIDES "${CPACK_RPM_TESTS_PACKAGE_NAME}") +set(CPACK_RPM_STATIC_PACKAGE_PROVIDES "${CPACK_RPM_STATIC_PACKAGE_NAME}") +set(CPACK_RPM_ASAN_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}-asan") add_subdirectory("rocm_smi") @@ -320,9 +326,7 @@ if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) else() set(CPACK_DEBIAN_PACKAGE_RELEASE "local") endif() -set (CPACK_DEBIAN_PACKAGE_PROVIDES "rocm-smi") -set (CPACK_DEBIAN_PACKAGE_DEPENDS "python3, rocm-core") -set (CPACK_DEBIAN_PACKAGE_SUGGESTS "sudo") +set(CPACK_DEBIAN_PACKAGE_SUGGESTS "sudo") ## Process the Debian install/remove scripts to update the CPACK variables configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/postinst.in DEBIAN/postinst @ONLY ) @@ -340,8 +344,6 @@ endif() if(CPACK_RPM_PACKAGE_RELEASE) set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) endif() -set (CPACK_RPM_PACKAGE_PROVIDES "rocm-smi") -set (CPACK_RPM_PACKAGE_REQUIRES "python3, rocm-core") # The line below doesn't currently work; it may be this issue: @@ -368,6 +370,8 @@ if(NOT ROCM_DEP_ROCMCORE) string(REGEX REPLACE ",? ?rocm-core-asan" "" CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS}) string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_DEV_PACKAGE_REQUIRES ${CPACK_RPM_DEV_PACKAGE_REQUIRES}) string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_DEV_PACKAGE_DEPENDS ${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_STATIC_PACKAGE_REQUIRES ${CPACK_RPM_STATIC_PACKAGE_REQUIRES}) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS ${CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS}) 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() @@ -388,3 +392,7 @@ cpack_add_component( cpack_add_component_group("tests") cpack_add_component(tests GROUP tests) +if(NOT BUILD_SHARED_LIBS) + cpack_add_component_group("static") + cpack_add_component(dev GROUP static) +endif() diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt index 012ce9a2c0..523771e579 100755 --- a/rocm_smi/CMakeLists.txt +++ b/rocm_smi/CMakeLists.txt @@ -124,8 +124,8 @@ add_custom_target(link-rocm-smi ALL ## Add the install directives for the runtime library. install(TARGETS ${ROCM_SMI_TARGET} EXPORT rocm_smiTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT dev) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev) install(TARGETS ${ROCM_SMI_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan)