Skip to content

rocmPackages: 7.2.4 -> 10.1 - #579527

Draft
randomizedcoder wants to merge 79 commits into
NixOS:stagingfrom
randomizedcoder:rocm10/14-switch
Draft

randomizedcoder wants to merge 79 commits into
NixOS:stagingfrom
randomizedcoder:rocm10/14-switch

Conversation

@randomizedcoder

@randomizedcoder randomizedcoder commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor

Part 14/14. Part of splitting #573885 (rocmPackages: 7.2.4 -> 10.1) into smaller PRs, as asked in its review.

Changes

Testing

  • After the switch, every rocmPackages derivation (default, llvm, gfx906, gfx1102 scopes) is identical to rocmPackages_10's before it
  • No file refers to a removed path; the ROCm consumers evaluate with aliases on and off
  • Built on x86_64-linux with the default GPU targets: all 73 rocmPackages derivations plus consumers, 204 derivations in total
    • blender, btop, zluda, adaptivecpp, whisper-cpp, stable-diffusion-cpp, onnxruntime, magma, ctranslate2, ollama, llama-cpp
    • torch (Python 3.13 and 3.14), torchaudio, torchcodec, xformers, vllm, amd-aiter, bitsandbytes
  • nixpkgs-review: 85 packages built, including torchWithRocm for Python 3.13 and 3.14; one failure, opensplat (below)

Hardware smoke tests:

check gfx1102 (Radeon Pro W7500) gfx906 (MI50) ¹
rocminfo, amd-smi pass pass
hipcc vector add pass pass
import torch; torch.cuda.device_count() = 1 pass pass
fp32 / fp16 matmul (max rel err) 9.6e-7 / 4.5e-4 5.5e-7 / 4.5e-4
conv2d forward + backward (MIOpen) pass (≤ 1.6e-6) pass (≤ 1.6e-5)
torch.profiler GPU kernels pass pass
rocprofv3 --kernel-trace 7 kernels 7 kernels
import vllm pass pass
llama.cpp lists ROCm0 pass pass

¹ Run with ROCR_VISIBLE_DEVICES=0: that machine also holds a gfx803 card that HIP skips but amdsmi counts.

Known failure, not from this PR

  • opensplat has been broken on master in every variant since torch 2.14.1 (2026-10-22)
  • OpenSplat 1.1.4 builds as C++17; torch 2.14.1's headers require C++20
  • OpenSplat 1.1.5 fixes it (opensplat: 1.1.4 -> 1.1.5 #553190)
  • Its configure step passes with ROCm 10.1; compilation then stops on the C++20 check

Series

Preparatory PRs, each against master: #579509, #579510, #579511, #579512, #579513.

Part PR Contents Base
1 #579514 rocmPackages_10: init master
2 #579515 llvm (LLVM 24) #579514
3 #579516 runtime #579515
4 #579517 profiling and debugging tools, RCCL #579516
5 #579518 rocPRIM, rocRAND, rocFFT #579517
6 #579519 hipBLASLt #579518
7 #579520 Tensile and rocBLAS #579519
8 #579521 sparse, solvers, rocALUTION, rocWMMA, hipfort #579520
9 #579522 composable_kernel #579521
10 #579523 rocMLIR #579522
11 #579524 MIOpen #579523
12 #579525 MIGraphX, RPP, MIVisionX #579524
13 #579526 remaining packages #579525
▶ 14 #579527 rocmPackages: 7.2.4 -> 10.1 (the switch) (this PR) #579526

🤖 Generated with Claude Code

randomizedcoder and others added 30 commits October 24, 2026 07:57
Prepare the update script for a rocmPackages_10 set built from the
TheRock monorepos, whose sources are tagged therock-X.Y[.Z]:

- maxMajor (default 7) replaces the hard-coded major cap, so a second
  set can call it with its own cap.
- tagPrefixes (default [ "rocm" ]) selects which tag families count as
  releases. The current set keeps rocm- only, so the therock-7.x
  preview tags are not picked up.
- setName (default "rocmPackages") is the attribute path passed to
  update-source-version.
- Pick the highest matching version instead of the first release
  listed: releases are not ordered by version (a rocm-7.2.x maintenance
  release can be published after a newer series).
- Follow GitHub's pagination (100 per page) so the highest version is
  found even when it is not on the first page, and fail on fetch
  errors instead of reporting "no valid version".

No change to any derivation; passthru.updateScript only.

Assisted-by: Claude Code (claude-opus-5-5)
Add an empty rocmPackages_10 scope next to rocmPackages, sharing its
structure (rocm-modules/10/default.nix is derived from
rocm-modules/default.nix). The following PRs add the ROCm 10.1 packages
to it tier by tier; a final PR on staging switches rocmPackages over.
Following the rocmPackages_5/_6 layout.

It is deliberately not wrapped in recurseIntoAttrs, so Hydra and the CI
rebuild count are unaffected until the switch.

The update script runs with maxMajor = 10, the therock- tag prefix, and
setName = "rocmPackages_10".

Assisted-by: Claude Code (claude-opus-5-5)
Verbatim copies of the rocmPackages (ROCm 7.2.4) expressions for llvm,
rocm-device-libs, not yet part of the rocmPackages_10 scope. The
following commits update each one to ROCm 10.1, so their diffs read
against 7.2.4.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.llvm copy from the previous commit to ROCm 10.1
and add it to the rocmPackages_10 scope.

From "rocmPackages.llvm: 7.2.4 -> 10.1.0, build LLVM 24 on the
llvmPackages_23 base":

ROCm 10.1's llvm-project fork is LLVM 24 (LLVMVersion.cmake:
LLVM_VERSION_MAJOR 24), sourced from the therock-10.1 tag. nixpkgs has
no released llvmPackages_24, and the 24.0.0-git snapshot
(llvmPackages_git) is an alias reserved for testing whose package-set
splice resolves through that alias, so it cannot be evaluated with
allowAliases = false (as CI does). Keep the released llvmPackages_23 as
the base: it only supplies the shared compilers/llvm/common packaging
and the bootstrap clang/bintools, while rocmLlvmVersion = "24.0.0-rocm"
selects the LLVM 24 patch set for ROCm's own source. LTO is off, so the
base's bitcode version is moot.

