From 6dbbac53efe3570b96806493b1dc7a7c57d0e3cf Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Mon, 3 Aug 2026 03:33:24 +0200 Subject: [PATCH] aiter: fix composable kernel link --- pkgs/development/python-modules/amd-aiter/default.nix | 2 +- .../rocm-modules/composable_kernel/base.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/amd-aiter/default.nix b/pkgs/development/python-modules/amd-aiter/default.nix index fdd23f47e654..7f4a3251f483 100644 --- a/pkgs/development/python-modules/amd-aiter/default.nix +++ b/pkgs/development/python-modules/amd-aiter/default.nix @@ -55,7 +55,7 @@ buildPythonPackage (finalAttrs: { postPatch = '' rmdir 3rdparty/composable_kernel - ln -sf ${rocmPackages.composable_kernel.src} 3rdparty/composable_kernel + ln -sf ${rocmPackages.composable_kernel.composable_kernel_src} 3rdparty/composable_kernel substituteInPlace pyproject.toml \ --replace-fail '"flydsl==0.0.1.dev95158637"' "" diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 70b5a4cefe7c..49e2d58d0884 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -34,7 +34,9 @@ ] ), }: - +let + projectRoot = "projects/composablekernel"; +in stdenv.mkDerivation (finalAttrs: { preBuild = '' echo "This derivation isn't intended to be built directly and only exists to be overridden and built in chunks"; @@ -59,12 +61,12 @@ stdenv.mkDerivation (finalAttrs: { repo = "rocm-libraries"; rev = "rocm-${finalAttrs.version}"; sparseCheckout = [ - "projects/composablekernel" + projectRoot "shared" ]; hash = "sha256-Zs6wwPmys1kUlgDD4XzKKw273nH/Ur3HtuYxJjvjDs0="; }; - sourceRoot = "${finalAttrs.src.name}/projects/composablekernel"; + sourceRoot = "${finalAttrs.src.name}/${projectRoot}"; nativeBuildInputs = [ # Deliberately not using ninja @@ -179,6 +181,8 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit gpuTargets miOpenReqLibsOnly; + composable_kernel_src = "${finalAttrs.src}/${projectRoot}"; + updateScript = rocmUpdateScript { inherit finalAttrs; }; anyGfx9Target = lib.lists.any (lib.strings.hasPrefix "gfx9") gpuTargets; anyMfmaTarget =