summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-02-18 03:37:57 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-02-18 03:37:57 +0100
commita7deb859a892e7fbb91307f6c256ee6e30f1980b (patch)
tree13988c8808d4ac9d1d9a6e48b8270cc1ba0cd365
parentMerge pull request #216384 from SuperSandro2000/mc-optional (diff)
downloadnixpkgs-origin/tensor-cleanup.tar.gz
python310Packages.tensorflow: remove ? null from inputsorigin/tensor-cleanup
-rw-r--r--pkgs/development/python-modules/tensorflow/default.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index bbc7087ba2c1..8cd3231bea07 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -18,7 +18,7 @@
# it would also make the default tensorflow package unfree. See
# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
, cudaSupport ? false, cudaPackages ? {}
-, mklSupport ? false, mkl ? null
+, mklSupport ? false, mkl
, tensorboardSupport ? true
# XLA without CUDA is broken
, xlaSupport ? cudaSupport
@@ -39,8 +39,6 @@ assert cudaSupport -> cudatoolkit != null
# unsupported combination
assert ! (stdenv.isDarwin && cudaSupport);
-assert mklSupport -> mkl != null;
-
let
withTensorboard = (pythonOlder "3.6") || tensorboardSupport;