rocmPackages: 7.2.4 -> 10.1

nixos/doc/manual/release-notes/rl-2611.section.md

@@ -632,3 +632,32 @@ The above example can be migrated via the following structured code block:
   If your environment requires strict reverse path filtering, you must now explicitly configure it with `networking.firewall.checkReversePath = "strict";`.
 
 - `services.photoprism` installations that are upgrading to version `260919-28c46a116` or later are advised to [migrate their library](https://docs.photoprism.app/user-guide/ai/face-recognition/#upgrading-an-existing-library) to take advantage of the newer face detection and embedding models. This can be done by using the `photoprism-manage` script.
+
+- `rocmPackages.rocm-bandwidth-test` has been removed; upstream retired it.
+
+- `rocmPackages` has been updated from ROCm 7.2.4 to ROCm 10.1. AMD skipped
+  the 8.x and 9.x series. ROCm 10 breaks ABI and API:
+  `amdsmi` moves to the 27.0.0 ABI (`libamd_smi.so.27`, several clock/throttle
+  APIs removed), `rocsparse` drops `rocsparse_indextype_u16`, `hipcub` removes
+  its deprecated iterators and operators, and `miopen` drops its OpenCL backend.
+  Update out-of-tree packages that compile against `rocmPackages` for these
+  changes. The ROCm LLVM toolchain is now LLVM 24.
+
+  `rocmPackages.rocmlir` has been removed: `ROCm/rocMLIR` has no ROCm 10
+  release. MIGraphX uses `rocmPackages.rocmlir-triton`, the fork that
+  AMDMIGraphX 10.1 pins. MIOpen 10.1 is built without MLIR, following
+  upstream's new default.
+
+  `rocmPackages.hipfile` is new: hipFile, ROCm's direct-to-GPU file I/O
+  library (the counterpart of cuFile). PyTorch 2.14 requires it with ROCm 7.14
+  and later, so `torch` with `rocmSupport` now builds against it.
+
+  `composable_kernel`, the `miopen` CK solvers, and `vllm` no longer support
+  `gfx900`/`gfx906` (Vega / MI25 / MI50 / Radeon VII) on ROCm 10.
+  `rocblas`/`hipblas`-only consumers such as `llama-cpp` and `ollama` still
+  build for those targets. To stay on ROCm 7.2.x, use the NixOS 26.05
+  stable channel.
+
+  The versioned `rocmPackages_10` attribute remains available. MIOpen's hipconv
+  backend is disabled because its cdna4 kernels fail to compile with the ROCm
+  LLVM 24 toolchain.

pkgs/by-name/ol/ollama/package.nix

@@ -259,13 +259,12 @@ goBuild (finalAttrs: {
       # ship without `libggml-cuda.so` and fall back to CPU at runtime.
       # The accepted values map to cmake/local.cmake's elseif chain
       # (cuda_v12 / cuda_v13 / rocm_v7_1 / rocm_v7_2 / vulkan / cuda_jetpack*).
-      rocmMajorVersion = lib.versions.major rocmPackages.clr.version;
-      rocmMinorVersion = lib.versions.minor rocmPackages.clr.version;
       llamaBackend =
         if enableCuda then
           "cuda_v${cudaMajorVersion}"
         else if enableRocm then
-          "rocm_v${rocmMajorVersion}_${rocmMinorVersion}"
+          # TODO: switch to a ROCm 10 backend once ollama has one.
+          "rocm_v7_2"
         else if enableVulkan then
           "vulkan"
         else

pkgs/by-name/op/opensplat/package.nix

@@ -3,6 +3,7 @@
   stdenv,
   cmake,
   ninja,
+  pkg-config,
   fetchFromGitHub,
   python3,
   opencv,
@@ -81,6 +82,7 @@ stdenv'.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals rocmSupport [
     rocmPackages.clr
+    pkg-config
   ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
@@ -106,7 +108,6 @@ stdenv'.mkDerivation (finalAttrs: {
     rocmPackages.hipblaslt
     rocmPackages.rocblas
     rocmPackages.rocsolver
-    rocmPackages.rocsolver
     rocmPackages.miopen
   ]
   ++ lib.optionals cudaSupport [

pkgs/development/compilers/llvm/common/openmp/default.nix

@@ -36,15 +36,28 @@ stdenv.mkDerivation (finalAttrs: {
           strictDeps = true;
           __structuredAttrs = true;
         }
-        ''
-          mkdir -p "$out"
-          cp -r ${monorepoSrc}/cmake "$out"
-          cp -r ${monorepoSrc}/openmp "$out"
-        ''
+        (
+          ''
+            mkdir -p "$out"
+            cp -r ${monorepoSrc}/cmake "$out"
+            cp -r ${monorepoSrc}/openmp "$out"
+          ''
+          + lib.optionalString (lib.versionAtLeast release_version "23") ''
+            mkdir -p "$out/llvm"
+            cp -r ${monorepoSrc}/llvm/cmake "$out/llvm"
+            cp -r ${monorepoSrc}/llvm/utils "$out/llvm"
+            cp -r ${monorepoSrc}/third-party "$out"
+            cp -r ${monorepoSrc}/runtimes "$out"
+          ''
+        )
     else
       src;
 
-  sourceRoot = "${finalAttrs.src.name}/openmp";
+  # LLVM 23 removed OpenMP's standalone build
+  # https://openmp.llvm.org/Building.html
+  sourceRoot =
+    "${finalAttrs.src.name}/"
+    + (if lib.versionAtLeast release_version "23" then "runtimes" else "openmp");
 
   outputs = [
     "out"
@@ -89,14 +102,19 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "OPT_TOOL" "${llvm}/bin/opt")
     (lib.cmakeFeature "LINK_TOOL" "${llvm}/bin/llvm-link")
   ]
+  ++ lib.optionals (lib.versionAtLeast release_version "23") [
+    (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "openmp")
+  ]
   ++ devExtraCmakeFlags;
 
   doCheck = false;
 
   checkTarget = "check-openmp";
 
   preCheck = ''
-    patchShebangs ../tools/archer/tests/deflake.bash
+    patchShebangs ${
+      if lib.versionAtLeast release_version "23" then "../../openmp" else ".."
+    }/tools/archer/tests/deflake.bash
   '';
 
   __structuredAttrs = true;

pkgs/development/python-modules/torch/source/default.nix

@@ -58,6 +58,7 @@
   openssl,
   numactl,
   llvmPackages,
+  libdrm,
 
   # dependencies
   filelock,
@@ -236,6 +237,8 @@ let
         rocprofiler-sdk
         rocprofiler-sdk.dev
         amdsmi
+        # LoadHIP requires hipfile from ROCm 7.14 on
+        hipfile
       ]
       ++ lib.optionals (!vendorComposableKernel) [
         composable_kernel
@@ -646,6 +649,7 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
   ++ lib.optionals rocmSupport [
     rocmtoolkit_joined
     rocmPackages.clr # Added separately so setup hook applies
+    libdrm
   ];
 
   dependencies = [
@@ -673,7 +677,13 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
   ];
 
   propagatedCxxBuildInputs =
-    [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
+    [ ]
+    ++ lib.optionals MPISupport [ mpi ]
+    ++ lib.optionals rocmSupport [
+      rocmtoolkit_joined
+      # cxxdev records plain store paths, so name the output with libdrm.pc
+      (lib.getDev libdrm)
+    ];
 
   # Tests take a long time and may be flaky, so just sanity-check imports
   doCheck = false;

pkgs/development/python-modules/torchcodec/default.nix

@@ -15,6 +15,7 @@
   libjpeg,
   libpng,
   libwebp,
+  libdrm,
 
   # build-system
   cmake,
@@ -113,7 +114,8 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
       libnpp # nppicc
       libnvjpeg # nvjpeg.h
     ]
-  );
+  )
+  ++ lib.optionals rocmSupport [ libdrm ];
 
   build-system = [
     cmake

pkgs/development/python-modules/vllm/default.nix

@@ -539,6 +539,8 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
       rocshmem
       rocm-smi
       hipsparselt
+      # torch's LoadHIP requires hipfile from ROCm 7.14 on
+      hipfile
     ]
   )
   ++ lib.optionals stdenv.cc.isClang [

pkgs/development/rocm-modules/amdsmi/default.nix → pkgs/development/rocm-modules/10/amdsmi/default.nix

@@ -6,62 +6,57 @@
   cmake,
   pkg-config,
   libdrm,
+  libnl,
+  libmnl,
   python,
   wrapPython,
   autoPatchelfHook,
+  binutils,
 }:
 
 let
   esmi_ib_src = fetchFromGitHub {
     owner = "amd";
     repo = "esmi_ib_library";
-    tag = "esmi_pkg_ver-4.2";
-    hash = "sha256-czF9ezkAO0PuDkXh8y639AcOZH+KVcWiXPX74H5W/nw=";
+    # The commit amdsmi pins (tag esmi_pkg_ver-5.2.1.1)
+    rev = "d494a3194ceb4cc4dbb2debf9fcbe8773c6d3bef";
+    hash = "sha256-StSYzyIujaH8UJIRpfJC0lf+oVT9fWflJgQONvRqu70=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amdsmi";
-  version = "7.2.4";
+  version = "10.1";
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-systems";
-    tag = "rocm-${finalAttrs.version}";
+    tag = "therock-${finalAttrs.version}";
     sparseCheckout = [
       "projects/amdsmi"
       "shared"
     ];
-    hash = "sha256-TFi+3txemvV6K827e8S3hZOd9jcj4Qzop6V9CdKrpLg=";
+    hash = "sha256-CmCVPmqgU0HtqIBuJUs+Nr7LRKtngOaNNsWFek9Nino=";
   };
   sourceRoot = "${finalAttrs.src.name}/projects/amdsmi";
 
   postPatch = ''
