Upgrade CI to 6.1.3

ROCm · Aug 1, 2024 · 9291c01 · 9291c01
1 parent 1fecf2a
commit 9291c01
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -195,38 +195,45 @@ rocm_enable_clang_tidy(
         clang-analyzer-alpha.cplusplus.IteratorRange
         clang-analyzer-alpha.cplusplus.MismatchedIterator
         clang-analyzer-alpha.cplusplus.MisusedMovedObject
+        -bugprone-switch-missing-default-case
         -clang-analyzer-optin.performance.Padding
         -clang-diagnostic-deprecated-declarations
-        -clang-diagnostic-extern-c-compat
         -clang-diagnostic-disabled-macro-expansion
+        -clang-diagnostic-extern-c-compat
         -clang-diagnostic-unused-command-line-argument
-        -cppcoreguidelines-avoid-do-while
+        -cppcoreguidelines-avoid-capture-default-when-capturing-this
         -cppcoreguidelines-avoid-const-or-ref-data-members
+        -cppcoreguidelines-avoid-do-while
         -cppcoreguidelines-explicit-virtual-functions
         -cppcoreguidelines-init-variables
+        -cppcoreguidelines-misleading-capture-default-by-value
+        -cppcoreguidelines-missing-std-forward
         -cppcoreguidelines-pro-bounds-array-to-pointer-decay
         -cppcoreguidelines-pro-bounds-constant-array-index
         -cppcoreguidelines-pro-bounds-pointer-arithmetic
         -cppcoreguidelines-pro-type-member-init
         -cppcoreguidelines-pro-type-reinterpret-cast
         -cppcoreguidelines-pro-type-union-access
         -cppcoreguidelines-pro-type-vararg
+        -cppcoreguidelines-rvalue-reference-param-not-moved
         -cppcoreguidelines-special-member-functions
+        -cppcoreguidelines-use-default-member-init
         -cppcoreguidelines-virtual-class-destructor
-        -cppcoreguidelines-avoid-capture-default-when-capturing-this
-        -cppcoreguidelines-rvalue-reference-param-not-moved
         -google-readability-*
         -google-runtime-int
         -google-runtime-references
+        -misc-include-cleaner
         -misc-macro-parentheses
         -misc-no-recursion
         -modernize-concat-nested-namespaces
         -modernize-pass-by-value
+        -modernize-type-traits
         -modernize-use-default-member-init
         -modernize-use-nodiscard
         -modernize-use-override
         -modernize-use-trailing-return-type
         -modernize-use-transparent-functors
+        -performance-avoid-endl
         -performance-type-promotion-in-math-fn
         -readability-braces-around-statements
         -readability-convert-member-functions-to-static

diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y software-properties-common gnupg2 --no-
     curl -sL http://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -
 
 # Add rocm repository
-RUN sh -c 'echo deb [arch=amd64 trusted=yes] http://repo.radeon.com/rocm/apt/6.0.2/ jammy main > /etc/apt/sources.list.d/rocm.list'
+RUN sh -c 'echo deb [arch=amd64 trusted=yes] http://repo.radeon.com/rocm/apt/6.1.3/ jammy main > /etc/apt/sources.list.d/rocm.list'
 
 # From docs.amd.com for installing rocm. Needed to install properly
 RUN sh -c "echo 'Package: *\nPin: release o=repo.radeon.com\nPin-priority: 600' > /etc/apt/preferences.d/rocm-pin-600"

diff --git a/hip-clang.docker b/hip-clang.docker
@@ -6,7 +6,7 @@ ARG PREFIX=/usr/local
 RUN dpkg --add-architecture i386
 
 # Add rocm repository
-RUN sh -c 'echo deb [arch=amd64 trusted=yes] http://repo.radeon.com/rocm/apt/6.0.2/ focal main > /etc/apt/sources.list.d/rocm.list'
+RUN sh -c 'echo deb [arch=amd64 trusted=yes] http://repo.radeon.com/rocm/apt/6.1.3/ focal main > /etc/apt/sources.list.d/rocm.list'
 
 # From docs.amd.com for installing rocm. Needed to install properly
 RUN sh -c "echo 'Package: *\nPin: release o=repo.radeon.com\nPin-priority: 600' > /etc/apt/preferences.d/rocm-pin-600"

diff --git a/src/targets/gpu/device/topk.cpp b/src/targets/gpu/device/topk.cpp
@@ -57,7 +57,7 @@ struct hip_heap_vector
     MIGRAPHX_DEVICE_CONSTEXPR void sort() { sort_heap(size); }
 
     private:
-    MIGRAPHX_DEVICE_CONSTEXPR inline static void swap(T& v1, T& v2)
+    MIGRAPHX_DEVICE_CONSTEXPR inline static void swap(T& v1, T& v2) noexcept
     {
         T v = v1;
         v1  = v2;

diff --git a/tools/docker/sles.docker b/tools/docker/sles.docker
@@ -3,7 +3,7 @@ FROM registry.suse.com/suse/sle15:15.5
 RUN sh -c 'echo -e "\
 [rocm]\n\
 name=rocm\n\
-baseurl=https://repo.radeon.com/rocm/zyp/6.0.2/main\n\
+baseurl=https://repo.radeon.com/rocm/zyp/6.1.3/main\n\
 enabled=1\n\
 gpgcheck=0\n\
 gpgkey=https://repo.radeon.com/rocm/rocm.gpg.key\n\

diff --git a/tools/install_prereqs.sh b/tools/install_prereqs.sh
@@ -54,6 +54,7 @@ else
     python3-venv \
     rocblas-dev \
     rocm-cmake \
+    rocm-llvm-dev \
     libtbb-dev
 fi