AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge amd-staging into amd-master 20230616

Browse Source 
Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: Iff54607e329acbadb2960bfa24c0b046c9d37962


[ROCm/amdsmi commit: 39f5a8dd83]
This commit is contained in:
Hao Zhou
2023-06-16 11:18:37 +08:00
parent d0619e581a 5ecabf2276
commit 58daecf99e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/amdsmi/CMakeLists.txt
+6 -2
View File
@@ -208,7 +208,7 @@ set(CPACK_DEBIAN_ASAN_PACKAGE_RECOMMENDS ${CPACK_DEBIAN_PACKAGE_RECOMMENDS})
set(CPACK_DEBIAN_DEV_PACKAGE_RECOMMENDS ${CPACK_DEBIAN_PACKAGE_RECOMMENDS})
set(CPACK_DEBIAN_ASAN_PACKAGE_PROVIDES "${AMD_SMI_PACKAGE}-asan")
set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "${AMD_SMI_PACKAGE}")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3 (>= 3.7.9)")
set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
@@ -227,9 +227,13 @@ endif()
set(CPACK_RPM_PACKAGE_PROVIDES "amd-smi")
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "${AMD_SMI_PACKAGE}")
set(CPACK_RPM_ASAN_PACKAGE_PROVIDES "${AMD_SMI_PACKAGE}-asan")
set(CPACK_RPM_PACKAGE_REQUIRES "python3")
set(CPACK_RPM_PACKAGE_REQUIRES "python3 >= 3.7.9")
set(CPACK_RPM_DEV_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
set(CPACK_RPM_ASAN_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
set(CPACK_RPM_PACKAGE_SUGGESTS "python38")
set(CPACK_RPM_DEV_PACKAGE_SUGGESTS ${CPACK_RPM_PACKAGE_SUGGESTS})
set(CPACK_RPM_ASAN_PACKAGE_SUGGESTS ${CPACK_RPM_PACKAGE_SUGGESTS})
# don't terminate if bytecompile of python files fails
set(CPACK_RPM_SPEC_MORE_DEFINE "%define _python_bytecompile_errors_terminate_build 0")
projects/amdsmi/amdsmi_cli/amdsmi_cli.py
+1 -1
View File
@@ -32,7 +32,7 @@ from amdsmi import amdsmi_exception
def _print_error(e, destination):
if destination == 'stdout':
if destination in ['stdout', 'json', 'csv']:
print(e)
else:
f = open(destination, "w")
projects/amdsmi/docs/doxygen/Doxyfile
+1 -1
View File
@@ -38,7 +38,7 @@ PROJECT_NAME = AMD SMI
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER =
PROJECT_NUMBER = "23.1.1.0"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
projects/amdsmi/py-interface/pyproject.toml
+1
View File
@@ -17,6 +17,7 @@ description = "SMI LIB - AMD GPU Monitoring Library"
requires-python = ">=3.7"
dependencies = [
'PyYAML >= 5.0',
'clang >= 14.0'
]
[project.urls]