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

Merge pull request #106769 from mweinelt/tensorflow

Browse Source 
python3Packages.tensorflow_2: relax h5py dependency
This commit is contained in:
Martin Weinelt 2020-12-13 22:10:56 +01:00 committed by GitHub
commit 2e2b7249e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ let
# Fixes for NixOS jsoncpp
../system-jsoncpp.patch
./lift-gast-restriction.patch
./relax-dependencies.patch
# see https://github.com/tensorflow/tensorflow/issues/40688
(fetchpatch {

11
pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch → pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch
View File

@ -1,11 +1,16 @@
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 992f2eae22..d9386f9b13 100644
index 594e74f40c0..bfbf010144f 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -56,5 +56,5 @@ REQUIRED_PACKAGES = [
@@ -54,9 +54,9 @@ _VERSION = '2.3.1'
REQUIRED_PACKAGES = [
'absl-py >= 0.7.0',
'astunparse == 1.6.3',
- 'gast == 0.3.3',
+ 'gast >= 0.3.3',
'google_pasta >= 0.1.8',
'h5py >= 2.10.0, < 2.11.0',
- 'h5py >= 2.10.0, < 2.11.0',
+ 'h5py >= 2.10.0',
'keras_preprocessing >= 1.1.1, < 1.2',
# TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage
# https://github.com/numpy/numpy/pull/15355