cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #296249 from ConnorBaker/fix/magma-static-build-test-output

Browse source 
magma: fix test libs with static builds; fix 2.6.x build error
This commit is contained in:
Connor Baker 2024-03-15 22:58:06 -07:00 committed by GitHub
commit b484a25daf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/libraries/science/math/magma/generic.nix
View file

@ -8,11 +8,11 @@
{ autoPatchelfHook
, blas
, cmake
, cudaPackages_11 ? null
, cudaPackages
, cudaSupport ? config.cudaSupport
, fetchurl
, gfortran
, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities
, gpuTargets ? [ ] # Non-CUDA targets, that is HIP
, rocmPackages
, lapack
@ -32,9 +32,18 @@
let
inherit (lib) lists strings trivial;
inherit (cudaPackages) cudaAtLeast cudaFlags cudaOlder;
inherit (magmaRelease) version hash supportedGpuTargets;
# Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1.
# If we're building a version prior to that, use the latest release of the 11.x series.
effectiveCudaPackages =
if strings.versionOlder version "2.7.1"
then cudaPackages_11
else cudaPackages;
inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder;
inherit (cudaFlags) cudaCapabilities;
# NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
# of the first list *from* the second list. That means:
# lists.subtractLists a b = b - a
@ -115,7 +124,7 @@ stdenv.mkDerivation {
ninja
gfortran
] ++ lists.optionals cudaSupport [
cudaPackages.cuda_nvcc
effectiveCudaPackages.cuda_nvcc
];
buildInputs = [
@ -123,7 +132,7 @@ stdenv.mkDerivation {
lapack
blas
python3
] ++ lists.optionals cudaSupport (with cudaPackages; [
] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [
cuda_cudart.dev # cuda_runtime.h
cuda_cudart.lib # cudart
cuda_cudart.static # cudart_static
@ -173,6 +182,7 @@ stdenv.mkDerivation {
# TODO(@connorbaker): This should be handled by having CMakeLists.txt install them, but such a patch is
# out of the scope of the PR which introduces the `test` output: https://github.com/NixOS/nixpkgs/pull/283777.
# See https://github.com/NixOS/nixpkgs/pull/283777#discussion_r1482125034 for more information.
# Such work is tracked by https://github.com/NixOS/nixpkgs/issues/296286.
''
install -Dm755 ../testing/run_{tests,summarize}.py -t "$test/bin/"
''
@ -182,7 +192,7 @@ stdenv.mkDerivation {
# because it has no files to install.
+ ''
install -Dm755 ./testing/testing_* ./sparse/testing/testing_* -t "$test/bin/"
install -Dm755 ./lib/libtester.so ./lib/liblapacktest.so -t "$test/lib/"
install -Dm755 ./lib/lib*test*.* -t "$test/lib/"
''
# All of the test executables and libraries will have a reference to the build directory in their RPATH, which we
# must remove. We do this by shrinking the RPATH to only include the Nix store. The autoPatchelfHook will take care
@ -196,7 +206,8 @@ stdenv.mkDerivation {
'';
passthru = {
inherit cudaPackages cudaSupport rocmSupport gpuTargets;
inherit cudaSupport rocmSupport gpuTargets;
cudaPackages = effectiveCudaPackages;
};
meta = with lib; {
@ -210,6 +221,7 @@ stdenv.mkDerivation {
broken =
!(cudaSupport || rocmSupport) # At least one back-end enabled
|| (cudaSupport && rocmSupport) # Mutually exclusive
|| (cudaSupport && cudaOlder "9.0");
|| (cudaSupport && cudaOlder "9.0")
|| (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null);
};
}