From d884cb11aba1365279f9cc6d4a66698611503750 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 17 Dec 2023 05:14:01 -0600 Subject: [PATCH 1/4] rocm-docs-core: add note to move to 'rocmPackages_common' later --- pkgs/development/rocm-modules/5/rocm-docs-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix index 220e89fe71d2..e980c9509a08 100644 --- a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix @@ -20,6 +20,7 @@ , fastjsonschema }: +# FIXME: Move to rocmPackages_common buildPythonPackage rec { pname = "rocm-docs-core"; version = "0.26.0"; From 1f3ddf0a271ca0d3863785ca010379f3f5ec351c Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 17 Dec 2023 05:15:23 -0600 Subject: [PATCH 2/4] rocmPackages_5: mark broken if at least version '6.0.0' This is mainly to prevent automatic update scripts from updating and to prevent accidental breaking merges. Any further upgrades should go into 'rocmPackages_6'. --- pkgs/development/rocm-modules/5/clang-ocl/default.nix | 2 +- pkgs/development/rocm-modules/5/clr/default.nix | 2 +- pkgs/development/rocm-modules/5/composable_kernel/default.nix | 2 +- pkgs/development/rocm-modules/5/half/default.nix | 2 +- pkgs/development/rocm-modules/5/hip-common/default.nix | 2 +- pkgs/development/rocm-modules/5/hipblas/default.nix | 2 +- pkgs/development/rocm-modules/5/hipcc/default.nix | 2 +- pkgs/development/rocm-modules/5/hipcub/default.nix | 2 +- pkgs/development/rocm-modules/5/hipfft/default.nix | 2 +- pkgs/development/rocm-modules/5/hipfort/default.nix | 2 +- pkgs/development/rocm-modules/5/hipify/default.nix | 2 +- pkgs/development/rocm-modules/5/hipsolver/default.nix | 2 +- pkgs/development/rocm-modules/5/hipsparse/default.nix | 2 +- .../rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix | 2 +- pkgs/development/rocm-modules/5/llvm/base.nix | 2 +- pkgs/development/rocm-modules/5/migraphx/default.nix | 2 +- pkgs/development/rocm-modules/5/miopen/default.nix | 2 +- pkgs/development/rocm-modules/5/miopengemm/default.nix | 2 +- pkgs/development/rocm-modules/5/mivisionx/default.nix | 2 +- pkgs/development/rocm-modules/5/rccl/default.nix | 2 +- pkgs/development/rocm-modules/5/rdc/default.nix | 2 +- pkgs/development/rocm-modules/5/rocalution/default.nix | 2 +- pkgs/development/rocm-modules/5/rocblas/default.nix | 2 +- pkgs/development/rocm-modules/5/rocdbgapi/default.nix | 2 +- pkgs/development/rocm-modules/5/rocfft/default.nix | 2 +- pkgs/development/rocm-modules/5/rocgdb/default.nix | 1 + pkgs/development/rocm-modules/5/rocm-cmake/default.nix | 2 +- pkgs/development/rocm-modules/5/rocm-comgr/default.nix | 2 +- pkgs/development/rocm-modules/5/rocm-core/default.nix | 2 +- pkgs/development/rocm-modules/5/rocm-device-libs/default.nix | 2 +- pkgs/development/rocm-modules/5/rocm-runtime/default.nix | 2 +- pkgs/development/rocm-modules/5/rocm-smi/default.nix | 2 +- pkgs/development/rocm-modules/5/rocm-thunk/default.nix | 2 +- pkgs/development/rocm-modules/5/rocminfo/default.nix | 2 +- pkgs/development/rocm-modules/5/rocmlir/default.nix | 2 +- pkgs/development/rocm-modules/5/rocprim/default.nix | 2 +- pkgs/development/rocm-modules/5/rocprofiler/default.nix | 2 +- pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix | 2 +- pkgs/development/rocm-modules/5/rocrand/default.nix | 2 +- pkgs/development/rocm-modules/5/rocsolver/default.nix | 2 +- pkgs/development/rocm-modules/5/rocsparse/default.nix | 2 +- pkgs/development/rocm-modules/5/rocthrust/default.nix | 2 +- pkgs/development/rocm-modules/5/roctracer/default.nix | 2 +- pkgs/development/rocm-modules/5/rocwmma/default.nix | 2 +- pkgs/development/rocm-modules/5/rpp/default.nix | 2 +- pkgs/development/rocm-modules/5/tensile/default.nix | 2 +- 46 files changed, 46 insertions(+), 45 deletions(-) diff --git a/pkgs/development/rocm-modules/5/clang-ocl/default.nix b/pkgs/development/rocm-modules/5/clang-ocl/default.nix index 7af83bd2e132..fd5180104d12 100644 --- a/pkgs/development/rocm-modules/5/clang-ocl/default.nix +++ b/pkgs/development/rocm-modules/5/clang-ocl/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix index f12ef2bfc8b5..c1a45b5cab4f 100644 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ b/pkgs/development/rocm-modules/5/clr/default.nix @@ -165,6 +165,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/composable_kernel/default.nix b/pkgs/development/rocm-modules/5/composable_kernel/default.nix index 75039fc7d417..a14988eea103 100644 --- a/pkgs/development/rocm-modules/5/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/5/composable_kernel/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/half/default.nix b/pkgs/development/rocm-modules/5/half/default.nix index 1ddd06b01449..a18bb9e058bb 100644 --- a/pkgs/development/rocm-modules/5/half/default.nix +++ b/pkgs/development/rocm-modules/5/half/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.unix; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hip-common/default.nix b/pkgs/development/rocm-modules/5/hip-common/default.nix index 6e2f950c0193..837eeaad02fa 100644 --- a/pkgs/development/rocm-modules/5/hip-common/default.nix +++ b/pkgs/development/rocm-modules/5/hip-common/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipblas/default.nix b/pkgs/development/rocm-modules/5/hipblas/default.nix index c604dda46593..e46cae87717d 100644 --- a/pkgs/development/rocm-modules/5/hipblas/default.nix +++ b/pkgs/development/rocm-modules/5/hipblas/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipcc/default.nix b/pkgs/development/rocm-modules/5/hipcc/default.nix index 20c428bbf809..77f735ac7f17 100644 --- a/pkgs/development/rocm-modules/5/hipcc/default.nix +++ b/pkgs/development/rocm-modules/5/hipcc/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipcub/default.nix b/pkgs/development/rocm-modules/5/hipcub/default.nix index 943a14c379a1..652e6b7820dd 100644 --- a/pkgs/development/rocm-modules/5/hipcub/default.nix +++ b/pkgs/development/rocm-modules/5/hipcub/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipfft/default.nix b/pkgs/development/rocm-modules/5/hipfft/default.nix index b0c5928a192d..a31da337e23c 100644 --- a/pkgs/development/rocm-modules/5/hipfft/default.nix +++ b/pkgs/development/rocm-modules/5/hipfft/default.nix @@ -105,6 +105,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipfort/default.nix b/pkgs/development/rocm-modules/5/hipfort/default.nix index 4b6c7c56af41..5083dddc6c9e 100644 --- a/pkgs/development/rocm-modules/5/hipfort/default.nix +++ b/pkgs/development/rocm-modules/5/hipfort/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipify/default.nix b/pkgs/development/rocm-modules/5/hipify/default.nix index e553c0e385a5..1029ee5426ed 100644 --- a/pkgs/development/rocm-modules/5/hipify/default.nix +++ b/pkgs/development/rocm-modules/5/hipify/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipsolver/default.nix b/pkgs/development/rocm-modules/5/hipsolver/default.nix index 9c5c1cad2207..dc6c5d49a41a 100644 --- a/pkgs/development/rocm-modules/5/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/5/hipsolver/default.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipsparse/default.nix b/pkgs/development/rocm-modules/5/hipsparse/default.nix index 0e77079348b3..6f5ca6e01ee4 100644 --- a/pkgs/development/rocm-modules/5/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/5/hipsparse/default.nix @@ -131,6 +131,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix index 8bd479c5c245..c007f2c62260 100644 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix +++ b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ unfree ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index 82de9e6f3665..c126987cb823 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -162,6 +162,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ ncsa ] ++ extraLicenses; maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = isBroken; + broken = isBroken || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/migraphx/default.nix b/pkgs/development/rocm-modules/5/migraphx/default.nix index 3283ffc10cd5..0682ce43de9b 100644 --- a/pkgs/development/rocm-modules/5/migraphx/default.nix +++ b/pkgs/development/rocm-modules/5/migraphx/default.nix @@ -166,6 +166,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/miopen/default.nix b/pkgs/development/rocm-modules/5/miopen/default.nix index 4a0cf92188a7..355a111b911e 100644 --- a/pkgs/development/rocm-modules/5/miopen/default.nix +++ b/pkgs/development/rocm-modules/5/miopen/default.nix @@ -234,6 +234,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix index f56e42da59d2..4bee5856739e 100644 --- a/pkgs/development/rocm-modules/5/miopengemm/default.nix +++ b/pkgs/development/rocm-modules/5/miopengemm/default.nix @@ -120,6 +120,6 @@ in stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; # They are not making tags or releases, this may break other derivations in the future # Use version major instead of minor, 6.0 will HOPEFULLY have a release or tag - broken = versions.major finalAttrs.version != versions.major stdenv.cc.version; + broken = versions.major finalAttrs.version != versions.major stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix index 7eac2a4ca497..8ade10bab976 100644 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -140,6 +140,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rccl/default.nix b/pkgs/development/rocm-modules/5/rccl/default.nix index 3f011d3fdfac..b816dbad4e0a 100644 --- a/pkgs/development/rocm-modules/5/rccl/default.nix +++ b/pkgs/development/rocm-modules/5/rccl/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ bsd2 bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rdc/default.nix b/pkgs/development/rocm-modules/5/rdc/default.nix index 8b447454fc4b..af6277700ebd 100644 --- a/pkgs/development/rocm-modules/5/rdc/default.nix +++ b/pkgs/development/rocm-modules/5/rdc/default.nix @@ -119,7 +119,7 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - # broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version; + # broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version || versionAtLeast finalAttrs.version "6.0.0"; broken = true; # Too many errors, unsure how to fix }; }) diff --git a/pkgs/development/rocm-modules/5/rocalution/default.nix b/pkgs/development/rocm-modules/5/rocalution/default.nix index 2a0e149bb3e9..d2363806462e 100644 --- a/pkgs/development/rocm-modules/5/rocalution/default.nix +++ b/pkgs/development/rocm-modules/5/rocalution/default.nix @@ -110,6 +110,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index ca6a9e6e723a..2d66a8bd05ec 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -204,6 +204,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix index dbc3f647815c..c89125095831 100644 --- a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix @@ -106,6 +106,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocfft/default.nix b/pkgs/development/rocm-modules/5/rocfft/default.nix index 309a7f2fe224..d8d6305dbbaa 100644 --- a/pkgs/development/rocm-modules/5/rocfft/default.nix +++ b/pkgs/development/rocm-modules/5/rocfft/default.nix @@ -164,6 +164,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocgdb/default.nix b/pkgs/development/rocm-modules/5/rocgdb/default.nix index facec0cf16d3..f4a82c7e25dd 100644 --- a/pkgs/development/rocm-modules/5/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/5/rocgdb/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ gpl2 gpl3 bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; + broken = versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix index d88912154f8b..e6027e52eeda 100644 --- a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = teams.rocm.members; platforms = platforms.unix; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index 8411c4d53cb3..15edae6a4f74 100644 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-core/default.nix b/pkgs/development/rocm-modules/5/rocm-core/default.nix index a29575168b45..d97f2a5d01d9 100644 --- a/pkgs/development/rocm-modules/5/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-core/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index 844f38a9a4b2..8d6c12b70973 100644 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -45,6 +45,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index 79174c7032f0..c12540bd246b 100644 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ ncsa ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-smi/default.nix b/pkgs/development/rocm-modules/5/rocm-smi/default.nix index 66c1c765c13f..6c9b9b3f91e1 100644 --- a/pkgs/development/rocm-modules/5/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-smi/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix index 98fbc56517f9..4ce5d7984b26 100644 --- a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ bsd2 mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix index c80dbc4aeacf..f41d568f0e6c 100644 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix index 74fe00e781cc..8730ddf2e829 100644 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -125,6 +125,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocprim/default.nix b/pkgs/development/rocm-modules/5/rocprim/default.nix index 10d1f187ba73..0c8ba2d8316a 100644 --- a/pkgs/development/rocm-modules/5/rocprim/default.nix +++ b/pkgs/development/rocm-modules/5/rocprim/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index c66c56a64eb8..87cee97d1f6a 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -131,6 +131,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor clr.version; + broken = versions.minor finalAttrs.version != versions.minor clr.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix index 6dd0ec45b3b6..c008cc087f2a 100644 --- a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ ncsa ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocrand/default.nix b/pkgs/development/rocm-modules/5/rocrand/default.nix index d61b95394cab..fb233f56a5a1 100644 --- a/pkgs/development/rocm-modules/5/rocrand/default.nix +++ b/pkgs/development/rocm-modules/5/rocrand/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocsolver/default.nix b/pkgs/development/rocm-modules/5/rocsolver/default.nix index ade9c69e534e..5d837afe5df3 100644 --- a/pkgs/development/rocm-modules/5/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/5/rocsolver/default.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; timeout = 14400; # 4 hours maxSilent = 14400; # 4 hours - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocsparse/default.nix b/pkgs/development/rocm-modules/5/rocsparse/default.nix index e19334df1514..d2cd653f8fef 100644 --- a/pkgs/development/rocm-modules/5/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/5/rocsparse/default.nix @@ -144,6 +144,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocthrust/default.nix b/pkgs/development/rocm-modules/5/rocthrust/default.nix index 4fe2e0828a16..cc2f9cd5a449 100644 --- a/pkgs/development/rocm-modules/5/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/5/rocthrust/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/roctracer/default.nix b/pkgs/development/rocm-modules/5/roctracer/default.nix index 7be3ea0f7505..453fdbb10017 100644 --- a/pkgs/development/rocm-modules/5/roctracer/default.nix +++ b/pkgs/development/rocm-modules/5/roctracer/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor clr.version; + broken = versions.minor finalAttrs.version != versions.minor clr.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocwmma/default.nix b/pkgs/development/rocm-modules/5/rocwmma/default.nix index e982e036c477..a7e8cd101df3 100644 --- a/pkgs/development/rocm-modules/5/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/5/rocwmma/default.nix @@ -100,6 +100,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rpp/default.nix b/pkgs/development/rocm-modules/5/rpp/default.nix index a9456587ff3b..21c915072824 100644 --- a/pkgs/development/rocm-modules/5/rpp/default.nix +++ b/pkgs/development/rocm-modules/5/rpp/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix index fa111c056c5c..2a0b0207f764 100644 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ b/pkgs/development/rocm-modules/5/tensile/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor version != versions.minor stdenv.cc.version; + broken = versions.minor version != versions.minor stdenv.cc.version || versionAtLeast version "6.0.0"; }; } From b00586cb2611a9fad32eb1e716dda41e3e4ae586 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 17 Dec 2023 05:41:00 -0600 Subject: [PATCH 3/4] rocmPackages_5: GitHub repo owner has generally changed to 'ROCm' 'RadeonOpenCompute', 'ROCm-Developer-Tools', 'ROCmSoftwarePlatform', 'GPUOpen-ProfessionalCompute-Libraries' -> 'ROCm' --- .../rocm-modules/5/clang-ocl/default.nix | 4 ++-- pkgs/development/rocm-modules/5/clr/default.nix | 8 ++++---- .../rocm-modules/5/composable_kernel/default.nix | 4 ++-- pkgs/development/rocm-modules/5/default.nix | 15 ++++++--------- pkgs/development/rocm-modules/5/half/default.nix | 4 ++-- .../rocm-modules/5/hip-common/default.nix | 4 ++-- .../rocm-modules/5/hipblas/default.nix | 4 ++-- pkgs/development/rocm-modules/5/hipcc/default.nix | 4 ++-- .../development/rocm-modules/5/hipcub/default.nix | 4 ++-- .../development/rocm-modules/5/hipfft/default.nix | 4 ++-- .../rocm-modules/5/hipfort/default.nix | 4 ++-- .../development/rocm-modules/5/hipify/default.nix | 4 ++-- .../rocm-modules/5/hipsolver/default.nix | 4 ++-- .../rocm-modules/5/hipsparse/default.nix | 4 ++-- pkgs/development/rocm-modules/5/llvm/base.nix | 4 ++-- .../rocm-modules/5/llvm/stage-1/llvm.nix | 2 +- .../rocm-modules/5/llvm/stage-3/mlir.nix | 2 +- .../rocm-modules/5/migraphx/default.nix | 6 +++--- .../development/rocm-modules/5/miopen/default.nix | 8 ++++---- .../rocm-modules/5/miopengemm/default.nix | 1 + .../rocm-modules/5/mivisionx/default.nix | 4 ++-- pkgs/development/rocm-modules/5/rccl/default.nix | 4 ++-- pkgs/development/rocm-modules/5/rdc/default.nix | 4 ++-- .../rocm-modules/5/rocalution/default.nix | 4 ++-- .../rocm-modules/5/rocblas/default.nix | 4 ++-- .../rocm-modules/5/rocdbgapi/default.nix | 4 ++-- .../development/rocm-modules/5/rocfft/default.nix | 4 ++-- .../development/rocm-modules/5/rocgdb/default.nix | 4 ++-- .../rocm-modules/5/rocm-cmake/default.nix | 4 ++-- .../rocm-modules/5/rocm-comgr/default.nix | 4 ++-- .../rocm-modules/5/rocm-core/default.nix | 4 ++-- .../rocm-modules/5/rocm-device-libs/default.nix | 4 ++-- .../rocm-modules/5/rocm-runtime/default.nix | 6 +++--- .../rocm-modules/5/rocm-smi/default.nix | 4 ++-- .../rocm-modules/5/rocm-thunk/default.nix | 4 ++-- .../rocm-modules/5/rocminfo/default.nix | 4 ++-- .../rocm-modules/5/rocmlir/default.nix | 4 ++-- .../rocm-modules/5/rocprim/default.nix | 4 ++-- .../rocm-modules/5/rocprofiler/default.nix | 4 ++-- .../rocm-modules/5/rocr-debug-agent/default.nix | 4 ++-- .../rocm-modules/5/rocrand/default.nix | 4 ++-- .../rocm-modules/5/rocsolver/default.nix | 4 ++-- .../rocm-modules/5/rocsparse/default.nix | 4 ++-- .../rocm-modules/5/rocthrust/default.nix | 4 ++-- .../rocm-modules/5/roctracer/default.nix | 4 ++-- .../rocm-modules/5/rocwmma/default.nix | 4 ++-- pkgs/development/rocm-modules/5/rpp/default.nix | 4 ++-- .../rocm-modules/5/tensile/default.nix | 4 ++-- 48 files changed, 103 insertions(+), 105 deletions(-) diff --git a/pkgs/development/rocm-modules/5/clang-ocl/default.nix b/pkgs/development/rocm-modules/5/clang-ocl/default.nix index fd5180104d12..c29223dd8c7f 100644 --- a/pkgs/development/rocm-modules/5/clang-ocl/default.nix +++ b/pkgs/development/rocm-modules/5/clang-ocl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "clang-ocl"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0="; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "OpenCL compilation with clang compiler"; - homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; + homepage = "https://github.com/ROCm/clang-ocl"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix index c1a45b5cab4f..1a72a8d7c3fb 100644 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ b/pkgs/development/rocm-modules/5/clr/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-1gZJhvBbUFdKH9p/7SRfzEV/fM+gIN2Qvlxf2VbmAIw="; @@ -82,7 +82,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DROCM_PATH=${rocminfo}" # Temporarily set variables to work around upstream CMakeLists issue - # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed + # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" @@ -122,7 +122,7 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { # All known and valid general GPU targets # We cannot use this for each ROCm library, as each defines their own supported targets - # See: https://github.com/RadeonOpenCompute/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix + # See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix gpuTargets = lib.forEach [ "803" "900" @@ -161,7 +161,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "AMD Common Language Runtime for hipamd, opencl, and rocclr"; - homepage = "https://github.com/ROCm-Developer-Tools/clr"; + homepage = "https://github.com/ROCm/clr"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/composable_kernel/default.nix b/pkgs/development/rocm-modules/5/composable_kernel/default.nix index a14988eea103..78416b77a07b 100644 --- a/pkgs/development/rocm-modules/5/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/5/composable_kernel/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "composable_kernel"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-Z9X+S2SijGJ8bhr9ghkkWicBUzLzs9fxPpqZxX6BBM4="; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Performance portable programming model for machine learning tensor operators"; - homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; + homepage = "https://github.com/ROCm/composable_kernel"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index d5f1c2678c4e..204e0ee2abbe 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -15,7 +15,7 @@ let rocmUpdateScript = callPackage ./update.nix { }; in rec { - ## RadeonOpenCompute ## + ## ROCm ## llvm = recurseIntoAttrs (callPackage ./llvm/default.nix { inherit rocmUpdateScript rocm-device-libs rocm-runtime rocm-thunk clr; }); rocm-core = callPackage ./rocm-core { @@ -78,7 +78,6 @@ in rec { rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { }; - ## ROCm-Developer-Tools ## hip-common = callPackage ./hip-common { inherit rocmUpdateScript; stdenv = llvm.rocmClangStdenv; @@ -130,7 +129,6 @@ in rec { stdenv = llvm.rocmClangStdenv; }; - ## ROCmSoftwarePlatform ## rocprim = callPackage ./rocprim { inherit rocmUpdateScript rocm-cmake clr; stdenv = llvm.rocmClangStdenv; @@ -275,7 +273,6 @@ in rec { rocmlir = rocmlir-rock; }; - ## GPUOpen-ProfessionalCompute-Libraries ## rpp = callPackage ./rpp { inherit rocmUpdateScript rocm-cmake rocm-docs-core clr half; inherit (llvm) openmp; @@ -306,7 +303,7 @@ in rec { stdenv = llvm.rocmClangStdenv; # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice - # See: https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/issues/1051 + # See: https://github.com/ROCm/MIVisionX/issues/1051 libjpeg_turbo = libjpeg_turbo.overrideAttrs { version = "2.0.6.1"; @@ -342,8 +339,8 @@ in rec { # Emulate common ROCm meta layout # These are mainly for users. I strongly suggest NOT using these in nixpkgs derivations # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues! - # See: https://rocm.docs.amd.com/en/latest/_images/image.004.png - # See: https://rocm.docs.amd.com/en/latest/deploy/linux/os-native/package_manager_integration.html + # See: https://rocm.docs.amd.com/en/docs-5.7.1/_images/image.004.png + # See: https://rocm.docs.amd.com/en/docs-5.7.1/deploy/linux/os-native/package_manager_integration.html meta = rec { rocm-developer-tools = symlinkJoin { name = "rocm-developer-tools-meta"; @@ -438,7 +435,7 @@ in rec { rocm-core llvm.clang llvm.mlir - llvm.openmp # openmp-extras-devel (https://github.com/ROCm-Developer-Tools/aomp) + llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp) rocm-language-runtime ]; }; @@ -502,7 +499,7 @@ in rec { rocm-runtime rocm-core rocm-comgr - llvm.openmp # openmp-extras-runtime (https://github.com/ROCm-Developer-Tools/aomp) + llvm.openmp # openmp-extras-runtime (https://github.com/ROCm/aomp) ]; }; diff --git a/pkgs/development/rocm-modules/5/half/default.nix b/pkgs/development/rocm-modules/5/half/default.nix index a18bb9e058bb..400ab5088598 100644 --- a/pkgs/development/rocm-modules/5/half/default.nix +++ b/pkgs/development/rocm-modules/5/half/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "half"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-82It+/wm8+umBdQYn7lz/fS69h+f0mzwPdGxoJNYUq0="; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++ library for half precision floating point arithmetics"; - homepage = "https://github.com/ROCmSoftwarePlatform/half"; + homepage = "https://github.com/ROCm/half"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.unix; diff --git a/pkgs/development/rocm-modules/5/hip-common/default.nix b/pkgs/development/rocm-modules/5/hip-common/default.nix index 837eeaad02fa..2687b587dbde 100644 --- a/pkgs/development/rocm-modules/5/hip-common/default.nix +++ b/pkgs/development/rocm-modules/5/hip-common/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-1Abit9qZCwrCVcnaFT4uMygFB9G6ovRasLmTsOsJ/Fw="; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++ Heterogeneous-Compute Interface for Portability"; - homepage = "https://github.com/ROCm-Developer-Tools/HIP"; + homepage = "https://github.com/ROCm/HIP"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipblas/default.nix b/pkgs/development/rocm-modules/5/hipblas/default.nix index e46cae87717d..a59543d653a4 100644 --- a/pkgs/development/rocm-modules/5/hipblas/default.nix +++ b/pkgs/development/rocm-modules/5/hipblas/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-abaEZN82dsoEC5gIF3/6epRDVz5ItUo6CkZsybu/G+g="; @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm BLAS marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS"; + homepage = "https://github.com/ROCm/hipBLAS"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipcc/default.nix b/pkgs/development/rocm-modules/5/hipcc/default.nix index 77f735ac7f17..63e6e4fb577d 100644 --- a/pkgs/development/rocm-modules/5/hipcc/default.nix +++ b/pkgs/development/rocm-modules/5/hipcc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "HIPCC"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-lJX6nF1V4YmK5ai7jivXlRnG3doIOf6X9CWLHVdRuVg="; @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Compiler driver utility that calls clang or nvcc"; - homepage = "https://github.com/ROCm-Developer-Tools/HIPCC"; + homepage = "https://github.com/ROCm/HIPCC"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipcub/default.nix b/pkgs/development/rocm-modules/5/hipcub/default.nix index 652e6b7820dd..ede46ccfbd57 100644 --- a/pkgs/development/rocm-modules/5/hipcub/default.nix +++ b/pkgs/development/rocm-modules/5/hipcub/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-ygBEA3NuCQ13QrSzGqyWXkx8Dy9WhR3u4syzapRTkFU="; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Thin wrapper library on top of rocPRIM or CUB"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; + homepage = "https://github.com/ROCm/hipCUB"; license = with licenses; [ bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipfft/default.nix b/pkgs/development/rocm-modules/5/hipfft/default.nix index a31da337e23c..44d1475f6877 100644 --- a/pkgs/development/rocm-modules/5/hipfft/default.nix +++ b/pkgs/development/rocm-modules/5/hipfft/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-fuYRKdlTrRMwxr3cgMeT3YniPzs4nuvF8YCzr3LLPFM="; @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "FFT marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT"; + homepage = "https://github.com/ROCm/hipFFT"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipfort/default.nix b/pkgs/development/rocm-modules/5/hipfort/default.nix index 5083dddc6c9e..092c6e758195 100644 --- a/pkgs/development/rocm-modules/5/hipfort/default.nix +++ b/pkgs/development/rocm-modules/5/hipfort/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-DRjUWhdinDKP7CZgq2SmU3lGmmodCuXvco9aEeMLSZ4="; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Fortran interfaces for ROCm libraries"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipfort"; + homepage = "https://github.com/ROCm/hipfort"; license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipify/default.nix b/pkgs/development/rocm-modules/5/hipify/default.nix index 1029ee5426ed..281ad02d5dfc 100644 --- a/pkgs/development/rocm-modules/5/hipify/default.nix +++ b/pkgs/development/rocm-modules/5/hipify/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-lCQ2VTUGmFC90Xu70/tvoeDhFaInGqLT3vC2A1UojNI="; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Convert CUDA to Portable C++ Code"; - homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY"; + homepage = "https://github.com/ROCm/HIPIFY"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipsolver/default.nix b/pkgs/development/rocm-modules/5/hipsolver/default.nix index dc6c5d49a41a..ab4b60ef2c35 100644 --- a/pkgs/development/rocm-modules/5/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/5/hipsolver/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-5b6kPj9yvXvP7f7AyHDTYRoM/EhQZvwkVCfDflFJugc="; @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm SOLVER marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipSOLVER"; + homepage = "https://github.com/ROCm/hipSOLVER"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/hipsparse/default.nix b/pkgs/development/rocm-modules/5/hipsparse/default.nix index 6f5ca6e01ee4..9e3046223173 100644 --- a/pkgs/development/rocm-modules/5/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/5/hipsparse/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-txigaOoZMI/v+EQLgGlj2O0IHfE7EpgjL0cyv49nKzo="; @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm SPARSE marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; + homepage = "https://github.com/ROCm/hipSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index c126987cb823..6174963fd998 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: { patches = extraPatches; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "llvm-project"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-0+lJnDiMntxCYbZBCSWvHOcKXexFfEzRfb49QbfOmK8="; @@ -158,7 +158,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; - homepage = "https://github.com/RadeonOpenCompute/llvm-project"; + homepage = "https://github.com/ROCm/llvm-project"; license = with licenses; [ ncsa ] ++ extraLicenses; maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix index 51959ec8bc32..6160e34c1b51 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix @@ -6,5 +6,5 @@ callPackage ../base.nix { inherit rocmUpdateScript; requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 + isBroken = stdenv.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 } diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix index 1b0bc29ea62b..6de685ea2771 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix @@ -18,7 +18,7 @@ callPackage ../base.nix rec { # Fix `DebugTranslation.cpp:139:10: error: no matching function for call to 'get'` # We patch at a different source root, so we modify the patch and include it locally - # https://github.com/RadeonOpenCompute/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch + # https://github.com/ROCm/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch extraPatches = [ ./0000-mlir-fix-debugtranslation.patch ]; extraNativeBuildInputs = [ clr ]; diff --git a/pkgs/development/rocm-modules/5/migraphx/default.nix b/pkgs/development/rocm-modules/5/migraphx/default.nix index 0682ce43de9b..006a5ca9990b 100644 --- a/pkgs/development/rocm-modules/5/migraphx/default.nix +++ b/pkgs/development/rocm-modules/5/migraphx/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-lg3pxHBpwqxBvdOQgE44YKLuumhkVF6b3Xx4+cw7jNQ="; @@ -123,7 +123,7 @@ in stdenv.mkDerivation (finalAttrs: { --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" "" # JIT library was removed from composable_kernel... - # https://github.com/ROCmSoftwarePlatform/composable_kernel/issues/782 + # https://github.com/ROCm/composable_kernel/issues/782 substituteInPlace src/targets/gpu/CMakeLists.txt \ --replace " COMPONENTS jit_library" "" \ --replace " composable_kernel::jit_library" "" \ @@ -162,7 +162,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "AMD's graph optimization engine"; - homepage = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX"; + homepage = "https://github.com/ROCm/AMDMIGraphX"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/miopen/default.nix b/pkgs/development/rocm-modules/5/miopen/default.nix index 355a111b911e..33959efa00eb 100644 --- a/pkgs/development/rocm-modules/5/miopen/default.nix +++ b/pkgs/development/rocm-modules/5/miopen/default.nix @@ -38,7 +38,7 @@ let version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "MIOpen"; rev = "rocm-${version}"; hash = "sha256-xcKmFI8HcRA9bbh6EQGElKykIQ3RJX/q5f4IxXvM1Is="; @@ -110,11 +110,11 @@ in stdenv.mkDerivation (finalAttrs: { # Find zstd and add to target. Mainly for torch. patches = [ (fetchpatch { - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch"; + url = "https://github.com/ROCm/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch"; hash = "sha256-oxa3qlIC2bzbwGxrQOZXoY/S7CpLsMrnWRB7Og0tk0M="; }) (fetchpatch { - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; + url = "https://github.com/ROCm/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs="; }) ]; @@ -230,7 +230,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Machine intelligence library for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen"; + homepage = "https://github.com/ROCm/MIOpen"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix index 4bee5856739e..342bd950b1fb 100644 --- a/pkgs/development/rocm-modules/5/miopengemm/default.nix +++ b/pkgs/development/rocm-modules/5/miopengemm/default.nix @@ -43,6 +43,7 @@ in stdenv.mkDerivation (finalAttrs: { "benchmark" ]; + # Deprecated? https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/issues/62 src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "MIOpenGEMM"; diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix index 8ade10bab976..39fd4f5b76e3 100644 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "GPUOpen-ProfessionalCompute-Libraries"; + owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; @@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications"; - homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX"; + homepage = "https://github.com/ROCm/MIVisionX"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rccl/default.nix b/pkgs/development/rocm-modules/5/rccl/default.nix index b816dbad4e0a..b80b96ac403a 100644 --- a/pkgs/development/rocm-modules/5/rccl/default.nix +++ b/pkgs/development/rocm-modules/5/rccl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-nFkou/kjGBmImorlPOZNTlCrxbfAYpDhgRveyoAufu8="; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm communication collectives library"; - homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; + homepage = "https://github.com/ROCm/rccl"; license = with licenses; [ bsd2 bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rdc/default.nix b/pkgs/development/rocm-modules/5/rdc/default.nix index af6277700ebd..3ef5a200ea1a 100644 --- a/pkgs/development/rocm-modules/5/rdc/default.nix +++ b/pkgs/development/rocm-modules/5/rdc/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-xZD/WI/LfNtKK9j6ZjuU0OTTFZz3G4atyD5mVcSsQ8A="; @@ -115,7 +115,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments"; - homepage = "https://github.com/RadeonOpenCompute/rdc"; + homepage = "https://github.com/ROCm/rdc"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocalution/default.nix b/pkgs/development/rocm-modules/5/rocalution/default.nix index d2363806462e..11f52ea1318c 100644 --- a/pkgs/development/rocm-modules/5/rocalution/default.nix +++ b/pkgs/development/rocm-modules/5/rocalution/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-+UGpFuZsC4+kmo8LWZWC2YoFJSdTukjN47e1YqW5Zu4="; @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Iterative sparse solvers for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION"; + homepage = "https://github.com/ROCm/rocALUTION"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index 2d66a8bd05ec..bd8a4ed4e35d 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-3wKnwvAra8u9xqlC05wUD+gSoBILTVJFU2cIV6xv3Lk="; @@ -200,7 +200,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "BLAS implementation for ROCm platform"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; + homepage = "https://github.com/ROCm/rocBLAS"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix index c89125095831..fd6797d0d43b 100644 --- a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-qMXvgcS61lgcylz62ErYq8fhpYIR31skQEeKUryuP1w="; @@ -102,7 +102,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Debugger support for control of execution and inspection state"; - homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi"; + homepage = "https://github.com/ROCm/ROCdbgapi"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocfft/default.nix b/pkgs/development/rocm-modules/5/rocfft/default.nix index d8d6305dbbaa..48f3264d157f 100644 --- a/pkgs/development/rocm-modules/5/rocfft/default.nix +++ b/pkgs/development/rocm-modules/5/rocfft/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-GZSi03geTT+NUztBWhGYyghLqJGsFjUQzVAKQ7d03uA="; @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "FFT implementation for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; + homepage = "https://github.com/ROCm/rocFFT"; license = with licenses; [ mit ]; maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocgdb/default.nix b/pkgs/development/rocm-modules/5/rocgdb/default.nix index f4a82c7e25dd..a02ad3f9e8f2 100644 --- a/pkgs/development/rocm-modules/5/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/5/rocgdb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-TlT7vvTrVd7P6ilVnWIG5VIrjTleFgDezK/mudBV+xE="; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm source-level debugger for Linux, based on GDB"; - homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb"; + homepage = "https://github.com/ROCm/ROCgdb"; license = with licenses; [ gpl2 gpl3 bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix index e6027e52eeda..c0d7e48ff59f 100644 --- a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-aVjzuJ4BiSfwOdjufFc5CznfnL8di5h992zl+pzD0DU="; @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; - homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; + homepage = "https://github.com/ROCm/rocm-cmake"; license = licenses.mit; maintainers = teams.rocm.members; platforms = platforms.unix; diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index 15edae6a4f74..1ef226b338c4 100644 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCm-CompilerSupport"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-QB3G0V92UTW67hD6+zSuExN1+eMT820iYSlMyZeWSFw="; @@ -46,7 +46,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; + homepage = "https://github.com/ROCm/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocm-core/default.nix b/pkgs/development/rocm-modules/5/rocm-core/default.nix index d97f2a5d01d9..c96bfeb0d295 100644 --- a/pkgs/development/rocm-modules/5/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-core/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocm-core"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-jFAHLqf/AR27Nbuq8aypWiKqApNcTgG5LWESVjVCKIg="; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Utility for getting the ROCm release version"; - homepage = "https://github.com/RadeonOpenCompute/rocm-core"; + homepage = "https://github.com/ROCm/rocm-core"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index 8d6c12b70973..28af3e960266 100644 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCm-Device-Libs"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-ARxs/yqyVoIUWliJkINzitumF+64/5u3fbB0tHB5hPU="; @@ -41,7 +41,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; + homepage = "https://github.com/ROCm/ROCm-Device-Libs"; license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index c12540bd246b..f94f49d00bd4 100644 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-D7Ahan5cxDhqPtV5iDDNys0A4FlxQ9oVRa2EeMoY5Qk="; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { --replace 'hsa/include/hsa' 'include/hsa' # We compile clang before rocm-device-libs, so patch it in afterwards - # Replace object version: https://github.com/RadeonOpenCompute/ROCR-Runtime/issues/166 (TODO: Remove on LLVM update?) + # Replace object version: https://github.com/ROCm/ROCR-Runtime/issues/166 (TODO: Remove on LLVM update?) substituteInPlace image/blit_src/CMakeLists.txt \ --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' \ --replace '-mcode-object-version=4' '-mcode-object-version=5' @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Platform runtime for ROCm"; - homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; + homepage = "https://github.com/ROCm/ROCR-Runtime"; license = with licenses; [ ncsa ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocm-smi/default.nix b/pkgs/development/rocm-modules/5/rocm-smi/default.nix index 6c9b9b3f91e1..91b730f03b37 100644 --- a/pkgs/development/rocm-modules/5/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-smi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-NZR4jBgKVfpkRNQFPmav1yCZF872LkcrPBNNcBVTLDU="; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "System management interface for AMD GPUs supported by ROCm"; - homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"; + homepage = "https://github.com/ROCm/rocm_smi_lib"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix index 4ce5d7984b26..f610f8a0d53a 100644 --- a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-jAMBks2/JaXiA45B3qvLHY8fPeFcr1GHT5Jieuduqhw="; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Radeon open compute thunk interface"; - homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; + homepage = "https://github.com/ROCm/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix index f41d568f0e6c..addbad038b94 100644 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocminfo"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; sha256 = "sha256-UzOo2qDT/uM+vdGdBM4pV5e143mfa+/6sZLBExOO26g="; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm Application for Reporting System Info"; - homepage = "https://github.com/RadeonOpenCompute/rocminfo"; + homepage = "https://github.com/ROCm/rocminfo"; license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix index 8730ddf2e829..73dbbf8f95f8 100644 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-vPi4UVljohVAfnwDVQqeOVaJPa6v8aV5uBOtqLddTtc="; @@ -121,7 +121,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "MLIR-based convolution and GEMM kernel generator"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; + homepage = "https://github.com/ROCm/rocMLIR"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocprim/default.nix b/pkgs/development/rocm-modules/5/rocprim/default.nix index 0c8ba2d8316a..398d1d5509cf 100644 --- a/pkgs/development/rocm-modules/5/rocprim/default.nix +++ b/pkgs/development/rocm-modules/5/rocprim/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-+ukFWsWv3RhS+Z6tmR4TRT8QTYEDuAEk12F9Gv1eXGU="; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm parallel primitives"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; + homepage = "https://github.com/ROCm/rocPRIM"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index 87cee97d1f6a..c544b3f226bb 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y="; @@ -127,7 +127,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Profiling with perf-counters and derived metrics"; - homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"; + homepage = "https://github.com/ROCm/rocprofiler"; license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix index c008cc087f2a..67da17304b3d 100644 --- a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-AUDbNrFtUQ5Hm+uv5KMovh7P9wXQKLyRNx9gEQFnv6Y="; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library that provides some debugging functionality for ROCr"; - homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent"; + homepage = "https://github.com/ROCm/rocr_debug_agent"; license = with licenses; [ ncsa ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocrand/default.nix b/pkgs/development/rocm-modules/5/rocrand/default.nix index fb233f56a5a1..5abdb3fafecb 100644 --- a/pkgs/development/rocm-modules/5/rocrand/default.nix +++ b/pkgs/development/rocm-modules/5/rocrand/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-VrpiHlZZQH+IOoaEDuDOfRgnMiqm1bpRIuNyrPz2SGY="; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Generate pseudo-random and quasi-random numbers"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND"; + homepage = "https://github.com/ROCm/rocRAND"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocsolver/default.nix b/pkgs/development/rocm-modules/5/rocsolver/default.nix index 5d837afe5df3..518aa798d49b 100644 --- a/pkgs/development/rocm-modules/5/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/5/rocsolver/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-qxmjm4tgpCnfJ2SqUXndk6y0MsPJUKHvjv/3Uc0smr4="; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm LAPACK implementation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER"; + homepage = "https://github.com/ROCm/rocSOLVER"; license = with licenses; [ bsd2 ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocsparse/default.nix b/pkgs/development/rocm-modules/5/rocsparse/default.nix index d2cd653f8fef..07e2018b0287 100644 --- a/pkgs/development/rocm-modules/5/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/5/rocsparse/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-30q9bqgZJUaNrkMXTAG+Z34yjsQ5DpJP+WBcCiEmF58="; @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm SPARSE implementation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; + homepage = "https://github.com/ROCm/rocSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocthrust/default.nix b/pkgs/development/rocm-modules/5/rocthrust/default.nix index cc2f9cd5a449..bd03cc11d780 100644 --- a/pkgs/development/rocm-modules/5/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/5/rocthrust/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-+bcHcA87IToTcII7N/hm81C/JiokJKj0M1yAph/x9Qc="; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm parallel algorithm library"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; + homepage = "https://github.com/ROCm/rocThrust"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/roctracer/default.nix b/pkgs/development/rocm-modules/5/roctracer/default.nix index 453fdbb10017..9270a273dcae 100644 --- a/pkgs/development/rocm-modules/5/roctracer/default.nix +++ b/pkgs/development/rocm-modules/5/roctracer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-P6QYyAjMRwFFWKF8AhbrYGe+mYVJXdbBW1or6vcobYU="; @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Tracer callback/activity library"; - homepage = "https://github.com/ROCm-Developer-Tools/roctracer"; + homepage = "https://github.com/ROCm/roctracer"; license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rocwmma/default.nix b/pkgs/development/rocm-modules/5/rocwmma/default.nix index a7e8cd101df3..f02859995bcc 100644 --- a/pkgs/development/rocm-modules/5/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/5/rocwmma/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-0otJxgVYLwvVYIWT/hjrrpuSj5jslP1dbJRt6GUOrDs="; @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Mixed precision matrix multiplication and accumulation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA"; + homepage = "https://github.com/ROCm/rocWMMA"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/rpp/default.nix b/pkgs/development/rocm-modules/5/rpp/default.nix index 21c915072824..45079c6d62cc 100644 --- a/pkgs/development/rocm-modules/5/rpp/default.nix +++ b/pkgs/development/rocm-modules/5/rpp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "GPUOpen-ProfessionalCompute-Libraries"; + owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-s6ODmxPBLpR5f8VALaW6F0p0rZSxSd2LH2+60SEfLCk="; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Comprehensive high-performance computer vision library for AMD processors"; - homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp"; + homepage = "https://github.com/ROCm/rpp"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix index 2a0b0207f764..7f1e64422668 100644 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ b/pkgs/development/rocm-modules/5/tensile/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { format = "pyproject"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "Tensile"; rev = "rocm-${version}"; hash = "sha256-CyPGiM/53duJc/oNtOsl6JSsl9uOOYm5R7O6YXaVOm4="; @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "GEMMs and tensor contractions"; - homepage = "https://github.com/ROCmSoftwarePlatform/Tensile"; + homepage = "https://github.com/ROCm/Tensile"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; From 252aec463279f4131c256bd9fde12296ec6d2e83 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 17 Dec 2023 07:07:39 -0600 Subject: [PATCH 4/4] rocmPackages_5: update script: error if version > 5 Further prevent bot-based updates --- .../rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix | 6 ++++++ pkgs/development/rocm-modules/5/update.nix | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix index 95260a79321d..bbde07ae9a98 100644 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix +++ b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix @@ -37,6 +37,12 @@ let extVersion="$(echo $deb | grep -o -P "(?<=\.....).*(?=\..*-)")" version="$(echo $extVersion | sed "s/0/./1" | sed "s/0/./1")" + IFS='.' read -a version_arr <<< "$version" + + if (( ''${version_arr[0]} > 5 )); then + echo "'rocmPackages_5.${prefix}-bin' is already at it's maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${prefix}-bin'." 1>&2 + exit 1 + fi if (( ''${#extVersion} == 5 )); then repoVersion="$version" diff --git a/pkgs/development/rocm-modules/5/update.nix b/pkgs/development/rocm-modules/5/update.nix index e20697675c11..ebf21b8f15a7 100644 --- a/pkgs/development/rocm-modules/5/update.nix +++ b/pkgs/development/rocm-modules/5/update.nix @@ -23,6 +23,11 @@ let IFS='.' read -a version_arr <<< "$version" + if (( ''${version_arr[0]} > 5 )); then + echo "'rocmPackages_5.${pname}' is already at it's maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${pname}'." 1>&2 + exit 1 + fi + if [ "''${#version_arr[*]}" == 2 ]; then version="''${version}.0" fi