diff options
author | Madoura <madouura@gmail.com> | 2023-10-05 08:39:10 -0500 |
---|---|---|
committer | Madoura <madouura@gmail.com> | 2023-10-09 16:38:53 -0500 |
commit | a3a45bea58e965b90e1abcea08feed78035b32db (patch) | |
tree | bbd769aec9e742ef29bfe0e8044065d0d6636c51 /pkgs/development/rocm-modules/5 | |
parent | 05de74ecf3083ec7a4479dc131a24167f0dfd3d0 (diff) |
rocmPackages.composable_kernel: unstable-2023-01-16 -> 5.7.0
Diffstat (limited to 'pkgs/development/rocm-modules/5')
-rw-r--r-- | pkgs/development/rocm-modules/5/composable_kernel/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/rocm-modules/5/default.nix | 1 |
2 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/development/rocm-modules/5/composable_kernel/default.nix b/pkgs/development/rocm-modules/5/composable_kernel/default.nix index 54bf1251c3091..2372b27ebe52b 100644 --- a/pkgs/development/rocm-modules/5/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/5/composable_kernel/default.nix @@ -1,10 +1,10 @@ { lib , stdenv , fetchFromGitHub -, unstableGitUpdater +, rocmUpdateScript , cmake , rocm-cmake -, hip +, clr , openmp , clang-tools-extra , gtest @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel"; - version = "unstable-2023-01-16"; + version = "5.7.0"; outputs = [ "out" @@ -25,24 +25,21 @@ stdenv.mkDerivation (finalAttrs: { "example" ]; - # ROCm 5.6 should release composable_kernel as stable with a tag in the future src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; - rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef"; - hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-Z9X+S2SijGJ8bhr9ghkkWicBUzLzs9fxPpqZxX6BBM4="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr clang-tools-extra ]; - buildInputs = [ - openmp - ]; + buildInputs = [ openmp ]; cmakeFlags = [ "-DCMAKE_C_COMPILER=hipcc" @@ -71,7 +68,11 @@ stdenv.mkDerivation (finalAttrs: { mv $out/bin/example_* $example/bin ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; # Times out otherwise requiredSystemFeatures = [ "big-parallel" ]; @@ -82,5 +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; }; }) diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index e0295f08720fc..838874f398e29 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -237,6 +237,7 @@ in rec { }; composable_kernel = callPackage ./composable_kernel { + inherit rocmUpdateScript rocm-cmake clr; inherit (llvm) openmp clang-tools-extra; stdenv = llvm.rocmClangStdenv; }; |