python.pkgs.tensorflow{,-bin,-estimator,-tensorboard}-2: Init at 2.1.0

Major breaking change from 1.x, so treating keeping both versions for now.

(adapted from 33f11be707)
(adapted from 9e8dea7986)
This commit is contained in:
Timo Kaufmann
2020-03-30 13:58:28 +00:00
committed by John Ericson
parent d4de62dedd
commit a730888ce0
15 changed files with 819 additions and 16 deletions
+36 -6
View File
@@ -6548,21 +6548,39 @@ in {
zerobin = callPackage ../development/python-modules/zerobin { };
tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { };
tensorflow-estimator_1_15_1 = callPackage ../development/python-modules/tensorflow-estimator/1_15_1.nix { };
tensorflow-estimator = self.tensorflow-estimator_1;
tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { };
tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { };
tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
tensorflow-tensorboard = self.tensorflow-tensorboard_1;
tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { };
tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { };
tensorflow-bin = self.tensorflow-bin_1;
tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/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 {
tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/2/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_10;
cudnn = pkgs.cudnn_cudatoolkit_10;
};
tensorflow-build = self.tensorflow-build_1;
tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_10;
@@ -6572,7 +6590,19 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
};
tensorflow = self.tensorflow-build;
tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 {
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;
openssl = pkgs.openssl_1_1;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
};
tensorflow = self.tensorflow_1;
tensorflow_1 = self.tensorflow-build_1;
tensorflow_2 = self.tensorflow-build_2;
tensorflowWithoutCuda = self.tensorflow.override {
cudaSupport = false;