public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85399 from cgevans/tensorflow-bin_2-depfix

Browse Source 
tensorflow-bin_2: fix tensorboard dependency
This commit is contained in:
Benjamin Hipple 2020-05-04 22:47:13 -04:00 committed by GitHub
commit 36ee1e710a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/tensorflow/2/bin.nix
View File

@ -19,7 +19,7 @@
, opt-einsum , opt-einsum
, backports_weakref , backports_weakref
, tensorflow-estimator_2 , tensorflow-estimator_2
, tensorflow-tensorboard , tensorflow-tensorboard_2
, cudaSupport ? false , cudaSupport ? false
, cudatoolkit ? null , cudatoolkit ? null
, cudnn ? null , cudnn ? null
@ -77,7 +77,7 @@ in buildPythonPackage {
google-pasta google-pasta
wrapt wrapt
tensorflow-estimator_2 tensorflow-estimator_2
tensorflow-tensorboard tensorflow-tensorboard_2
keras-applications keras-applications
keras-preprocessing keras-preprocessing
] ++ lib.optional (!isPy3k) mock ] ++ lib.optional (!isPy3k) mock
@ -159,6 +159,14 @@ in buildPythonPackage {
done done
''; '';
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propagated input tensorflow-tensorboard, which causes environment collisions.
# Another possibility would be to have tensorboard only in the buildInputs
# See https://github.com/NixOS/nixpkgs/pull/44381 for more information.
postInstall = ''
rm $out/bin/tensorboard
'';
pythonImportsCheck = [ pythonImportsCheck = [
"tensorflow" "tensorflow"
"tensorflow.keras" "tensorflow.keras"