From fb969ce6a5dc0568b9be64d02d2a7b5d53ec3a49 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 17 Jan 2026 22:08:06 -0800 Subject: [PATCH 1/4] rocmPackages: 7.0.2 -> 7.1.1 --- .../rocm-modules/amdsmi/default.nix | 13 +----- .../rocm-modules/aqlprofile/default.nix | 6 +-- pkgs/development/rocm-modules/clr/default.nix | 20 +++------- .../rocm-modules/composable_kernel/base.nix | 4 +- .../development/rocm-modules/half/default.nix | 2 +- .../rocm-modules/hip-common/default.nix | 4 +- .../rocm-modules/hipblas-common/default.nix | 4 +- .../rocm-modules/hipblas/default.nix | 4 +- .../rocm-modules/hipblaslt/default.nix | 2 +- .../rocm-modules/hipcub/default.nix | 4 +- .../rocm-modules/hipfft/default.nix | 4 +- .../rocm-modules/hipfort/default.nix | 4 +- .../rocm-modules/hipify/default.nix | 4 +- .../rocm-modules/hiprand/default.nix | 4 +- .../rocm-modules/hipsolver/default.nix | 4 +- .../rocm-modules/hipsparse/default.nix | 4 +- .../development/rocm-modules/llvm/default.nix | 4 +- .../rocm-modules/migraphx/default.nix | 11 ++--- .../migraphx/msgpack-6-compat.patch | 29 -------------- .../rocm-modules/miopen/default.nix | 4 +- .../rocm-modules/mivisionx/default.nix | 4 +- .../development/rocm-modules/rccl/default.nix | 6 ++- pkgs/development/rocm-modules/rdc/default.nix | 4 +- .../rocm-modules/rocalution/default.nix | 4 +- .../rocm-modules/rocblas/default.nix | 7 ++-- .../rocm-modules/rocdbgapi/default.nix | 14 +++---- .../rocm-modules/rocfft/default.nix | 4 +- .../rocm-modules/rocgdb/default.nix | 4 +- .../rocm-modules/rocm-cmake/default.nix | 4 +- .../rocm-modules/rocm-core/default.nix | 4 +- .../rocm-modules/rocm-docs-core/default.nix | 4 +- .../rocm-modules/rocm-runtime/default.nix | 20 +++------- .../rocm-modules/rocm-smi/default.nix | 4 +- .../rocm-modules/rocminfo/default.nix | 4 +- .../rocm-modules/rocmlir/default.nix | 40 ++++++++++++------- .../rocm-modules/rocprim/default.nix | 4 +- .../rocprofiler-register/default.nix | 4 +- .../rocm-modules/rocprofiler/default.nix | 4 +- .../rocm-modules/rocr-debug-agent/default.nix | 4 +- .../rocm-modules/rocrand/default.nix | 4 +- .../rocm-modules/rocsolver/default.nix | 4 +- .../rocm-modules/rocsparse/default.nix | 4 +- .../rocm-modules/rocthrust/default.nix | 4 +- .../rocm-modules/roctracer/default.nix | 4 +- .../rocm-modules/rocwmma/default.nix | 4 +- pkgs/development/rocm-modules/rpp/default.nix | 7 +++- .../rocm-modules/tensile/default.nix | 4 +- 47 files changed, 134 insertions(+), 179 deletions(-) delete mode 100644 pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index eb33b7608604..57b095812d26 100644 --- a/pkgs/development/rocm-modules/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, rocmUpdateScript, cmake, pkg-config, @@ -21,12 +20,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "rocm"; repo = "amdsmi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-1xQD68mrG1g9Bpw5/vxn+XxDM5HuAyEHyALyBixqR1s="; + hash = "sha256-BGe3+8YFwu41ZVAF+VtN5Cn9pfzGxmCg/Rpq8qWOEoM="; }; postPatch = '' @@ -42,14 +41,6 @@ stdenv.mkDerivation (finalAttrs: { cp ./include/amd_smi/impl/amd_hsmp.h ./esmi_ib_library/include/asm/amd_hsmp.h ''; - patches = [ - (fetchpatch { - name = "fix-build-with-gcc15.patch"; - url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch"; - hash = "sha256-MoOY5q6tQ7Q+bgm/600Etz+cxRk4L2ujkarnBjnfANw="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix index 97fa65abfd56..8c5105348489 100644 --- a/pkgs/development/rocm-modules/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "aqlprofile"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "aqlprofile"; - tag = "rocm-7.0.2"; - hash = "sha256-A17SAkEUf3yAGwvZUWSdL7Tn5YAXB0YlD3T1DLTjDSg="; + tag = "rocm-7.1.1"; + hash = "sha256-MAZUHo52gb0aZSFnKugMlXxcDkmMwhy1AFF1RDRgRVk="; }; env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1"; diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 79070cb3ffba..b1f77059e41c 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-zajb/iTtF/ECRScdcQ85HPgq8DdIGqSinJoVyyi89bw="; + hash = "sha256-ofsq1uqMixtum5C6cp/UgTDpgGPfj+rAd6PoDx5iLLw="; }; nativeBuildInputs = [ @@ -147,14 +147,10 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./cmake-find-x11-libgl.patch (fetchpatch { - # [PATCH] improve rocclr isa compatibility check - sha256 = "sha256-/QpB3Wqdhcq6lzyO/zOWzwQC0oYpesCICxnVx5CqbWg="; - url = "https://github.com/GZGavinZhao/clr/commit/733ee38ef8ad5c84926970981821f446dfcb00af.patch"; - }) - (fetchpatch { - # [PATCH] improve hipamd isa compatibility check - sha256 = "sha256-FvZInw8PqB68ePxAGu45cWT/whD1xmprIA5wZb5OLcE="; - url = "https://github.com/GZGavinZhao/clr/commit/1f0b54ee9b0de08f4dc8cd38b6728928b180048a.patch"; + # [PATCH] rocclr: Extend HIP ISA compatibility checks + sha256 = "sha256-InUSIFI1MgkfocBEoZjO2BCgXNyfF10ehh9jkTtAPXs="; + url = "https://github.com/GZGavinZhao/rocm-systems/commit/937dcfdd316b589509c061809186fe5451d22431.patch"; + relative = "projects/clr"; }) ]; @@ -174,10 +170,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace opencl/khronos/icd/loader/icd_platform.h \ --replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \ '#define ICD_VENDOR_PATH "/run/opengl-driver/etc/OpenCL/vendors/";' - - # new unbundler has better error messages, defaulting it on - substituteInPlace rocclr/utils/flags.hpp \ - --replace-fail "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, false" "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, true" ''; postInstall = '' diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 5c51c4208d40..b3071460b6d6 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ''; pname = "composable_kernel_base"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "composable_kernel"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Wql7PD3kg85AFXn7UaTKxhURyDPfVe/OUbR+udrqDc8="; + hash = "sha256-exdkyTIK03dzlCXHm3j8ehEb9NxLOxPX9QyfMsiCgSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix index 54a2bdc7054e..a7f73bde23fd 100644 --- a/pkgs/development/rocm-modules/half/default.nix +++ b/pkgs/development/rocm-modules/half/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix index 365ffc146c82..750d539c6906 100644 --- a/pkgs/development/rocm-modules/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-9VQrCed5EKVXu41Qrnf2m2jXveWt5Y/SlSxlUmjZS0M="; + hash = "sha256-aI41HdyzyE5HtCbzFmTQYGMiFyQELM/MTVOAbQsg8So="; }; dontConfigure = true; diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix index adf9c331de39..8343f3c256fb 100644 --- a/pkgs/development/rocm-modules/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipBLAS-common"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-NXSMVtfjei4vIjU9y4o3Px/fplq7C7ziY1R8YqnY2LQ="; + hash = "sha256-sswqYIv3c5ArT6dQ3MRru7ZZVA0VxoKW/a0pYTBpjgE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix index 6f1682110652..63998f5f2368 100644 --- a/pkgs/development/rocm-modules/hipblas/default.nix +++ b/pkgs/development/rocm-modules/hipblas/default.nix @@ -24,7 +24,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-SoszZBbk8sM3yjgahs1UrPCsEbGmTYTpdOw+Ah/z8H8="; + hash = "sha256-2wDnYZapJ4fU/JZpy6qOf5+DYuatWmCw/hA8WO5x2T0="; }; postPatch = '' diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index f19734394f0e..f6e18d27056d 100644 --- a/pkgs/development/rocm-modules/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix index d0a7f7815bf4..eb7d8a7dbb35 100644 --- a/pkgs/development/rocm-modules/hipcub/default.nix +++ b/pkgs/development/rocm-modules/hipcub/default.nix @@ -17,7 +17,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Vx9h/DTZo7RfQrflVwXOCKiA7rt6dQQw/P/bllgtq8w="; + hash = "sha256-3/499pX7hFKJwbhSEH3/bMhNdyabK36jLv8s5TC2fuw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix index 0439197337cd..a5dcee6f3bd8 100644 --- a/pkgs/development/rocm-modules/hipfft/default.nix +++ b/pkgs/development/rocm-modules/hipfft/default.nix @@ -21,7 +21,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-cozwHUlqACq0IM3YToc/xFB694DJ3rPiEPUCTo0xuHY="; + hash = "sha256-6FyI9s6H/lHFhm8aUqB9+vvJ0CRIVWCFLNoJprvsI6o="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix index c13345965c2f..401ecbee4953 100644 --- a/pkgs/development/rocm-modules/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-s/VOaU5IKZYH0Vhtjl/UZTrnpLsJ7zWFTvAJY2x3AcA="; + hash = "sha256-IVLhp8rYtKhkt8K8Mc0qyrp670oKoK0QeclnJjO36pY="; }; patches = [ diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix index 22fd712c2983..ea0bd5ebf806 100644 --- a/pkgs/development/rocm-modules/hipify/default.nix +++ b/pkgs/development/rocm-modules/hipify/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xcWUYfZvbTHs4BvDiXAOLONfLiCq9uEGOHSK/hOWg7c="; + hash = "sha256-NbFFHAAvMGpvIryhEbktN5w03Cpay9lEqelqkUT9dpQ="; }; strictDeps = true; diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix index 8854b4dc4827..18d00f097728 100644 --- a/pkgs/development/rocm-modules/hiprand/default.nix +++ b/pkgs/development/rocm-modules/hiprand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprand"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yOLdFQ4/OGGfX75A/ElY1xD+4nkcqT8tZx2bQZgXTx4="; + hash = "sha256-yypKwJ5p2aSAqapEHre9eOjjaFAI8Q1dDYWhwfrrdhg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix index 48f1149d60f6..b4cc56a6abec 100644 --- a/pkgs/development/rocm-modules/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/hipsolver/default.nix @@ -21,7 +21,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "7.0.2"; + version = "7.1.0"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-IZAVdu+VpSrJ/EZXymOzvrGnRLBpxUgVeaj1U+ux02M="; + hash = "sha256-n0+Xy92mBhI2vjB7pFHGt2UgPIHo9rO2ZxGxkz30Otw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix index 033250e16725..12034a4dea02 100644 --- a/pkgs/development/rocm-modules/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/hipsparse/default.nix @@ -19,7 +19,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-hfC+QsOfDNKIZROgTZZsGbAG0yghc27PyVwCDr8MEJ8="; + hash = "sha256-zaMAsLfUYkMUiA2vnGiK0//+vZwugqt5T6xJU4FBrRo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix index fd4ca82c838c..548d928f2179 100644 --- a/pkgs/development/rocm-modules/llvm/default.nix +++ b/pkgs/development/rocm-modules/llvm/default.nix @@ -33,7 +33,7 @@ }: let - version = "7.0.2"; + version = "7.1.1"; # major version of this should be the clang version ROCm forked from rocmLlvmVersion = "20.0.0-rocm"; # llvmPackages_base version should match rocmLlvmVersion @@ -115,7 +115,7 @@ let owner = "ROCm"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-gJlDFbCRsiwHgRzmwm36C3WvGfWwgPrtBNUHYmZHTB8="; + hash = "sha256-CfknIRVeR1bCKh1xzXKl3ehVp0kWT0uGrI9C1HTSKVo="; }; llvmMajorVersion = lib.versions.major rocmLlvmVersion; # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index 32eeb4a84227..f2bde73b4d38 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, rocmUpdateScript, pkg-config, cmake, @@ -59,7 +58,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -75,13 +74,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-P3jiq6i7jpfpL9/S7mc1CiNRwAt8fzy3waHKhyuYIXI="; + hash = "sha256-s6w4bF7koK4wnf6leVKBzwIB4X2ROHa3EgX6XuJIAew="; }; - patches = [ - ./msgpack-6-compat.patch - ]; - nativeBuildInputs = [ pkg-config cmake @@ -147,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include" + export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include -I${lib.getInclude protobuf}/include" patchShebangs tools # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]` diff --git a/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch b/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch deleted file mode 100644 index 5c4890a02ce2..000000000000 --- a/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1dba2c8d..7795ba78 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -358,13 +358,19 @@ target_link_libraries(migraphx PRIVATE nlohmann_json::nlohmann_json) - find_package(SQLite3 REQUIRED) - target_link_libraries(migraphx PRIVATE SQLite::SQLite3) - --find_package(msgpackc-cxx QUIET) --if(NOT msgpackc-cxx_FOUND) -- find_package(msgpack REQUIRED) -+# See: https://github.com/msgpack/msgpack-c/wiki/Q%26A#how-to-support-both-msgpack-c-c-version-5x-and-6x- -+# Prefer 6.x (msgpack-cxx) -+find_package(msgpack-cxx) -+if(msgpack-cxx_FOUND) -+ message(STATUS "Found msgpack-cxx (>=6.x)") -+else() -+ find_package(msgpackc-cxx REQUIRED NAMES msgpackc-cxx msgpack) -+ message(STATUS "Found msgpackc-cxx (<=5.x)") -+ add_library(msgpack-cxx ALIAS msgpackc-cxx) - endif() --target_link_libraries(migraphx PRIVATE msgpackc-cxx) -+target_link_libraries(migraphx PRIVATE msgpack-cxx) - # Make this available to the tests --target_link_libraries(migraphx INTERFACE $) -+target_link_libraries(migraphx INTERFACE $) - - add_library(migraphx_all_targets INTERFACE) - diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 512a24a85685..13dbfa9d4dfc 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -43,7 +43,7 @@ let # FIXME: cmake files need patched to include this properly cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; - version = "7.0.2"; + version = "7.1.1"; # Targets outside this list will get # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD' @@ -69,7 +69,7 @@ let owner = "ROCm"; repo = "MIOpen"; rev = "rocm-${version}"; - hash = "sha256-PJj2LzU5naAku+FOnMl+Ymad2beYYSS81/K/CR+l2UA="; + hash = "sha256-g0AEpuUiwKCu/doiRh9mW34W04m4ynHoarSyl6tR/aE="; fetchLFS = true; fetchSubmodules = true; # WORKAROUND: .lfsconfig is incorrectly set to exclude everything upstream diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix index 40107372e408..baa1bbf68afd 100644 --- a/pkgs/development/rocm-modules/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-SO0rE86UmX9f574ALdnnBDFceKGKTvJDQ8Lf7iSlJtA="; + hash = "sha256-aC6GUPK6ZSOAx+PHHB4gLPNAG5U/kapqX7YWilusDw8="; }; patches = [ diff --git a/pkgs/development/rocm-modules/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix index 757cffedc610..b8fe44a4ee6e 100644 --- a/pkgs/development/rocm-modules/rccl/default.nix +++ b/pkgs/development/rocm-modules/rccl/default.nix @@ -40,7 +40,7 @@ in # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros stdenv.mkDerivation (finalAttrs: { pname = "rccl${clr.gpuArchSuffix}"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -58,9 +58,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ByKz6TNdGVbh65ZH5PtgUbAj4qNVmOBmZ9SrOjkTbWU="; + hash = "sha256-3u7D3Gre1n+4Lf+cK+RMfCUM9c46pXZjdhGOrwIKM0w="; }; + requiredSystemFeatures = [ "big-parallel" ]; # Very resource intensive LTO + nativeBuildInputs = [ cmake rocm-cmake diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index 8d25a239f168..aaa0104c94d3 100644 --- a/pkgs/development/rocm-modules/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ztInmK3oCbvnLe7XQ55/hUHRyhuZ2M2XVTG1NcVHtGs="; + hash = "sha256-oJS0fBeISpgjZkaMfFl/Yq7mPOsdaZDqiRjSPv7kT1Q="; }; patches = [ diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix index e40b0598a856..f044ce89ac4c 100644 --- a/pkgs/development/rocm-modules/rocalution/default.nix +++ b/pkgs/development/rocm-modules/rocalution/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-/Tcb11/63MWnUTyigDrL2slwqL8C553hG5OKRYZan7s="; + hash = "sha256-UkXbcbhaTulCqW1FZHwTyUZLFSnj7WmLYqlPqu5m6YM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix index 309858960511..293cd0f966ee 100644 --- a/pkgs/development/rocm-modules/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-528jAdhWtZbbw76dfUgpMr5px0T7q4Oj76jp0z0lh3A="; + hash = "sha256-obKypbYmnSeOtOr7g0pxOz02YfzZ0bGugTtznkeHz14="; }; outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test"; @@ -92,7 +92,8 @@ stdenv.mkDerivation (finalAttrs: { env.CXXFLAGS = "-fopenmp -I${lib.getDev boost}/include -I${hipblas-common}/include -I${roctracer}/include"; # Fails to link tests with undefined symbol: cblas_* - env.LDFLAGS = lib.optionalString (buildTests || buildBenchmarks) "-Wl,--as-needed -lcblas"; + env.LDFLAGS = + "-Wl,--as-needed -lzstd" + lib.optionalString (buildTests || buildBenchmarks) " -lcblas"; env.TENSILE_ROCM_ASSEMBLER_PATH = "${stdenv.cc}/bin/clang++"; cmakeFlags = [ diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix index 7103a988c146..b856c57ebb71 100644 --- a/pkgs/development/rocm-modules/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -56,11 +56,13 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; + buildFlags = lib.optionals buildDocs [ "doc" ]; + src = fetchFromGitHub { owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-adzHfTd4O59YKqkPL1oZnM8qiuGjlWefbl50MI2Z7co="; + hash = "sha256-RwYZJPwGhNtSSvmSgy0AsNTc98cav0/u9jH5f93sB9M="; }; nativeBuildInputs = [ @@ -89,12 +91,8 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; - # Unfortunately, it seems like we have to call make on this manually - postBuild = lib.optionalString buildDocs '' - make -j$NIX_BUILD_CORES doc - ''; - postInstall = lib.optionalString buildDocs '' + mkdir -p $doc/share/doc/amd-dbgapi/ mv $out/share/html/amd-dbgapi $doc/share/doc/amd-dbgapi/html rmdir $out/share/html ''; @@ -106,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Debugger support for control of execution and inspection state"; + description = "Debugger support for control of execution and inspection state of AMD's GPU architectures"; homepage = "https://github.com/ROCm/ROCdbgapi"; license = with lib.licenses; [ mit ]; teams = [ lib.teams.rocm ]; diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix index c132b7952656..426faa1a9410 100644 --- a/pkgs/development/rocm-modules/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-VVRZSmMma/sjSj2obRrwP118v/FasS30ZU0nFsEp9rw="; + hash = "sha256-1Ho3b5NmnzfLhDnvH6FECigs6OgpbJrxw4EnqKyaHA0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix index 3cc5a4a410a5..debc2d12966f 100644 --- a/pkgs/development/rocm-modules/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/rocgdb/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-IYdhYYJGTXBIftTEpvi+lvdhtYgdFWSpdNbtTBh0l9s="; + hash = "sha256-LDVGO++voqwVMM6RcRtgbXTUvFLTyg/TFdSZanv5Xdc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix index a30a34c74b03..311a848863a0 100644 --- a/pkgs/development/rocm-modules/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/rocm-cmake/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Gu+w+2dXKXcJtdmpODByxQaZbYMkoAeX9/0tOcGy5Es="; + hash = "sha256-im6UO0crO0Jc27zkTsdvJYPHit8IGlw/vDPGrmP1XqY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix index 242c9bfa7d92..0902dc58ae60 100644 --- a/pkgs/development/rocm-modules/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-core"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-TKHNtY3XoLznOi1aVHdxFk3bedtLKkrFy0NVm0ad6ZY="; + hash = "sha256-3WQPR7v7LRoo4ioCXzkUEqnJdXA3uxSgoZZQvEG5Gqg="; }; patches = [ diff --git a/pkgs/development/rocm-modules/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/rocm-docs-core/default.nix index b50cea3fe088..8d5e41f32ed3 100644 --- a/pkgs/development/rocm-modules/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-docs-core/default.nix @@ -24,14 +24,14 @@ # FIXME: Move to rocmPackages_common buildPythonPackage rec { pname = "rocm-docs-core"; - version = "1.23.0"; + version = "1.31.3"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-docs-core"; rev = "v${version}"; - hash = "sha256-5Qh83eJ9vju/uUb9gGA4B5Bh1WZCygIRbSnaEZzIdbw="; + hash = "sha256-N9wqu83fPQGgOSDdb4yXmfxfDxkevk6QA31vLl5sYHo="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 98b2bded9d9e..73d83211b15b 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-oz2UCR4XEhNm1uDlCeDnDJrmysWKA6GKxlEuFu21es0="; + hash = "sha256-gqe1trGc/Cu1XFA4aYjOzFurUgebLbdTHEJi4iw2+kk="; }; cmakeBuildType = "RelWithDebInfo"; @@ -54,20 +54,10 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { - # rocr: Extend HIP ISA compatibility check + # [PATCH] rocr: Extend HIP ISA compatibility check sha256 = "sha256-8r2Lb5lBfFaZC3knCxfXGcnkzNv6JxOKyJn2rD5gus4="; - url = "https://github.com/GZGavinZhao/ROCR-Runtime/commit/7c63e7185d8fcf08537a278908946145f6231121.patch"; - }) - # Patches for UB at runtime https://github.com/ROCm/ROCR-Runtime/issues/272 - (fetchpatch { - # [PATCH] queues: fix UB due to 1 << 31 - url = "https://github.com/ROCm/ROCR-Runtime/commit/9b8a0f5dbee1903fa990a7d8accc1c5fbc549636.patch"; - hash = "sha256-KlZWjfngH8yKly08iwC+Bzpvp/4dkaTpRIKdFYwRI+U="; - }) - (fetchpatch { - # [PATCH] topology: fix UB due to 1 << 31 - url = "https://github.com/ROCm/ROCR-Runtime/commit/d1d00bfee386d263e13c2b64fb6ffd1156deda7c.patch"; - hash = "sha256-u70WEZaphQ7qTfgQPFATwdKWtHytu7CFH7Pzv1rOM8w="; + url = "https://github.com/GZGavinZhao/rocm-systems/commit/c13cd118fcc8e0bc9ae8de62897542dca7352b71.patch"; + relative = "projects/rocr-runtime"; }) (fetchpatch { # [PATCH] kfd_ioctl: fix UB due to 1 << 31 diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix index f10d5da21474..838d6c81977e 100644 --- a/pkgs/development/rocm-modules/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-LzWKWiHmMDGO2ejvcT0BBg22HbYD9q0fxK/bq6JvcnQ="; + hash = "sha256-/3to1+45n+D8snwrFVhApSMWp/rIXmTFK+BiA0mcKZo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix index 620c63cb1ec6..0e9b2301b4ab 100644 --- a/pkgs/development/rocm-modules/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/rocminfo/default.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "7.0.2"; + version = "7.1.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; - sha256 = "sha256-wE1/golRQm5uggXRQ1BucxV3laypSOUCvjTFx5N2yTE="; + sha256 = "sha256-SuW34m2ep69+dj1rb0vqfQcK83FBtjlMLqSMCUZltU4="; }; strictDeps = true; diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix index 5ed107d458db..47b5ae1ff3d2 100644 --- a/pkgs/development/rocm-modules/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -8,6 +8,9 @@ clr, libxml2, libedit, + rocm-comgr, + rocm-device-libs, + rocm-runtime, zstd, zlib, ncurses, @@ -39,7 +42,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -52,10 +55,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0+vZ/Lkh1fC9oKyy83YjIX4xuMJEWErd8UpZZuaaXdI="; + hash = "sha256-A9vUvsEZrZlNEW4cscF66L48rJQ1zJYmIzwXQ2QzJ3s="; }; nativeBuildInputs = [ + clr cmake rocm-cmake python3Packages.python @@ -65,6 +69,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxml2 libedit + rocm-comgr + rocm-runtime + rocm-device-libs ]; propagatedBuildInputs = [ @@ -74,23 +81,28 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_USE_LINKER=lld" - "-DLLVM_ENABLE_ZSTD=FORCE_ON" - "-DLLVM_ENABLE_ZLIB=FORCE_ON" - "-DLLVM_ENABLE_LIBCXX=ON" - "-DLLVM_ENABLE_TERMINFO=ON" - "-DROCM_PATH=${clr}" + (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" "AMDGPU${ + lib.optionalString (!buildRockCompiler) ";${llvmNativeTarget}" + }") + (lib.cmakeFeature "LLVM_USE_LINKER" "lld") + (lib.cmakeFeature "LLVM_ENABLE_ZSTD" "FORCE_ON") + (lib.cmakeFeature "LLVM_ENABLE_ZLIB" "FORCE_ON") + (lib.cmakeBool "LLVM_ENABLE_LIBCXX" true) + (lib.cmakeBool "LLVM_ENABLE_TERMINFO" true) + (lib.cmakeFeature "ROCM_PATH" "${clr}") # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeBool "MLIR_ENABLE_ROCM_RUNNER" (!buildRockCompiler)) (lib.cmakeBool "BUILD_FAT_LIBROCKCOMPILER" buildRockCompiler) ] + ++ lib.optionals buildRockCompiler [ + (lib.cmakeBool "LLVM_INCLUDE_TESTS" false) + ] ++ lib.optionals (!buildRockCompiler) [ - "-DROCM_TEST_CHIPSET=gfx000" + (lib.cmakeFeature "ROCM_TEST_CHIPSET" "gfx900") ]; postPatch = '' diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix index f1769f266292..47dedf2e23c0 100644 --- a/pkgs/development/rocm-modules/rocprim/default.nix +++ b/pkgs/development/rocm-modules/rocprim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-uOlrN/FvEBBCHsPeJOWs9NNqVwrcxVExfs5wp03PH0U="; + hash = "sha256-/O6aEF23IaUSVzEDRqIlpYpxNCSTa/CwVDgXOhvTrQc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index 5e23901f4c09..821a4d9de569 100644 --- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler-register"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-hK7k4tg7/5rYCSTFKsFRsRYfVevkCARcDyxlexrXbts="; + hash = "sha256-XlBz5rDMvnPxyCiqpEpIUWzbHJ1BbMzeCJTrP5kKf+w="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix index a8aeefc12886..9fa4f70b1138 100644 --- a/pkgs/development/rocm-modules/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-p2VwMm9Ltx/SFDIFk42nY9Too0Rp/IrqfuH8cQnhoGA="; + hash = "sha256-V+E+6D/mBW/NVdHSBVUVMG5Z/QOF73vfZ5rryW2VBtI="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix index aebee50302ba..f829f9e5a090 100644 --- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-twoihis1OrCQ4K3rjDgjSErq+qktqz2xwkLLxBJIJ90="; + hash = "sha256-zW92HyK4nGcDaJxmBaHeURAivs6dU059WxaywL6dAk4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix index 8d952d3e10b8..b4ac228ef5f0 100644 --- a/pkgs/development/rocm-modules/rocrand/default.nix +++ b/pkgs/development/rocm-modules/rocrand/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand${clr.gpuArchSuffix}"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-O7YCQBtFSa0xiHbbAXX2FyE6uRywEaMaJyX85875Yd0="; + hash = "sha256-QhHxpjr3SqeSSMS4QmnDq8zIxEeUtrgwb9JG84jfJgY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index cbad72ab2328..4653c009739b 100644 --- a/pkgs/development/rocm-modules/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "7.0.2"; + version = "7.1.0"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-/JFGqNA4weVgFuVtszYAxq65/+oZjiKC8zSxwvp964M="; + hash = "sha256-U5RrV90UZiIUgLYleLJ6rFHWRFMQNyh3zezRusj7T0M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix index df695fb09d6c..c6bfded26eb0 100644 --- a/pkgs/development/rocm-modules/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-0KFzrVGScCQDbOdlX016ymZ4lgCimd9XK4auK9V5p3k="; + hash = "sha256-ZNeFslIQZlFCNqWHmrpcxDuOvVu1cjiEd8b6ZNXcZzo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix index 940bedc8fa83..23e669d35629 100644 --- a/pkgs/development/rocm-modules/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/rocthrust/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-tbGEZ8NXu7euPN8CaRYOjcmTmYq1SUP7LNKOjO0RICE="; + hash = "sha256-Gncy0wvN8M4JSmnjbxaED+M9rLo4A/7LCCq/6temiZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix index fd71442c4c58..cfd1045e3ab8 100644 --- a/pkgs/development/rocm-modules/roctracer/default.nix +++ b/pkgs/development/rocm-modules/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-8DMwaMtzdBuAAV5KhQfqLfTtSyvPiwZxc1lAAoeXGus="; + hash = "sha256-LCtdPnE+rJU/ccI1PTFDMPNXxgl1GrRgc5z7LjOw3zA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix index 6b3800c83b12..1cfafeb027ad 100644 --- a/pkgs/development/rocm-modules/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/rocwmma/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "7.0.2"; + version = "7.1.1"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xCLoYvbKiAgAxDCbEopNxYBs3V3EJBmO3NpONiveXvE="; + hash = "sha256-6hvdq3J8UhldcyNqXxi9UEF+P0RgG8o5YdIZLzvpgXw="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix index bfa3849a3987..9c815a034d11 100644 --- a/pkgs/development/rocm-modules/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-oysmF9TS1tm37x9DNoZ2KqHKP1wJDoFY+IuL1WkIz0o="; + hash = "sha256-ZlJRV57ybPsczvoWwd5vr2n7EKje0vj2GJYsvVY+qas="; }; nativeBuildInputs = [ @@ -56,6 +56,9 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DROCM_PATH=${clr}" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ] ++ lib.optionals (gpuTargets != [ ]) [ "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix index b4d150b357f3..306174ddf1d4 100644 --- a/pkgs/development/rocm-modules/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tensile"; - version = "7.0.2"; + version = "7.1.1"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; repo = "Tensile"; rev = "rocm-${version}"; - hash = "sha256-1G6qp/VBJL67QW9t2VB5KK5lwn+PbY0hqHq8DzyK2fg="; + hash = "sha256-uYLlbtXrc8m8/RpMbP7WaS7VYGIUm2LHYzv00DZAzvE="; }; # TODO: It should be possible to run asm caps test ONCE for all supported arches From b17c41cc49a6cdf0364c48d55e2d69dc309b0c41 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Mon, 19 Jan 2026 10:59:36 -0800 Subject: [PATCH 2/4] rocmPackages.clr: enable gfx1150 (Ryzen AI series APU) by default --- pkgs/development/rocm-modules/clr/default.nix | 2 +- pkgs/development/rocm-modules/default.nix | 1 + pkgs/development/rocm-modules/hipblaslt/default.nix | 2 +- pkgs/development/rocm-modules/rocsolver/default.nix | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index b1f77059e41c..41bc146a0300 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -237,7 +237,7 @@ stdenv.mkDerivation (finalAttrs: { "1100" "1101" "1102" - # 7.x "1150" + "1150" # Strix Point "1151" # Strix Halo # "12-generic" "1200" # RX 9060 diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix index cf9e9815eb83..bfc84389b260 100644 --- a/pkgs/development/rocm-modules/default.nix +++ b/pkgs/development/rocm-modules/default.nix @@ -333,6 +333,7 @@ outer "gfx1100" "gfx1101" "gfx1102" + "gfx1150" "gfx1151" ]; gfx12 = scopeForArches [ diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index f6e18d27056d..e139079eb95e 100644 --- a/pkgs/development/rocm-modules/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -43,7 +43,7 @@ let "gfx950" "gfx1100" "gfx1101" - # 7.x "gfx1150" + "gfx1150" "gfx1151" "gfx1200" "gfx1201" diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index 4653c009739b..bf19c63e8dfe 100644 --- a/pkgs/development/rocm-modules/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -27,6 +27,7 @@ "gfx1100" "gfx1101" "gfx1102" + "gfx1150" "gfx1151" "gfx1200" "gfx1201" From 6713c5e487e948febd0057fd401f5b87c46af7da Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 20 Jan 2026 13:05:00 -0800 Subject: [PATCH 3/4] rocmPackages.rocm-runtime: apply fix for segfault when queue allocation fails Found by @06kellyjac, possibly triggered by bug in linux-6.18.4 https://lore.kernel.org/linux-iommu/870872aa-28e9-412a-bac6-8020bf560e4f@amd.com/t/ Resolving this *will not fix the underlying issue*, but does transmute a segfault into an actual error result. ROCm error: out of memory current device: 0, in function stream at /build/source/ggml/src/ggml-hip/../ggml-cuda/common.cuh:1345 hipStreamCreateWithFlags(&streams[device][stream], 0x01) --- .../rocm-modules/rocm-runtime/default.nix | 3 + .../rocm-runtime/queue-failure.patch | 71 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 73d83211b15b..5e82f2550cb7 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ + # Vendored upstream PR for fix for segfault when queue allocation fails + # https://github.com/ROCm/rocm-systems/pull/2850 + ./queue-failure.patch (fetchpatch { # [PATCH] rocr: Extend HIP ISA compatibility check sha256 = "sha256-8r2Lb5lBfFaZC3knCxfXGcnkzNv6JxOKyJn2rD5gus4="; diff --git a/pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch b/pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch new file mode 100644 index 000000000000..f9087144bc22 --- /dev/null +++ b/pkgs/development/rocm-modules/rocm-runtime/queue-failure.patch @@ -0,0 +1,71 @@ +From b7717446c85d08b2d7c0c60ba3ac0eff11ee6120 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Tue, 20 Jan 2026 12:55:45 -0800 +Subject: [PATCH 1/2] rocm-runtime: fix crash in QueueCreate due to trying to + free non allocated scratch + +if (scratch.main_queue_base != nullptr) before calling ReleaseQueueMainScratch +because ReleaseQueueMainScratch is only valid if main_queue_base is set +and the scope guard can fire for an error allocating the queue. +--- + .../runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp +index 01b01fe869..83db40dacc 100644 +--- a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp ++++ b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp +@@ -1792,7 +1792,9 @@ hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type, u + scratch.main_queue_base = nullptr; + scratch.main_queue_process_offset = 0; + +- MAKE_NAMED_SCOPE_GUARD(scratchGuard, [&]() { ReleaseQueueMainScratch(scratch); }); ++ MAKE_NAMED_SCOPE_GUARD(scratchGuard, [&]() { ++ if (scratch.main_queue_base != nullptr) ReleaseQueueMainScratch(scratch); ++ }); + + if (scratch.main_size != 0) { + AcquireQueueMainScratch(scratch); +-- +2.52.0 + + +From 9c1746cd76a703e4d2321dc2ffe85fc61bfd2f21 Mon Sep 17 00:00:00 2001 +From: Luna Nova +Date: Tue, 20 Jan 2026 13:00:32 -0800 +Subject: [PATCH 2/2] rocm-runtime: log for errors in QueueCreate + +--- + .../runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp +index 83db40dacc..ae68732eb5 100644 +--- a/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp ++++ b/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp +@@ -1799,6 +1799,9 @@ hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type, u + if (scratch.main_size != 0) { + AcquireQueueMainScratch(scratch); + if (scratch.main_queue_base == nullptr) { ++ LogPrint(HSA_AMD_LOG_FLAG_INFO, ++ "Failed to allocate scratch memory for queue, size=%zu, node=%u", ++ scratch.main_size, node_id()); + return HSA_STATUS_ERROR_OUT_OF_RESOURCES; + } + } +@@ -1827,7 +1830,11 @@ hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type, u + node_id())); + } + +- if (!shared_queue) return HSA_STATUS_ERROR_OUT_OF_RESOURCES; ++ if (!shared_queue) { ++ LogPrint(HSA_AMD_LOG_FLAG_INFO, ++ "Failed to allocate shared queue descriptor memory, node=%u", node_id()); ++ return HSA_STATUS_ERROR_OUT_OF_RESOURCES; ++ } + + auto aql_queue = new AqlQueue(shared_queue, this, size, node_id(), scratch, event_callback, data, + flags); +-- +2.52.0 + From 12c0d4c888d928cff3fb601c507c86df192901d0 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 24 Jan 2026 16:16:44 -0800 Subject: [PATCH 4/4] rocmPackages.amdsmi: fix error: redefinition of 'struct drm_color_ctm_3x4' --- .../rocm-modules/amdsmi/default.nix | 6 ++++ .../amdsmi/drm-struct-redefinition-fix.patch | 35 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index 57b095812d26..af24c68b8fd2 100644 --- a/pkgs/development/rocm-modules/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation (finalAttrs: { cp ./include/amd_smi/impl/amd_hsmp.h ./esmi_ib_library/include/asm/amd_hsmp.h ''; + patches = [ + # Fix error: redefinition of 'struct drm_color_ctm_3x4' + # https://github.com/ROCm/amdsmi/pull/165 + ./drm-struct-redefinition-fix.patch + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch b/pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch new file mode 100644 index 000000000000..caf23edcef57 --- /dev/null +++ b/pkgs/development/rocm-modules/amdsmi/drm-struct-redefinition-fix.patch @@ -0,0 +1,35 @@ +From b8b4a6bcfe35ba9539a120cfd16573123ddd9241 Mon Sep 17 00:00:00 2001 +From: "Sv. Lockal" +Date: Mon, 15 Dec 2025 03:46:35 +0800 +Subject: [PATCH] Fix compilation with libdrm-2.4.130 + +Fix error: redefinition of 'struct drm_color_ctm_3x4'. + +drm_color_ctm_3x4 structure is now defined in https://github.com/torvalds/linux/commit/e5719e7f19009d4fbedf685fc22eec9cd8de154f#diff-4c51fb416ec7cc69566cd7b795ee57eb070aa1006ad65d6962081f039ffb2718 + +As this structure is unused and not a part of amdsmi public interface, +it is safe to remove it. +--- + include/amd_smi/impl/amdgpu_drm.h | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/include/amd_smi/impl/amdgpu_drm.h b/include/amd_smi/impl/amdgpu_drm.h +index b56a5ac4b..0e483d13b 100644 +--- a/include/amd_smi/impl/amdgpu_drm.h ++++ b/include/amd_smi/impl/amdgpu_drm.h +@@ -1625,15 +1625,6 @@ struct drm_amdgpu_info_uq_metadata { + #define AMDGPU_FAMILY_GC_11_5_0 150 /* GC 11.5.0 */ + #define AMDGPU_FAMILY_GC_12_0_0 152 /* GC 12.0.0 */ + +-/* FIXME wrong namespace! */ +-struct drm_color_ctm_3x4 { +- /* +- * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude +- * (not two's complement!) format. +- */ +- __u64 matrix[12]; +-}; +- + #if defined(__cplusplus) + } + #endif