diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-02-19 21:54:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 21:54:02 +0000 |
| commit | 446520bb9bafc85c9464f7364ff25512b5fdff99 (patch) | |
| tree | dfd9d32700d80d34c828a3580c65f81b38c89a1d /pkgs/applications/science/math | |
| parent | 5fc8559fbb545a74c62a3d45fa54512de72a7293 (diff) | |
| parent | 69048c4357fdc3356983bd929dd25cdacbb171b2 (diff) | |
| download | nixpkgs-446520bb9bafc85c9464f7364ff25512b5fdff99.tar nixpkgs-446520bb9bafc85c9464f7364ff25512b5fdff99.tar.gz nixpkgs-446520bb9bafc85c9464f7364ff25512b5fdff99.tar.bz2 nixpkgs-446520bb9bafc85c9464f7364ff25512b5fdff99.tar.lz nixpkgs-446520bb9bafc85c9464f7364ff25512b5fdff99.tar.xz nixpkgs-446520bb9bafc85c9464f7364ff25512b5fdff99.tar.zst nixpkgs-446520bb9bafc85c9464f7364ff25512b5fdff99.zip | |
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda
all-packages.nix: move defaults to package files continues^2
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/caffe/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/math/cntk/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/math/mxnet/default.nix | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4e8829f7e31..9ee56041ed3 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommand +{ config, stdenv, lib, runCommand , fetchFromGitHub , fetchurl , cmake @@ -13,8 +13,8 @@ , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy -, cudaSupport ? stdenv.isLinux, cudatoolkit -, cudnnSupport ? false, cudnn ? null +, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudnnSupport ? cudaSupport, cudnn ? null , ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null , substituteAll diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index fe5c77be8b2..4bf922c4e16 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 990d3f1a5d5..061f48bb3d9 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, bash, cmake +{ config, stdenv, lib, fetchurl, bash, cmake , opencv, gtest, openblas, liblapack, perl -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; |