diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science/math')
8 files changed, 55 insertions, 34 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix index 2ed35d26b907..b03352c54e8a 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -9,7 +9,7 @@ , withOpenMP ? true , blas64 ? false -, withAMDOpt ? false +, withAMDOpt ? true }: stdenv.mkDerivation rec { @@ -37,15 +37,15 @@ 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" "-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 diff --git a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index 5b78afc15ed4..2c9aa745ba12 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -48,8 +48,8 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis.so.3 $out/lib/libblas.so.3 - ln -s $out/lib/libblis.so.3 $out/lib/libcblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index b1e03e35df12..b9f101d80fa3 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -153,8 +153,14 @@ in description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; sourceProvenance = with sourceTypes; [binaryNativeCode]; - # TODO: consider marking unfreRedistributable when not using runfile - license = licenses.unfree; + license = { + shortName = "cuDNN EULA"; + fullName = "NVIDIA cuDNN Software License Agreement (EULA)"; + url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; + free = false; + } // lib.optionalAttrs (!useCudatoolkitRunfile) { + redistributable = true; + }; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; # Force the use of the default, fat output by default (even though `dev` exists, which diff --git a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index 9b26b352cdad..cea4d5b4c6fa 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-cyV3tgmZz5AExxxdGJ12r+PPXn7v2AEhxb9icBxolS8="; + sha256 = "sha256-51isH1hlzgbD0JVtGp3NuaGY5l2CeS1S7oVeRYG+vWI="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 27509ee99339..6b8588207dc3 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -24,7 +24,8 @@ , libpthreadstubs , magmaRelease , ninja -, rocmSupport ? false +, config +, rocmSupport ? config.rocmSupport , static ? false , stdenv , symlinkJoin diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index c5c7b7e6427d..d1df26456447 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,6 +1,7 @@ { lib , backendStdenv , fetchFromGitHub +, python3 , which , autoAddOpenGLRunpathHook , cuda_cccl @@ -17,13 +18,13 @@ let in backendStdenv.mkDerivation (finalAttrs: { pname = "nccl"; - version = "2.18.5-1"; + version = "2.19.3-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-vp2WitKateEt1AzSeeEvY/wM4NnUmV7XgL/gfPRUObY="; + hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; }; outputs = [ "out" "dev" ]; @@ -32,6 +33,7 @@ backendStdenv.mkDerivation (finalAttrs: { which autoAddOpenGLRunpathHook cuda_nvcc + python3 ]; buildInputs = [ @@ -46,7 +48,7 @@ backendStdenv.mkDerivation (finalAttrs: { ]; preConfigure = '' - patchShebangs src/collectives/device/gen_rules.sh + patchShebangs ./src/device/generate.py makeFlagsArray+=( "NVCC_GENCODE=${gencode}" ) @@ -77,7 +79,7 @@ backendStdenv.mkDerivation (finalAttrs: { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter orivej ]; + platforms = platforms.linux; + maintainers = with maintainers; [ mdaiter orivej ] ++ teams.cuda.members; }; }) diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix index 69e45a6aee09..9d826b92f164 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix @@ -1,40 +1,47 @@ -{ config -, cudaPackages +{ backendStdenv +, config +, cuda_cccl +, cuda_cudart +, cuda_nvcc +, cudaVersion , fetchFromGitHub +, gitUpdater , lib -, mpiSupport ? false , mpi -, stdenv +, mpiSupport ? false +, nccl , which }: -cudaPackages.backendStdenv.mkDerivation (finalAttrs: { +backendStdenv.mkDerivation (finalAttrs: { pname = "nccl-tests"; - version = "2.13.6"; + version = "2.13.8"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw="; + hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; }; strictDeps = true; nativeBuildInputs = [ - cudaPackages.cuda_nvcc + cuda_nvcc which ]; buildInputs = [ - cudaPackages.cuda_cudart - cudaPackages.nccl + cuda_cudart + nccl + ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> ] ++ lib.optional mpiSupport mpi; makeFlags = [ - "CUDA_HOME=${cudaPackages.cuda_nvcc}" - "NCCL_HOME=${cudaPackages.nccl}" + "CUDA_HOME=${cuda_nvcc}" + "NCCL_HOME=${nccl}" ] ++ lib.optionals mpiSupport [ "MPI=1" ]; @@ -46,12 +53,17 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { cp -r build/* $out/bin/ ''; + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + meta = with lib; { description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.bsd3; broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ]; + maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; }; }) diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 8f0c930eff62..5cbc23589895 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -63,16 +63,16 @@ stdenv.mkDerivation rec { "-DFETCH_PYTHON_DEPS=OFF" "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" - "-DPython3_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; nativeBuildInputs = [ cmake ensureNewerSourcesForZipFilesHook pkg-config - python.pythonForBuild + python.pythonOnBuildForHost swig4 unzip - ] ++ (with python.pythonForBuild.pkgs; [ + ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf ]); |