From 6cff6c67472eceab8aba80db6a9c5ae486505213 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 29 Aug 2025 15:06:32 -0700 Subject: [PATCH 1/6] rocmPackages.rocminfo: set meta.mainProgram --- pkgs/development/rocm-modules/6/rocminfo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix index 19d1f76dbbc6..3d8ad3c99043 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "ROCm Application for Reporting System Info"; homepage = "https://github.com/ROCm/rocminfo"; license = licenses.ncsa; + mainProgram = "rocminfo"; maintainers = with maintainers; [ lovesegfault ]; teams = [ teams.rocm ]; platforms = platforms.linux; From ba31436010ce6857ed3b7cc1e77a38f842cb56a5 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 29 Aug 2025 15:28:44 -0700 Subject: [PATCH 2/6] rocmPackages.composable_kernel: provide python3 for build scripts --- pkgs/development/rocm-modules/6/composable_kernel/base.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/6/composable_kernel/base.nix index 251efb63946d..6856b3378576 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/base.nix @@ -8,6 +8,7 @@ rocm-merged-llvm, clr, rocminfo, + python3, hipify, gitMinimal, gtest, @@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { clr hipify zstd + python3 ]; buildInputs = [ From df73da3a3a3115611ee5a9c73b24dde6ca4c7be5 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 30 Aug 2025 18:50:05 -0700 Subject: [PATCH 3/6] rocmPackages.rccl: provide python3 for build scripts --- pkgs/development/rocm-modules/6/rccl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/6/rccl/default.nix index 4e7d32bd4bc4..b4c24708eece 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/6/rccl/default.nix @@ -11,6 +11,7 @@ mscclpp, perl, hipify, + python3, gtest, chrpath, rocprofiler, @@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { clr perl hipify + python3 autoPatchelfHook # ASAN doesn't add rpath without this ]; From 4f00be1c772616febdd3733e2f429d8beadc862c Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 31 Aug 2025 15:54:54 -0700 Subject: [PATCH 4/6] rocmPackages.hiprt: provide python3 for build scripts --- pkgs/development/rocm-modules/6/hiprt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/rocm-modules/6/hiprt/default.nix b/pkgs/development/rocm-modules/6/hiprt/default.nix index 01deca5685bd..2ba4cd5dcbfe 100644 --- a/pkgs/development/rocm-modules/6/hiprt/default.nix +++ b/pkgs/development/rocm-modules/6/hiprt/default.nix @@ -5,6 +5,7 @@ cmake, clr, gcc, + python3, }: stdenv.mkDerivation (finalAttrs: { @@ -25,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gcc # required for replacing easy-encryption binary cmake + python3 ]; buildInputs = [ From f44a98d711af6f614fe9ed8716310189ce9aaa00 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 29 Aug 2025 15:03:27 -0700 Subject: [PATCH 5/6] rocmPackages.rocminfo: don't propagate python3 Causes incorrect python version to leak into deps of rocminfo --- pkgs/development/rocm-modules/6/rocminfo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/6/rocminfo/default.nix index 3d8ad3c99043..18166bc780df 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/6/rocminfo/default.nix @@ -30,13 +30,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-fQPtO5TNbCbaZZ7VtGkkqng5QZ+FcScdh1opWr5YkLU="; }; + strictDeps = true; + nativeBuildInputs = [ cmake rocm-cmake + python3 ]; buildInputs = [ rocm-runtime ]; - propagatedBuildInputs = [ python3 ]; cmakeFlags = [ "-DROCRTST_BLD_TYPE=Release" ]; prePatch = '' From 20afe0f410d52d267a5135f11e819ea152005fd1 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 31 Aug 2025 10:18:14 -0700 Subject: [PATCH 6/6] python312Packages.torchWithRocm: unmark as broken --- pkgs/development/python-modules/torch/source/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 33ada3baab2c..56396da3f78d 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - pkgs, fetchFromGitHub, fetchFromGitLab, fetchpatch2, @@ -251,9 +250,6 @@ let "Magma cudaPackages does not match cudaPackages" = cudaSupport && (effectiveMagma.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion); - # Should be fixed by WIP https://github.com/NixOS/nixpkgs/pull/438399 - "ROCm support on non-default python versions is temporarily broken" = - rocmSupport && (pkgs.python3.version != python.version); }; unroll-src = writeShellScript "unroll-src" ''