Toolchain changes for the LLVM 22 -> 24 jump:
- Drop the LLVM 22 backports (select-ptr-combine, arm64e_x1 bridge,
  v64i8 VBMI shuffle, scan-build-py option): all upstream in LLVM 24.
- Drop the CompressedOffloadBundle::decompress postPatch and the
  EmissaryIds postUnpack symlink: ROCm 10.1 uses the raw_ostream*
  decompress form and removed CGEmitEmissaryExec.cpp/EmissaryIds.h
  (llvm#175265).
- Replace the GZGavinZhao GetBundleIDsInFile fetchpatch (no longer
  applies) with a locally rebased clang-add-getbundleidsinfile.diff; it
  adds the set-returning OffloadBundler::GetBundleIDsInFile the comgr
  ISA-compat patch calls.
- Drop clang-log-jobs.diff: LLVM 24 rewrote Compilation::ExecuteJobs
  around parallel offload job groups, so the patched loop no longer
  exists; it was cosmetic CI-progress logging.
- Put zstd's lib dir on the toolchain default link path: LLVM 24's
  clang-linker-wrapper links libzstd when combining compressed offload
  images (--offload-compress defaults on).
- Rebase rocm-device-libs' cmake.patch and guard rocm-comgr's
  EnvLLVMPath substitution against a null default.

Revised during the split review:

Set LIBOMP_COPY_EXPORTS to FALSE for openmp: ROCm's llvm-project
defaults it to TRUE (upstream LLVM: FALSE), which copies libomp and its
generated headers into the source tree. The generic LLVM >= 23 runtimes
build of openmp (upstream PR 575569, carried at the bottom of this
stack) then needs no writable copy of the source.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocm-device-libs copy from the previous commit
to ROCm 10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.llvm: 7.2.4 -> 10.1.0, build LLVM 24 on the
llvmPackages_23 base":

ROCm 10.1's llvm-project fork is LLVM 24 (LLVMVersion.cmake:
LLVM_VERSION_MAJOR 24), sourced from the therock-10.1 tag. nixpkgs has
no released llvmPackages_24, and the 24.0.0-git snapshot
(llvmPackages_git) is an alias reserved for testing whose package-set
splice resolves through that alias, so it cannot be evaluated with
allowAliases = false (as CI does). Keep the released llvmPackages_23 as
the base: it only supplies the shared compilers/llvm/common packaging
and the bootstrap clang/bintools, while rocmLlvmVersion = "24.0.0-rocm"
selects the LLVM 24 patch set for ROCm's own source. LTO is off, so the
base's bitcode version is moot.

Toolchain changes for the LLVM 22 -> 24 jump:
- Drop the LLVM 22 backports (select-ptr-combine, arm64e_x1 bridge,
  v64i8 VBMI shuffle, scan-build-py option): all upstream in LLVM 24.
