Merge amd-staging into amd-master 20240522

Signed-off-by: guanyu12 <guanyu12@amd.com>
Change-Id: Iefd6b0b0161521b0108ac9ce3d09c8e527c6e081


[ROCm/rocm_smi_lib commit: cbf0890bf9]

projects/rocm-smi-lib/.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

projects/rocm-smi-lib/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()

projects/rocm-smi-lib/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)