-    substituteInPlace goamdsmi_shim/CMakeLists.txt \
-      --replace-fail "amd_smi)" ${"'"}''${AMD_SMI_TARGET})' \
-      --replace-fail 'target_link_libraries(''${GOAMDSMI_SHIM_TARGET} -L' '#'
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "if(NOT latest_esmi_tag STREQUAL current_esmi_tag)" "if(OFF)"
-
-    # Manually unpack esmi_ib_src and add amd_hsmp.h so execute-process git clone doesn't run
+    # Pre-populate esmi_ib_library so CMake does not FetchContent it.
     cp -rf --no-preserve=mode ${esmi_ib_src} ./esmi_ib_library
     mkdir -p ./esmi_ib_library/include/asm
     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
     wrapPython
     autoPatchelfHook
+    binutils # CMake resolves link-lib SONAMEs via `objdump -p`
   ];
 
   buildInputs = [
     libdrm
+    libnl # pkg_check_modules libnl-3.0 + libnl-genl-3.0
+    libmnl # pkg_check_modules libmnl
   ];
 
   cmakeFlags = [
@@ -70,6 +65,15 @@ stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_INSTALL_BINDIR=bin"
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    # py-interface/CMakeLists.txt fails without a system python3 unless this is set.
+    "-DAMDSMI_SYSTEM_PYTHON_SITELIB=${placeholder "out"}/${python.sitePackages}"
+    # libamd_smi.so still exports rsmi_init, and its own call to it goes
+    # through the PLT. Once librocm_smi64 is loaded globally (torch's
+    # libtorch_hip needs it), that call binds to rocm_smi's copy, amdsmi's own
+    # state is never initialised, and enumeration returns no processors:
+    # torch.cuda.device_count() is then 0. Upstream links only the wheel's
+    # libamd_smi_python.so this way; do the same for the system library.
+    "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-Bsymbolic-functions"
   ];
 
   postInstall = ''

pkgs/development/rocm-modules/aqlprofile/default.nix → pkgs/development/rocm-modules/10/aqlprofile/default.nix

@@ -9,17 +9,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "aqlprofile";
-  version = "7.2.4";
+  version = "10.1";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-systems";
-    tag = "rocm-${finalAttrs.version}";
+    tag = "therock-${finalAttrs.version}";
     sparseCheckout = [
       "projects/aqlprofile"
       "shared"
     ];
-    hash = "sha256-74HjB5Ughu17rSRx9mfCCsPJI4TVyXnT4aU7vIbm7ak=";
+    hash = "sha256-7yeEJoyShSCwy1MTCeArYBabh5qTVm5uZL8N74rvxPA=";
   };
   sourceRoot = "${finalAttrs.src.name}/projects/aqlprofile";
 

pkgs/development/rocm-modules/clr/default.nix → pkgs/development/rocm-modules/10/clr/default.nix

@@ -70,7 +70,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clr";
-  version = "7.2.4";
+  version = "10.1";
 
   outputs = [
     "out"
@@ -83,12 +83,12 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-systems";
-    tag = "rocm-${finalAttrs.version}";
+    tag = "therock-${finalAttrs.version}";
     sparseCheckout = [
       "projects/clr"
       "shared"
     ];
-    hash = "sha256-//cQBKlSB9uSP4fBgJpI1FxnqlzyQN913CHVGa2tqv8=";
+    hash = "sha256-uK/JD5p72os15+n6Jw6aU0xELphBHdYnVu7NmXC3BA4=";
   };
   sourceRoot = "${finalAttrs.src.name}/projects/clr";
 
@@ -212,6 +212,11 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${rocminfo}/bin/* $out/bin
     ln -s ${rocm-core}/include/* $out/include/
 
+    # Installed by opencl/CMakeLists.txt; the ICD file would collide with $icd's.
+    # https://github.com/ROCm/rocm-systems/blob/therock-10.1/projects/clr/opencl/CMakeLists.txt#L124-L143
+    rm $out/etc/OpenCL/vendors/amdocl64.icd $out/etc/ld.so.conf.d/10-rocm-opencl.conf
+    rmdir $out/etc/OpenCL/vendors $out/etc/OpenCL $out/etc/ld.so.conf.d $out/etc
+
     # Replace rocm-opencl-icd functionality
     mkdir -p $icd/etc/OpenCL/vendors
     echo "$out/lib/libamdocl64.so" > $icd/etc/OpenCL/vendors/amdocl64.icd

pkgs/development/rocm-modules/composable_kernel/base.nix → pkgs/development/rocm-modules/10/composable_kernel/base.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   pname = "composable_kernel_base";
-  version = "7.2.4";
+  version = "10.1";
 
   outputs = [
     "out"
@@ -59,12 +59,12 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-libraries";
-    tag = "rocm-${finalAttrs.version}";
+    tag = "therock-${finalAttrs.version}";
     sparseCheckout = [
       projectRoot
       "shared"
     ];
-    hash = "sha256-Zs6wwPmys1kUlgDD4XzKKw273nH/Ur3HtuYxJjvjDs0=";
+    hash = "sha256-1ycnnO7ul/uFsIPAOWfg641nsx96LI/Txs79RAxaBDI=";
   };
   sourceRoot = "${finalAttrs.src.name}/${projectRoot}";