- Drop the CompressedOffloadBundle::decompress postPatch and the
  EmissaryIds postUnpack symlink: ROCm 10.1 uses the raw_ostream*
  decompress form and removed CGEmitEmissaryExec.cpp/EmissaryIds.h
  (llvm#175265).
- Replace the GZGavinZhao GetBundleIDsInFile fetchpatch (no longer
  applies) with a locally rebased clang-add-getbundleidsinfile.diff; it
  adds the set-returning OffloadBundler::GetBundleIDsInFile the comgr
  ISA-compat patch calls.
- Drop clang-log-jobs.diff: LLVM 24 rewrote Compilation::ExecuteJobs
  around parallel offload job groups, so the patched loop no longer
  exists; it was cosmetic CI-progress logging.
- Put zstd's lib dir on the toolchain default link path: LLVM 24's
  clang-linker-wrapper links libzstd when combining compressed offload
  images (--offload-compress defaults on).
- Rebase rocm-device-libs' cmake.patch and guard rocm-comgr's
  EnvLLVMPath substitution against a null default.

Assisted-by: Claude Code (claude-opus-5-5)
Verbatim copies of the rocmPackages (ROCm 7.2.4) expressions for
rocm-core, rocm-cmake, rocprofiler-register, rocm-runtime, rocm-comgr,
rocminfo, amdsmi, rocm-smi, hip-common, roctracer, clr, hipify, half,
not yet part of the rocmPackages_10 scope. The following commits update
each one to ROCm 10.1, so their diffs read against 7.2.4.

Assisted-by: Claude Code (claude-opus-5-5)
hipcc, rocm-docs-core are unchanged between ROCm 7.2.4 and 10.1 (no 10.x
upstream release, or versioned independently of ROCm), so the
rocmPackages_10 scope calls the existing expression instead of copying
it.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocm-core copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope.

Revised during the split review:

Report the padded version (10.1.0) in the setup hook as well, the
three-part form 7.2.4 exported; ROCM_VERSION is only read from the
environment as a CPack fallback in comgr and hipcc. Keep the version
helper in the outer let.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocm-cmake copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocprofiler-register copy from the previous
commit to ROCm 10.1 and add it to the rocmPackages_10 scope.

From the mass bump:
- rocprofiler-register: drop 3 fetchpatches now upstream.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocm-runtime copy from the previous commit to
ROCm 10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.rocm-runtime: drop patches upstreamed in ROCr 1.21":

ROCm 10 ships ROCr 1.21, which carries the queue-failure fix (PR NixOS#2850),
the kfd_ioctl 1<<31 UB fix, and refactors aqlprofile to a runtime dlopen
(removing the build-time circular dependency). Drop the three
now-obsolete patches and add python3 for the new trap_handler
find_package(Python3).

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocm-comgr copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.rocm-comgr: rebase ISA-compat CCOB patch for LLVM
24":

The "[Comgr] Extend ISA compatibility for CCOB" change (GZGavinZhao
2c1e44fc) no longer applies as a fetchpatch: LLVM 24's comgr inserted
comgr-unpackage-command.h into comgr-compiler.cpp's include block
(shifting the comgr-metadata.h include past patch's default fuzz) and
moved the unbundle() body ~477 lines down. Rebase it locally as
comgr-isa-compat-ccob.patch against therock-10.1. The
OffloadBundler::GetBundleIDsInFile it calls is provided clang-side by
clang-add-getbundleidsinfile.diff in the llvm module.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocminfo copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.amdsmi copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.amdsmi: adapt to 27.0.0 ABI":

amdsmi 27.0.0 (SONAME libamd_smi.so.27) requires libnl-3/libnl-genl-3
and libmnl; add them.

py-interface/CMakeLists.txt now FATAL_ERRORs at configure time if it
cannot locate a system python3 (it probes /usr/bin/python3 and
/usr/libexec/platform-python, neither in the sandbox) unless
AMDSMI_SYSTEM_PYTHON_SITELIB is set. The install it guards is
DESTDIR-gated (nix uses CMAKE_INSTALL_PREFIX) and thus skipped anyway,
so pass nix's sitePackages to satisfy the guard.

Revised during the split review:

Drop the drm_color_ctm_3x4 patch: amdsmi 10.1 builds without it against
libdrm 2.4.134, whose drm_mode.h shares the bundled copy's include
guard. Pin esmi_ib_library by the commit amdsmi pins. Link libamd_smi.so
with -Bsymbolic-functions: with librocm_smi64 loaded (as after import
torch) its exported rsmi_init was interposed and amdsmi enumerated no
GPUs, so torch.cuda.device_count() was 0.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocm-smi copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.hip-common copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.roctracer copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.clr copy from the previous commit to ROCm 10.1
and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.hipify copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.half copy from the previous commit to ROCm 10.1
and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Verbatim copies of the rocmPackages (ROCm 7.2.4) expressions for
aqlprofile, rocprof-trace-decoder, rocdbgapi, rocgdb, rocr-debug-agent,
rocprofiler, rdc, rccl, rocprofiler-sdk, rocshmem, not yet part of the
rocmPackages_10 scope. The following commits update each one to ROCm
10.1, so their diffs read against 7.2.4.

Assisted-by: Claude Code (claude-opus-5-5)
rocprof-compute-viewer, mscclpp are unchanged between ROCm 7.2.4 and
10.1 (no 10.x upstream release, or versioned independently of ROCm), so
the rocmPackages_10 scope calls the existing expression instead of
copying it.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.aqlprofile copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope. Source/version bump only.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocprof-trace-decoder copy from the previous
commit to ROCm 10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.rocprof-trace-decoder: 0.1.7 -> 0.2.2":

Track the rocm-systems monorepo at the therock-10.1 tag (the project
keeps its own 0.x version, so the tag cannot derive from
finalAttrs.version). Drop both local patches:
use-system-dependencies.patch is obsolete (upstream removed the json
FetchContent and prefers system gtest) and fix-test-dependency.patch (PR
NixOS#3800) is merged upstream. Disable the ATT integration tests, which need
pyelftools and bundled fixtures.

From "rocmPackages.rocprof-trace-decoder: take comgr and runtime from
the scope":

It took the top-level rocmPackages and used rocmPackages.rocm-comgr and
rocmPackages.rocm-runtime, so the per-arch scopes (rocmPackages.gfx906,
...) and any other instance of the scope built it against the default
set's libraries. Take them as scope arguments like every other package.
The default rocmPackages.rocprof-trace-decoder derivation is unchanged.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocdbgapi copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.{rocdbgapi,rocr-debug-agent}: move to rocm-systems
monorepo":

ROCdbgapi and rocr_debug_agent moved into the rocm-systems monorepo in
ROCm 10. Switch both to the sparse-checkout source (projects/<name> +
shared) at the therock-10.1 tag.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocgdb copy from the previous commit to ROCm
10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.rocgdb: 7.2.4 -> 10.1.0".

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocr-debug-agent copy from the previous commit
to ROCm 10.1 and add it to the rocmPackages_10 scope.

From "rocmPackages.{rocdbgapi,rocr-debug-agent}: move to rocm-systems
monorepo":

ROCdbgapi and rocr_debug_agent moved into the rocm-systems monorepo in
ROCm 10. Switch both to the sparse-checkout source (projects/<name> +
shared) at the therock-10.1 tag.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rocprofiler copy from the previous commit to
ROCm 10.1 and add it to the rocmPackages_10 scope.

From the mass bump:
- rocprofiler-register: drop 3 fetchpatches now upstream.

Assisted-by: Claude Code (claude-opus-5-5)
Update the rocmPackages.rdc copy from the previous commit to ROCm 10.1
and add it to the rocmPackages_10 scope.

From "rocmPackages.rdc: drop CXXFLAGS patch fixed upstream in
therock-10.1":

ROCm/rocm-systems#2423 was closed without merging, but therock-10.1
fixes the same problem: projects/rdc/CMakeLists.txt now appends to
CMAKE_CXX_FLAGS instead of overwriting it. fix-cmake-cxxflags.patch no
longer applies. The libcap pkg-config patch (NixOS#2424) is still needed and
applies with offsets.

Assisted-by: Claude Code (claude-opus-5-5)
Describe the ROCm 7.2.4 -> 10.1 update: ABI/API breaks, LLVM 24, rocmlir
replaced by rocmlir-triton, the new hipfile package that torch 2.14
requires, dropped gfx900/gfx906 support in composable_kernel and
MIOpen's CK solvers, and the disabled hipconv backend.

Assisted-by: Claude Code (claude-opus-5-5)

@nixpkgs-ci nixpkgs-ci Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing to the documentation.

Follow the documentation style guide, especially:

  • Show, don’t tell. Start with a minimal working example. Explain after the code.
  • Avoid meta-commentary. Don’t write "This section explains how to…".
  • Use present tense, imperative mood, and active voice. For example: "Run the command," not "The user should run the following command."
  • Avoid vague references like "this" when the referent is unclear. Write "This command creates a folder," not "This will create a folder."
  • Be direct. Avoid "should", "might", "typically", and "usually".
  • Cut filler words like "simply", "just", "easily", and "basically". Use "to" instead of "in order to".

For larger changes, such as adding or removing whole sections, ask the NixOS documentation team for review.

@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (new) This PR adds a new package 8.has: package (update) This PR updates a package to a newer version 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. llm-assisted Contributions that include code generation with LLMs 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 8.has: documentation This PR adds or changes documentation labels Oct 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. llm-assisted Contributions that include code generation with LLMs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants