From 6d4aa1f2e6740327a54f423ce744ed23fa7b1f51 Mon Sep 17 00:00:00 2001 From: Sam Wu Date: Wed, 12 Jun 2024 15:06:24 -0600 Subject: [PATCH 1/3] [ROCDOC-593] Update Read the Docs configuration to Python 3.10 and latest rocm-docs-core Change-Id: Ia086cd708f5bfcff71780cc104afe1e0908923c9 [ROCm/rocm_smi_lib commit: 2d7d7c449a6a18ac3d4c810ac58f7580ac96b565] --- projects/rocm-smi-lib/.readthedocs.yaml | 2 +- .../rocm-smi-lib/docs/sphinx/requirements.in | 2 +- .../rocm-smi-lib/docs/sphinx/requirements.txt | 128 +++++++++--------- 3 files changed, 65 insertions(+), 67 deletions(-) diff --git a/projects/rocm-smi-lib/.readthedocs.yaml b/projects/rocm-smi-lib/.readthedocs.yaml index 2a83261370..04bee093ed 100644 --- a/projects/rocm-smi-lib/.readthedocs.yaml +++ b/projects/rocm-smi-lib/.readthedocs.yaml @@ -15,6 +15,6 @@ python: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.10" apt_packages: - "graphviz" # For dot graphs in doxygen diff --git a/projects/rocm-smi-lib/docs/sphinx/requirements.in b/projects/rocm-smi-lib/docs/sphinx/requirements.in index f55321431c..1e3bcfb7f4 100644 --- a/projects/rocm-smi-lib/docs/sphinx/requirements.in +++ b/projects/rocm-smi-lib/docs/sphinx/requirements.in @@ -1 +1 @@ -rocm-docs-core[api_reference]>=0.31.0 +rocm-docs-core[api_reference]==1.4.0 diff --git a/projects/rocm-smi-lib/docs/sphinx/requirements.txt b/projects/rocm-smi-lib/docs/sphinx/requirements.txt index e8ac65f0ad..10056dc74e 100644 --- a/projects/rocm-smi-lib/docs/sphinx/requirements.txt +++ b/projects/rocm-smi-lib/docs/sphinx/requirements.txt @@ -1,130 +1,126 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile requirements.in # -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -babel==2.12.1 +babel==2.15.0 # via # pydata-sphinx-theme # sphinx -beautifulsoup4==4.12.2 +beautifulsoup4==4.12.3 # via pydata-sphinx-theme -breathe==4.34.0 +breathe==4.35.0 # via rocm-docs-core -certifi==2022.12.7 +certifi==2024.6.2 # via requests -cffi==1.15.1 +cffi==1.16.0 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.3.2 # via requests -click==8.1.3 +click==8.1.7 # via # click-log # doxysphinx # sphinx-external-toc click-log==0.4.0 # via doxysphinx -cryptography==40.0.2 +cryptography==42.0.8 # via pyjwt -deprecated==1.2.13 +deprecated==1.2.14 # via pygithub -docutils==0.16 +docutils==0.21.2 # via # breathe # myst-parser # pydata-sphinx-theme # sphinx -doxysphinx==3.3.7 +doxysphinx==3.3.8 # via rocm-docs-core -fastjsonschema==2.18.0 +fastjsonschema==2.19.1 # via rocm-docs-core -gitdb==4.0.10 +gitdb==4.0.11 # via gitpython -gitpython==3.1.31 +gitpython==3.1.43 # via rocm-docs-core -idna==3.4 +idna==3.7 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.4.1 - # via sphinx -importlib-resources==5.10.4 - # via rocm-docs-core -jinja2==3.1.2 +jinja2==3.1.4 # via # myst-parser # sphinx libsass==0.22.0 # via doxysphinx -lxml==4.9.2 +lxml==4.9.4 # via doxysphinx -markdown-it-py==2.2.0 +markdown-it-py==3.0.0 # via # mdit-py-plugins # myst-parser -markupsafe==2.1.2 +markupsafe==2.1.5 # via jinja2 -mdit-py-plugins==0.3.5 +mdit-py-plugins==0.4.1 # via myst-parser mdurl==0.1.2 # via markdown-it-py -mpire==2.8.0 +mpire==2.10.2 # via doxysphinx -myst-parser==1.0.0 +myst-parser==3.0.1 # via rocm-docs-core -packaging==23.1 +numpy==1.26.4 + # via doxysphinx +packaging==24.1 # via # pydata-sphinx-theme # sphinx -pycparser==2.21 +pycparser==2.22 # via cffi -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.15.3 # via # rocm-docs-core # sphinx-book-theme -pygithub==1.58.1 +pygithub==2.3.0 # via rocm-docs-core -pygments==2.15.0 +pygments==2.18.0 # via # accessible-pygments # mpire # pydata-sphinx-theme # sphinx -pyjson5==1.6.4 +pyjson5==1.6.6 # via doxysphinx -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via pygithub pynacl==1.5.0 # via pygithub -pyparsing==3.0.9 +pyparsing==3.1.2 # via doxysphinx -pytz==2023.3.post1 - # via babel -pyyaml==6.0 +pyyaml==6.0.1 # via # myst-parser # rocm-docs-core # sphinx-external-toc -requests==2.28.2 +requests==2.32.3 # via # pygithub # sphinx -rocm-docs-core[api_reference]>=0.31.0 +rocm-docs-core[api-reference]==1.4.0 # via -r requirements.in -smmap==5.0.0 +smmap==5.0.1 # via gitdb snowballstemmer==2.2.0 # via sphinx -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 -sphinx==5.3.0 +sphinx==7.3.7 # via # breathe # myst-parser @@ -135,37 +131,39 @@ sphinx==5.3.0 # sphinx-design # sphinx-external-toc # sphinx-notfound-page -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via rocm-docs-core -sphinx-copybutton==0.5.1 +sphinx-copybutton==0.5.2 # via rocm-docs-core -sphinx-design==0.3.0 +sphinx-design==0.6.0 # via rocm-docs-core -sphinx-external-toc==0.3.1 +sphinx-external-toc==1.0.1 # via rocm-docs-core -sphinx-notfound-page==0.8.3 +sphinx-notfound-page==1.0.2 # via rocm-docs-core -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx -tqdm==4.66.1 +tomli==2.0.1 + # via sphinx +tqdm==4.66.4 # via mpire -typing-extensions==4.5.0 - # via pydata-sphinx-theme -urllib3==1.26.18 - # via requests -wrapt==1.15.0 - # via deprecated -zipp==3.17.0 +typing-extensions==4.12.2 # via - # importlib-metadata - # importlib-resources + # pydata-sphinx-theme + # pygithub +urllib3==2.2.1 + # via + # pygithub + # requests +wrapt==1.16.0 + # via deprecated From 4c21eea71d6e26d177795bde46ef169ee568434c Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Mon, 10 Jun 2024 09:36:26 -0500 Subject: [PATCH 2/3] Fix assignment of member dismiss_ This patch fixes error: error: assignment of member 'dismiss_' in read-only object Reported by kind Gentoo folks: Change-Id: I7cc593043e97402afd85593c528ace86952b1350 Signed-off-by: Galantsev, Dmitrii [ROCm/rocm_smi_lib commit: 12c8237705a91bd4096cfa4e9c0eac2d5305544b] --- projects/rocm-smi-lib/include/rocm_smi/rocm_smi_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_utils.h b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_utils.h index 74082c490e..431c60698c 100755 --- a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_utils.h +++ b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_utils.h @@ -240,7 +240,7 @@ class ScopeGuard { __forceinline ~ScopeGuard() { if (!dismiss_) release_(); } - __forceinline ScopeGuard& operator=(const ScopeGuard& rhs) { + __forceinline ScopeGuard& operator=(ScopeGuard& rhs) { dismiss_ = rhs.dismiss_; release_ = rhs.release_; rhs.dismiss_ = true; From 0e2b7a7623383a0998bbea0d946357b613d57bee Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Thu, 13 Jun 2024 00:53:02 -0700 Subject: [PATCH 3/3] SWDEV-468081 - Remove package provides field from RPM and DEB package The provides tag is required when the package provides a virtual package. Package name along with version will be provided by default and the provides tag is not required for this. Using the tag for providing the name, but without version was resulting in package upgrade issues. Change-Id: I74506d8c3bbd75d028bcdc03525c29541dce2b4c [ROCm/rocm_smi_lib commit: d54bade57476b01aa8b3f2f07dcfbf781cd3b929] --- projects/rocm-smi-lib/CMakeLists.txt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/rocm-smi-lib/CMakeLists.txt b/projects/rocm-smi-lib/CMakeLists.txt index b1fe05a4c7..aba5aa69f8 100755 --- a/projects/rocm-smi-lib/CMakeLists.txt +++ b/projects/rocm-smi-lib/CMakeLists.txt @@ -184,9 +184,6 @@ endif() set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_RPM_COMPONENT_INSTALL ON) -set(CPACK_DEBIAN_PACKAGE_PROVIDES "${ROCM_SMI_PACKAGE}") -set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_DEBIAN_PACKAGE_PROVIDES}") - # Add dependencies # no rocm-core # python doesn't need to be asan @@ -213,15 +210,6 @@ 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_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}") - add_subdirectory("rocm_smi") add_subdirectory("oam")