diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2019-07-31 13:33:26 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2019-07-31 13:33:26 +0300 |
| commit | cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd (patch) | |
| tree | 9b70d5a849c1d6af0d0b8f7811318f79dd4dde54 /pkgs/top-level | |
| parent | 19cdfe87f912a3491755dc65493542011325d311 (diff) | |
| download | nixlib-cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd.tar nixlib-cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd.tar.gz nixlib-cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd.tar.bz2 nixlib-cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd.tar.lz nixlib-cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd.tar.xz nixlib-cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd.tar.zst nixlib-cd0e461f93972c754ed7cd0cd0129bc56a9fdbdd.zip | |
tensorflow: expose binary builds
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 31 |
2 files changed, 24 insertions, 21 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55aa3e59f0a3..8d3f900b5a67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1093,15 +1093,17 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; + libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (linuxPackages) nvidia_x11; + cudatoolkit = cudatoolkit_10_0; + cudnn = cudnn_cudatoolkit_10_0; + }; + libtensorflow = if python.pkgs.tensorflow ? libtensorflow then python.pkgs.tensorflow.libtensorflow - else callPackage ../development/libraries/science/math/tensorflow/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (linuxPackages) nvidia_x11; - cudatoolkit = cudatoolkit_10_0; - cudnn = cudnn_cudatoolkit_10_0; - }; + else libtensorflow-bin; behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 429d26db0f16..68718fe9f6bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5700,21 +5700,22 @@ in { tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow = - if stdenv.isDarwin - then callPackage ../development/python-modules/tensorflow/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - } - else callPackage ../development/python-modules/tensorflow rec { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - nccl = pkgs.nccl_cudatoolkit_10; - }; + tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + }; + + tensorflow-build = callPackage ../development/python-modules/tensorflow { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + nccl = pkgs.nccl_cudatoolkit_10; + }; + + tensorflow = if stdenv.isDarwin then self.tensorflow-bin else self.tensorflow-build; tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; |