From dd79cbcd2fe1e3f8e37b5e812f8612453e418328 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 13 Nov 2023 10:00:51 -0500 Subject: [PATCH 1/3] amd-libflame: fix cmakeFlags options --- .../libraries/science/math/amd-libflame/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index 2ed35d26b907..8f1cb719c147 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { "-DENABLE_CBLAS_INTERFACES=ON" "-DENABLE_EXT_LAPACK_INTERFACE=ON" ] - ++ lib.optional (!withOpenMP) "ENABLE_MULTITHREADING=OFF" - ++ lib.optional blas64 "ENABLE_ILP64=ON" - ++ lib.optional withAMDOpt "ENABLE_AMD_OPT=ON"; + ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" + ++ lib.optional blas64 "-DENABLE_ILP64=ON" + ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; postInstall = '' ln -s $out/lib/libflame.so $out/lib/liblapack.so.3 From 22211cbeb66b003b572315ead90bb0fa77f75d5c Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 13 Nov 2023 10:01:17 -0500 Subject: [PATCH 2/3] amd-libflame: enable withAMDOpt by default --- .../development/libraries/science/math/amd-libflame/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index 8f1cb719c147..4b9ab3282503 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -9,7 +9,7 @@ , withOpenMP ? true , blas64 ? false -, withAMDOpt ? false +, withAMDOpt ? true }: stdenv.mkDerivation rec { From 656bfceca30138e19cc82984b5698f56c0d8f6eb Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 13 Nov 2023 19:22:22 -0500 Subject: [PATCH 3/3] amd-libflame: fix LIBAOCLUTILS_LIBRARY_PATH --- .../development/libraries/science/math/amd-libflame/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index 4b9ab3282503..b03352c54e8a 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ amd-blis aocl-utils ]; cmakeFlags = [ - "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib" + "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" "-DENABLE_BUILTIN_LAPACK2FLAME=ON" "-DENABLE_CBLAS_INTERFACES=ON"