From a80fa825e617e53dae7a00e97ea6d75caea3fa11 Mon Sep 17 00:00:00 2001 From: Madoura Date: Tue, 22 Nov 2022 08:13:49 -0600 Subject: [PATCH 1/7] rocm-related: add update script rocprim: add update script hipcub: add update script rocsparse: add update script hipsparse: add update script rccl: add update script rocfft: add update script tensile: add update script rocblas: add update script miopengemm: add update script clang-ocl: add update script rocthrust: add update script rocmlir: add update script --- pkgs/development/libraries/clang-ocl/default.nix | 8 ++++++++ pkgs/development/libraries/hipcub/default.nix | 14 +++++++++++++- pkgs/development/libraries/hipsparse/default.nix | 14 +++++++++++++- pkgs/development/libraries/miopengemm/default.nix | 8 ++++++++ pkgs/development/libraries/rccl/default.nix | 14 +++++++++++++- pkgs/development/libraries/rocblas/default.nix | 14 +++++++++++++- pkgs/development/libraries/rocfft/default.nix | 14 +++++++++++++- pkgs/development/libraries/rocmlir/default.nix | 8 ++++++++ pkgs/development/libraries/rocprim/default.nix | 14 +++++++++++++- pkgs/development/libraries/rocsparse/default.nix | 14 +++++++++++++- pkgs/development/libraries/rocthrust/default.nix | 14 +++++++++++++- pkgs/development/libraries/tensile/default.nix | 14 +++++++++++++- 12 files changed, 141 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 198a2a20af1e..48ec23aa8424 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-device-libs @@ -34,6 +35,13 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_COMPILER=clang++" ]; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + rocmVersion="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version clang-ocl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "OpenCL compilation with clang compiler"; homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index facb890a3eb7..d6b322efe41f 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-runtime @@ -20,8 +21,9 @@ assert buildBenchmarks -> gbenchmark != null; # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation rec { pname = "hipcub"; + repoVersion = "2.12.0"; rocmVersion = "5.3.1"; - version = "2.12.0-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; outputs = [ "out" @@ -79,6 +81,16 @@ stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version hipcub "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version hipcub "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "Thin wrapper library on top of rocPRIM or CUB"; homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index cf3fab40cef8..8c541c4bba37 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-runtime @@ -27,8 +28,9 @@ let }; in stdenv.mkDerivation rec { pname = "hipsparse"; + repoVersion = "2.3.1"; rocmVersion = "5.3.1"; - version = "2.3.1-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; outputs = [ "out" @@ -122,6 +124,16 @@ in stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipSPARSE/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version hipsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version hipsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "ROCm SPARSE marshalling library"; homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 9330530389e9..5e23b8e05d68 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-opencl-runtime @@ -119,6 +120,13 @@ in stdenv.mkDerivation rec { mv ../doc/pdf/miopengemm.pdf $docs/share/doc/miopengemm ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpenGEMM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version miopengemm "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "OpenCL general matrix multiplication API for ROCm"; homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index 440705b2c017..664b9c6ada97 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-runtime @@ -17,8 +18,9 @@ assert buildTests -> chrpath != null; stdenv.mkDerivation rec { pname = "rccl"; + repoVersion = "2.12.10"; rocmVersion = "5.3.1"; - version = "2.12.10-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; outputs = [ "out" @@ -74,6 +76,16 @@ stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rccl/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rccl "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version rccl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "ROCm communication collectives library"; homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index fd9b895c076c..1007e33f3752 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , fetchpatch , cmake , rocm-cmake @@ -42,8 +43,9 @@ assert buildBenchmarks == false; stdenv.mkDerivation rec { pname = "rocblas"; + repoVersion = "2.45.0"; rocmVersion = "5.3.1"; - version = "2.45.0-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; @@ -126,6 +128,16 @@ stdenv.mkDerivation rec { --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocBLAS/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocblas "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version rocblas "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "BLAS implementation for ROCm platform"; homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index d2596c064010..9a4c1200641c 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-runtime @@ -26,8 +27,9 @@ assert (buildTests || buildBenchmarks) -> llvmPackages != null; stdenv.mkDerivation rec { pname = "rocfft"; + repoVersion = "1.0.18"; rocmVersion = "5.3.1"; - version = "1.0.18-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; outputs = [ "out" @@ -104,6 +106,16 @@ stdenv.mkDerivation rec { mv $out/rocfft_rtc_helper $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocFFT/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocfft "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version rocfft "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "FFT implementation for ROCm "; homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index bf4234a21503..af9b62418753 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , hip , python3 @@ -32,6 +33,13 @@ stdenv.mkDerivation rec { "-DBUILD_FAT_LIBMLIRMIOPEN=ON" ]; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocMLIR/tags?per_page=2" | jq '.[1].name | split("-") | .[1]' --raw-output)" + update-source-version rocmlir "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "MLIR-based convolution and GEMM kernel generator"; homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 97b8daf8a7b1..290c5e605e26 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-runtime @@ -18,8 +19,9 @@ assert buildBenchmarks -> gbenchmark != null; stdenv.mkDerivation rec { pname = "rocprim"; + repoVersion = "2.11.0"; rocmVersion = "5.3.1"; - version = "2.11.0-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; outputs = [ "out" @@ -75,6 +77,16 @@ stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocPRIM/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocprim "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version rocprim "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "ROCm parallel primitives"; homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index f6321d4e08a3..eb9c801d7838 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-runtime @@ -31,8 +32,9 @@ let }; in stdenv.mkDerivation rec { pname = "rocsparse"; + repoVersion = "2.3.2"; rocmVersion = "5.3.1"; - version = "2.3.2-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; outputs = [ "out" @@ -138,6 +140,16 @@ in stdenv.mkDerivation rec { rmdir $out/bin ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version rocsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "ROCm SPARSE implementation"; homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 99e582791769..fcad87e15985 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , cmake , rocm-cmake , rocm-runtime @@ -22,8 +23,9 @@ assert buildBenchmarks == false; stdenv.mkDerivation rec { pname = "rocthrust"; + repoVersion = "2.16.0"; rocmVersion = "5.3.1"; - version = "2.16.0-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; # Comment out these outputs until tests/benchmarks are fixed (upstream?) # outputs = [ @@ -81,6 +83,16 @@ stdenv.mkDerivation rec { # rmdir $out/bin # ''; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocThrust/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version rocthrust "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version rocthrust "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "ROCm parallel algorithm library"; homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix index d957ea749441..2707261d9143 100644 --- a/pkgs/development/libraries/tensile/default.nix +++ b/pkgs/development/libraries/tensile/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeScript , buildPythonPackage , pyyaml , msgpack @@ -9,8 +10,9 @@ buildPythonPackage rec { pname = "tensile"; + repoVersion = "4.34.0"; rocmVersion = "5.3.1"; - version = "4.34.0-${rocmVersion}"; + version = "${repoVersion}-${rocmVersion}"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; @@ -25,6 +27,16 @@ buildPythonPackage rec { pandas ]; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/Tensile/releases?per_page=1")" + repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)" + rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" + update-source-version tensile "$repoVersion" --ignore-same-hash --version-key=repoVersion + update-source-version tensile "$rocmVersion" --ignore-same-hash --version-key=rocmVersion + ''; + meta = with lib; { description = "GEMMs and tensor contractions"; homepage = "https://github.com/ROCmSoftwarePlatform/Tensile"; From 81da589991fd4475212e34e696f146d1894b857a Mon Sep 17 00:00:00 2001 From: Madoura Date: Tue, 22 Nov 2022 08:46:54 -0600 Subject: [PATCH 2/7] rocm-related: ignore same hash rocclr: ignore same hash rocm-comgr: ignore same hash rocm-device-libs: ignore same hash rocm-opencl-runtime: ignore same hash rocm-runtime: ignore same hash rocm-thunk: ignore same hash rocm-cmake: ignore same hash rocminfo: ignore same hash rocm-smi: ignore same hash --- pkgs/development/libraries/rocclr/default.nix | 2 +- pkgs/development/libraries/rocm-comgr/default.nix | 2 +- pkgs/development/libraries/rocm-device-libs/default.nix | 2 +- pkgs/development/libraries/rocm-opencl-runtime/default.nix | 2 +- pkgs/development/libraries/rocm-runtime/default.nix | 2 +- pkgs/development/libraries/rocm-thunk/default.nix | 2 +- pkgs/development/tools/build-managers/rocm-cmake/default.nix | 2 +- pkgs/development/tools/rocminfo/default.nix | 2 +- pkgs/tools/system/rocm-smi/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 325e7a9105fe..35f8d10ab5f1 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocclr "$version" + update-source-version rocclr "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 032584fa2599..94806d50fb5b 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-comgr "$version" + update-source-version rocm-comgr "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index d9ada30e155d..4cbb863619c9 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-device-libs "$version" + update-source-version rocm-device-libs "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index cfbcab461d18..9a02accd238e 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-opencl-runtime "$version" + update-source-version rocm-opencl-runtime "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index cc08149ce287..1aa43a49c98d 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-runtime "$version" + update-source-version rocm-runtime "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 5a7167e61671..bed5c738a2ee 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-thunk "$version" + update-source-version rocm-thunk "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 0c61324beebd..a4a2d1366802 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocm-cmake "$version" + update-source-version rocm-cmake "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index d89c90aa88d2..bb1f0de432d0 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version rocminfo "$version" + update-source-version rocminfo "$version" --ignore-same-hash ''; meta = with lib; { diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 9015f231bab0..4a59e246f697 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - update-source-version rocm-smi "$version" + update-source-version rocm-smi "$version" --ignore-same-hash ''; meta = with lib; { From 6eefaa031c52a54aff3e8a3b18dc4e2ebb075335 Mon Sep 17 00:00:00 2001 From: Madoura Date: Tue, 22 Nov 2022 14:49:36 +0000 Subject: [PATCH 3/7] =?UTF-8?q?rocm-related:=205.3.1=20=E2=86=92=205.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rocm-smi: 5.3.1 → 5.3.3 rocm-cmake: 5.3.1 → 5.3.3 rocm-thunk: 5.3.1 → 5.3.3 rocm-runtime: 5.3.1 → 5.3.3 rocm-opencl-runtime: 5.3.1 → 5.3.3 rocm-device-libs: 5.3.1 → 5.3.3 rocm-comgr: 5.3.1 → 5.3.3 rocclr: 5.3.1 → 5.3.3 rocminfo: 5.3.1 → 5.3.3 llvmPackages_rocm.llvm: 5.3.1 → 5.3.3 hip: 5.3.1 → 5.3.3 hipcub: 2.12.0-5.3.1 → 2.12.0-5.3.3 rocsparse: 2.3.2-5.3.1 → 2.3.2-5.3.3 hipsparse: 2.3.1-5.3.1 → 2.3.1-5.3.3 rccl: 2.12.10-5.3.1 → 2.12.10-5.3.3 rocfft: 1.0.18-5.3.1 → 1.0.18-5.3.3 tensile: 4.34.0-5.3.1 → 4.34.0-5.3.3 rocblas: 2.45.0-5.3.1 → 2.45.0-5.3.3 miopengemm: 5.3.1 → 5.3.3 clang-ocl: 5.3.1 → 5.3.3 rocthrust: 2.16.0-5.3.1 → 2.16.0-5.3.3 rocprim: 2.11.0-5.3.1 → 2.11.1-5.3.3 rocmlir: 5.3.1 → 5.3.3 --- pkgs/development/compilers/hip/default.nix | 4 ++-- pkgs/development/compilers/llvm/rocm/default.nix | 2 +- pkgs/development/libraries/clang-ocl/default.nix | 2 +- pkgs/development/libraries/hipcub/default.nix | 2 +- pkgs/development/libraries/hipsparse/default.nix | 2 +- pkgs/development/libraries/miopengemm/default.nix | 2 +- pkgs/development/libraries/rccl/default.nix | 2 +- pkgs/development/libraries/rocblas/default.nix | 4 ++-- pkgs/development/libraries/rocclr/default.nix | 2 +- pkgs/development/libraries/rocfft/default.nix | 2 +- pkgs/development/libraries/rocm-comgr/default.nix | 2 +- pkgs/development/libraries/rocm-device-libs/default.nix | 2 +- pkgs/development/libraries/rocm-opencl-runtime/default.nix | 2 +- pkgs/development/libraries/rocm-runtime/default.nix | 2 +- pkgs/development/libraries/rocm-thunk/default.nix | 2 +- pkgs/development/libraries/rocmlir/default.nix | 7 +++---- pkgs/development/libraries/rocprim/default.nix | 6 +++--- pkgs/development/libraries/rocsparse/default.nix | 2 +- pkgs/development/libraries/rocthrust/default.nix | 4 ++-- pkgs/development/libraries/tensile/default.nix | 4 ++-- .../tools/build-managers/rocm-cmake/default.nix | 2 +- pkgs/development/tools/rocminfo/default.nix | 2 +- pkgs/tools/system/rocm-smi/default.nix | 2 +- 23 files changed, 31 insertions(+), 32 deletions(-) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 60400f38bb7d..60420b95f139 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -30,7 +30,7 @@ let hip = stdenv.mkDerivation rec { pname = "hip"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; @@ -110,7 +110,7 @@ let in stdenv.mkDerivation rec { pname = "hip"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index cb2ed8a703db..e06ce32fc4de 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 48ec23aa8424..2b302e44dafe 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "clang-ocl"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = rocmVersion; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index d6b322efe41f..8e0dcaea504c 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -22,7 +22,7 @@ assert buildBenchmarks -> gbenchmark != null; stdenv.mkDerivation rec { pname = "hipcub"; repoVersion = "2.12.0"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; outputs = [ diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 8c541c4bba37..2cc8b62e17a7 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { pname = "hipsparse"; repoVersion = "2.3.1"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; outputs = [ diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 5e23b8e05d68..8da3b56e6870 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -38,7 +38,7 @@ let }); in stdenv.mkDerivation rec { pname = "miopengemm"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = rocmVersion; outputs = [ diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index 664b9c6ada97..ac7be2fa6631 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -19,7 +19,7 @@ assert buildTests -> chrpath != null; stdenv.mkDerivation rec { pname = "rccl"; repoVersion = "2.12.10"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; outputs = [ diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index 1007e33f3752..c50e7d8a7791 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -44,14 +44,14 @@ assert buildBenchmarks == false; stdenv.mkDerivation rec { pname = "rocblas"; repoVersion = "2.45.0"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; rev = "rocm-${rocmVersion}"; - hash = "sha256-GeeICEI1dNE6D+nUUlBtUncLkPowAa5n+bsy160EtaU="; + hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo="; }; # We currently need this patch due to faulty toolchain includes diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 35f8d10ab5f1..f53e13d1877b 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 9a4c1200641c..461fc1983a57 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -28,7 +28,7 @@ assert (buildTests || buildBenchmarks) -> llvmPackages != null; stdenv.mkDerivation rec { pname = "rocfft"; repoVersion = "1.0.18"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; outputs = [ diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 94806d50fb5b..423e7158c400 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 4cbb863619c9..6959115912e2 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 9a02accd238e..e9f107445d94 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 1aa43a49c98d..4f61efe23fac 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index bed5c738a2ee..15138211045c 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index af9b62418753..6bf5b1938c5c 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -9,14 +9,13 @@ stdenv.mkDerivation rec { pname = "rocmlir"; - rocmVersion = "5.3.1"; - # For some reason they didn't add a tag for 5.3.1, should be compatible, change to rocmVersion later - version = "5.3.0"; + rocmVersion = "5.3.3"; + version = rocmVersion; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocMLIR"; - rev = "rocm-${version}"; # change to rocmVersion later + rev = "rocm-${rocmVersion}"; hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ="; }; diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 290c5e605e26..86bf289b680e 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -19,8 +19,8 @@ assert buildBenchmarks -> gbenchmark != null; stdenv.mkDerivation rec { pname = "rocprim"; - repoVersion = "2.11.0"; - rocmVersion = "5.3.1"; + repoVersion = "2.11.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; outputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "ROCmSoftwarePlatform"; repo = "rocPRIM"; rev = "rocm-${rocmVersion}"; - hash = "sha256-aapvj9bwwlg7VJfnH1PVR8DulMcJh1xR6B4rPPGU6Q4="; + hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index eb9c801d7838..4635e92deb92 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { pname = "rocsparse"; repoVersion = "2.3.2"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; outputs = [ diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index fcad87e15985..d0a156079532 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -24,7 +24,7 @@ assert buildBenchmarks == false; stdenv.mkDerivation rec { pname = "rocthrust"; repoVersion = "2.16.0"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; # Comment out these outputs until tests/benchmarks are fixed (upstream?) @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; rev = "rocm-${rocmVersion}"; - hash = "sha256-cT0VyEVz86xR6qubAY2ncTxtCRTwXrNTWcFyf3mV+y0="; + hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix index 2707261d9143..3d7b4da5a6ba 100644 --- a/pkgs/development/libraries/tensile/default.nix +++ b/pkgs/development/libraries/tensile/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tensile"; repoVersion = "4.34.0"; - rocmVersion = "5.3.1"; + rocmVersion = "5.3.3"; version = "${repoVersion}-${rocmVersion}"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "Tensile"; rev = "rocm-${rocmVersion}"; - hash = "sha256-QWt/zzBrZKM8h3MTnbLX4vN3p6cCQvo67U1C2yqAQxw="; + hash = "sha256-6A7REYdIw/ZmjrJh7B+wCXZMleh4bf04TFpRItPtctA="; }; buildInputs = [ diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index a4a2d1366802..904a4e4ea290 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index bb1f0de432d0..5584eb0d01ae 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -7,7 +7,7 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation rec { - version = "5.3.1"; + version = "5.3.3"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 4a59e246f697..f1d2ceee6890 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "5.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; From b3d651c79a9cd9541de031d419e7bb22d421a636 Mon Sep 17 00:00:00 2001 From: Madoura Date: Tue, 22 Nov 2022 12:48:33 -0600 Subject: [PATCH 4/7] composable_kernel: unstable-2022-11-02 -> unstable-2022-11-19 --- pkgs/development/libraries/composable_kernel/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 9efb60814a8d..f8a834252865 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -20,7 +20,7 @@ assert buildTests == false; stdenv.mkDerivation rec { pname = "composable_kernel"; - version = "unstable-2022-11-02"; + version = "unstable-2022-11-19"; outputs = [ "out" @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { "example" ]; + # There is now a release, but it's cpu-only it seems to be for a very specific purpose + # Thus, we're sticking with the develop branch for now... src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; - rev = "79aa3fb1793c265c59d392e916baa851a55521c8"; - hash = "sha256-vIfMdvRYCTqrjMGSb7gQfodzLw2wf3tGoCAa5jtfbvw="; + rev = "43a889b72e3faabf04c16ff410d387ce28486c3e"; + hash = "sha256-DDRrWKec/RcOhW3CrN0gl9NZsp0Bjnja7HAiTcEh7qg="; }; nativeBuildInputs = [ From 574727ed487478d3c3a853246435f890d8314c32 Mon Sep 17 00:00:00 2001 From: Madoura Date: Wed, 23 Nov 2022 19:24:39 -0600 Subject: [PATCH 5/7] rocm-related: change maintainers to rocm team rocprim: change maintainers to rocm team hipcub: change maintainers to rocm team rocsparse: change maintainers to rocm team hipsparse: change maintainers to rocm team rccl: change maintainers to rocm team rocfft: change maintainers to rocm team tensile: change maintainers to rocm team rocblas: change maintainers to rocm team miopengemm: change maintainers to rocm team clang-ocl: change maintainers to rocm team rocthrust: change maintainers to rocm team rocm-cmake: change maintainers to rocm team composable_kernel: change maintainers to rocm team rocmlir: change maintainers to rocm team --- pkgs/development/libraries/clang-ocl/default.nix | 2 +- pkgs/development/libraries/composable_kernel/default.nix | 2 +- pkgs/development/libraries/hipcub/default.nix | 2 +- pkgs/development/libraries/hipsparse/default.nix | 2 +- pkgs/development/libraries/miopengemm/default.nix | 2 +- pkgs/development/libraries/rccl/default.nix | 2 +- pkgs/development/libraries/rocblas/default.nix | 2 +- pkgs/development/libraries/rocfft/default.nix | 2 +- pkgs/development/libraries/rocmlir/default.nix | 2 +- pkgs/development/libraries/rocprim/default.nix | 2 +- pkgs/development/libraries/rocsparse/default.nix | 2 +- pkgs/development/libraries/rocthrust/default.nix | 2 +- pkgs/development/libraries/tensile/default.nix | 2 +- pkgs/development/tools/build-managers/rocm-cmake/default.nix | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 2b302e44dafe..6088db18cb74 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "OpenCL compilation with clang compiler"; homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != clang.version; }; } diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index f8a834252865..7dcab1c9c271 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { description = "Performance portable programming model for machine learning tensor operators"; homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; }; } diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index 8e0dcaea504c..dc4899c8ec16 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { description = "Thin wrapper library on top of rocPRIM or CUB"; homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 2cc8b62e17a7..526634746d4c 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -138,7 +138,7 @@ in stdenv.mkDerivation rec { description = "ROCm SPARSE marshalling library"; homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 8da3b56e6870..59c8531a8b11 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { description = "OpenCL general matrix multiplication API for ROCm"; homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != clang.version; }; } diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index ac7be2fa6631..169a73cf35e1 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { description = "ROCm communication collectives library"; homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index c50e7d8a7791..df64a277919b 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { description = "BLAS implementation for ROCm platform"; homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 461fc1983a57..452dc7eaf36d 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { description = "FFT implementation for ROCm "; homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; hydraPlatforms = [ ]; # rocFFT produces an extremely large output }; diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index 6bf5b1938c5c..193b238b3f45 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "MLIR-based convolution and GEMM kernel generator"; homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 86bf289b680e..216cc2e08bff 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { description = "ROCm parallel primitives"; homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index 4635e92deb92..eefb3ff44690 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -154,7 +154,7 @@ in stdenv.mkDerivation rec { description = "ROCm SPARSE implementation"; homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index d0a156079532..7b9b7b1e010d 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { description = "ROCm parallel algorithm library"; homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; broken = rocmVersion != hip.version; }; } diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix index 3d7b4da5a6ba..bb5966fc812e 100644 --- a/pkgs/development/libraries/tensile/default.nix +++ b/pkgs/development/libraries/tensile/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "GEMMs and tensor contractions"; homepage = "https://github.com/ROCmSoftwarePlatform/Tensile"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; + maintainers = teams.rocm.members; }; } diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 904a4e4ea290..c2616d81e451 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; - maintainers = with maintainers; [ Flakebi ]; + maintainers = teams.rocm.members; platforms = platforms.unix; }; } From 0190a12af56afabed5c3b4f367870e04baf9da52 Mon Sep 17 00:00:00 2001 From: Madoura Date: Wed, 23 Nov 2022 19:29:33 -0600 Subject: [PATCH 6/7] rocm-related: change maintainers to rocm team + old rocclr: change maintainers to rocm team + old rocm-comgr: change maintainers to rocm team + old rocm-device-libs: change maintainers to rocm team + old rocm-opencl-runtime: change maintainers to rocm team + old rocm-runtime: change maintainers to rocm team + old rocm-thunk: change maintainers to rocm team + old rocminfo: change maintainers to rocm team + old rocm-smi: change maintainers to rocm team + old rocm-llvm: change maintainers to rocm team + old hip: change maintainers to rocm team + old --- pkgs/development/compilers/hip/default.nix | 4 ++-- pkgs/development/compilers/llvm/rocm/llvm.nix | 2 +- pkgs/development/libraries/rocclr/default.nix | 2 +- pkgs/development/libraries/rocm-comgr/default.nix | 2 +- pkgs/development/libraries/rocm-device-libs/default.nix | 2 +- pkgs/development/libraries/rocm-opencl-runtime/default.nix | 2 +- pkgs/development/libraries/rocm-runtime/default.nix | 2 +- pkgs/development/libraries/rocm-thunk/default.nix | 2 +- pkgs/development/tools/rocminfo/default.nix | 2 +- pkgs/tools/system/rocm-smi/default.nix | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 60420b95f139..14847d415c9c 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -103,7 +103,7 @@ let description = "C++ Heterogeneous-Compute Interface for Portability"; homepage = "https://github.com/ROCm-Developer-Tools/HIP"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; }; @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { description = "C++ Heterogeneous-Compute Interface for Portability"; homepage = "https://github.com/ROCm-Developer-Tools/hipamd"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index c5ad96a6a189..82e4c167f594 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ acowley lovesegfault Flakebi ]; + maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index f53e13d1877b..c12a97c9ad60 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Source package of the Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 423e7158c400..6c2287604804 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 6959115912e2..dce0953e938b 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index e9f107445d94..47e2d0b24c6d 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ acowley lovesegfault Flakebi ]; + maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 4f61efe23fac..25e9f5a45497 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; }; } diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 15138211045c..b2a1bc9443f6 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; }; } diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 5584eb0d01ae..90afc09f8360 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "ROCm Application for Reporting System Info"; homepage = "https://github.com/RadeonOpenCompute/rocminfo"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; broken = stdenv.isAarch64; }; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index f1d2ceee6890..e5ef93103736 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "System management interface for AMD GPUs supported by ROCm"; homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault Flakebi ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; }; } From 6bb3a9baee74655ebbe1f3d9c5b2693e65846146 Mon Sep 17 00:00:00 2001 From: Madoura Date: Wed, 23 Nov 2022 20:17:04 -0600 Subject: [PATCH 7/7] rocm-related: use finalAttrs hip: use finalAttrs rocm-llvm: use finalAttrs clang-ocl: use finalAttrs composable_kernel: use finalAttrs hipcub: use finalAttrs hipsparse: use finalAttrs miopengemm: use finalAttrs rccl: use finalAttrs rocblas: use finalAttrs rocclr: use finalAttrs rocfft: use finalAttrs rocm-comgr: use finalAttrs rocm-device-libs: use finalAttrs rocm-opencl-runtime: use finalAttrs rocm-runtime: use finalAttrs rocm-thunk: use finalAttrs rocmlir: use finalAttrs rocprim: use finalAttrs rocsparse: use finalAttrs rocthrust: use finalAttrs rocm-cmake: use finalAttrs rocminfo: use finalAttrs rocm-smi: use finalAttrs --- pkgs/development/compilers/hip/default.nix | 12 ++++++------ pkgs/development/compilers/llvm/rocm/llvm.nix | 4 ++-- pkgs/development/libraries/clang-ocl/default.nix | 10 +++++----- .../libraries/composable_kernel/default.nix | 4 ++-- pkgs/development/libraries/hipcub/default.nix | 10 +++++----- pkgs/development/libraries/hipsparse/default.nix | 10 +++++----- pkgs/development/libraries/miopengemm/default.nix | 14 +++++++------- pkgs/development/libraries/rccl/default.nix | 10 +++++----- pkgs/development/libraries/rocblas/default.nix | 10 +++++----- pkgs/development/libraries/rocclr/default.nix | 6 +++--- pkgs/development/libraries/rocfft/default.nix | 10 +++++----- pkgs/development/libraries/rocm-comgr/default.nix | 6 +++--- .../libraries/rocm-device-libs/default.nix | 6 +++--- .../libraries/rocm-opencl-runtime/default.nix | 8 ++++---- .../development/libraries/rocm-runtime/default.nix | 6 +++--- pkgs/development/libraries/rocm-thunk/default.nix | 6 +++--- pkgs/development/libraries/rocmlir/default.nix | 10 +++++----- pkgs/development/libraries/rocprim/default.nix | 10 +++++----- pkgs/development/libraries/rocsparse/default.nix | 10 +++++----- pkgs/development/libraries/rocthrust/default.nix | 10 +++++----- .../tools/build-managers/rocm-cmake/default.nix | 6 +++--- pkgs/development/tools/rocminfo/default.nix | 6 +++--- pkgs/tools/system/rocm-smi/default.nix | 6 +++--- 23 files changed, 95 insertions(+), 95 deletions(-) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 14847d415c9c..e27f3c9a9817 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -28,14 +28,14 @@ }: let - hip = stdenv.mkDerivation rec { + hip = stdenv.mkDerivation (finalAttrs: { pname = "hip"; version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE="; }; @@ -106,16 +106,16 @@ let maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; - }; + }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hip"; version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4="; }; @@ -203,4 +203,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index 82e4c167f594..9e4675bfbbd8 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -24,7 +24,7 @@ let if stdenv.isx86_64 then "X86" else if stdenv.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { inherit src version; pname = "rocm-llvm"; @@ -88,4 +88,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 6088db18cb74..c4b7a3461444 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -8,15 +8,15 @@ , clang }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clang-ocl"; rocmVersion = "5.3.3"; - version = rocmVersion; + version = finalAttrs.rocmVersion; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "clang-ocl"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0="; }; @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != clang.version; + broken = finalAttrs.rocmVersion != clang.version; }; -} +}) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 7dcab1c9c271..882aa1a918d9 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -18,7 +18,7 @@ assert buildTests -> gtest != null; # Try removing this next update assert buildTests == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel"; version = "unstable-2022-11-19"; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = teams.rocm.members; }; -} +}) diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index dc4899c8ec16..7874f13c6de8 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -19,11 +19,11 @@ assert buildTests -> gtest != null; assert buildBenchmarks -> gbenchmark != null; # CUB can also be used as a backend instead of rocPRIM. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; repoVersion = "2.12.0"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipCUB"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g="; }; @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; license = with licenses; [ bsd3 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 526634746d4c..ce2361509ce8 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -26,11 +26,11 @@ let mirror1 = "https://sparse.tamu.edu/MM"; mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; repoVersion = "2.3.1"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipSPARSE"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c="; }; @@ -139,6 +139,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 59c8531a8b11..0b476654ba5c 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -36,10 +36,10 @@ let varwidth titlesec; }); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; rocmVersion = "5.3.3"; - version = rocmVersion; + version = finalAttrs.rocmVersion; outputs = [ "out" @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "MIOpenGEMM"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc="; }; @@ -107,11 +107,11 @@ in stdenv.mkDerivation rec { postInstall = lib.optionalString buildTests '' mkdir -p $test/bin find tests -executable -type f -exec mv {} $test/bin \; - patchelf --set-rpath ${lib.makeLibraryPath buildInputs}:$out/lib $test/bin/* + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $test/bin/* '' + lib.optionalString buildBenchmarks '' mkdir -p $benchmark/bin find examples -executable -type f -exec mv {} $benchmark/bin \; - patchelf --set-rpath ${lib.makeLibraryPath buildInputs}:$out/lib $benchmark/bin/* + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/* ''; postFixup = lib.optionalString buildDocs '' @@ -132,6 +132,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != clang.version; + broken = finalAttrs.rocmVersion != clang.version; }; -} +}) diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index 169a73cf35e1..f6b8671ac5d5 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -16,11 +16,11 @@ assert buildTests -> chrpath != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rccl"; repoVersion = "2.12.10"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rccl"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk="; }; @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; license = with licenses; [ bsd2 bsd3 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index df64a277919b..6664f8b1a770 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -41,16 +41,16 @@ assert buildTests -> gfortran != null; assert buildTests == false; assert buildBenchmarks == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; repoVersion = "2.45.0"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo="; }; @@ -143,6 +143,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index c12a97c9ad60..6c6856e8e1de 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -5,14 +5,14 @@ , rocm-comgr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocclr"; version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-dmL9krI/gHGQdOZ53+bQ7WjKcmJ+fZZP0lzF8ITLT4E="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { # the future. platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 452dc7eaf36d..9f97356fe711 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -25,11 +25,11 @@ assert buildBenchmarks -> fftwFloat != null; assert (buildTests || buildBenchmarks) -> boost != null; assert (buildTests || buildBenchmarks) -> llvmPackages != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; repoVersion = "1.0.18"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocFFT"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM="; }; @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; hydraPlatforms = [ ]; # rocFFT produces an extremely large output }; -} +}) diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 6c2287604804..28efaad31e33 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index dce0953e938b..27970319f8f7 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -6,14 +6,14 @@ , llvm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 47e2d0b24c6d..a5455619885e 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -20,14 +20,14 @@ , rocm-thunk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-opencl-runtime"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DAMD_OPENCL_PATH=${src}" + "-DAMD_OPENCL_PATH=${finalAttrs.src}" "-DROCCLR_PATH=${rocclr}" "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl" ]; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 25e9f5a45497..e1e394642835 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -13,14 +13,14 @@ , rocm-device-libs , rocm-thunk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { license = with licenses; [ ncsa ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; }; -} +}) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index b2a1bc9443f6..93fe52bf32fc 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,14 +7,14 @@ , numactl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; }; -} +}) diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index 193b238b3f45..5580e82470a9 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -7,15 +7,15 @@ , python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocmlir"; rocmVersion = "5.3.3"; - version = rocmVersion; + version = finalAttrs.rocmVersion; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocMLIR"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ="; }; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 216cc2e08bff..f59955f67160 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -17,11 +17,11 @@ assert buildTests -> gtest != null; assert buildBenchmarks -> gbenchmark != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; repoVersion = "2.11.1"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocPRIM"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U="; }; @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index eefb3ff44690..f8d3324f1d74 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -30,11 +30,11 @@ let mirror1 = "https://sparse.tamu.edu/MM"; mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; repoVersion = "2.3.2"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocSPARSE"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0="; }; @@ -155,6 +155,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 7b9b7b1e010d..02a7b086e7db 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -21,11 +21,11 @@ assert buildTests -> gtest != null; assert buildTests == false; assert buildBenchmarks == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; repoVersion = "2.16.0"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; # Comment out these outputs until tests/benchmarks are fixed (upstream?) # outputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw="; }; @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index c2616d81e451..ae462e3508f0 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, writeScript, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = teams.rocm.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 90afc09f8360..19dc6803f478 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -6,13 +6,13 @@ # Polaris) such that no system call is needed for downstream # compilers to determine the desired target. , defaultTargets ? []}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.3.3"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; broken = stdenv.isAarch64; }; -} +}) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index e5ef93103736..c28682a071c5 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, writeScript, cmake, wrapPython }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; }; -} +})