1 |
commit: 0f654de63913a1631a9a7ec25cee4f8447de7f2f |
2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 29 21:50:43 2020 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 00:25:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f654de6 |
7 |
|
8 |
sci-libs/tensorflow: Fix build failures in 2.2 |
9 |
|
10 |
Patch needed to build against numpy-1.19. |
11 |
Also updated deps for flatbuffers, h5py |
12 |
|
13 |
Closes: https://bugs.gentoo.org/736155 |
14 |
Closes: https://bugs.gentoo.org/710074 |
15 |
Closes: https://bugs.gentoo.org/725120 |
16 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
17 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
18 |
|
19 |
sci-libs/tensorflow/Manifest | 2 +- |
20 |
.../{tensorflow-2.2.0.ebuild => tensorflow-2.2.0-r1.ebuild} | 9 +++++---- |
21 |
2 files changed, 6 insertions(+), 5 deletions(-) |
22 |
|
23 |
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest |
24 |
index a59b7ec1b39..96ff16f223c 100644 |
25 |
--- a/sci-libs/tensorflow/Manifest |
26 |
+++ b/sci-libs/tensorflow/Manifest |
27 |
@@ -41,4 +41,4 @@ DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a |
28 |
DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6 |
29 |
DIST tensorflow-2.2.0.tar.gz 42100791 BLAKE2B 8b773ae9945ca267af33a34d86f6aef02310976bea1cdd98858d1405e8da845640b72a073b71fcfccb2b73f08600a5eada2c2332a8d9480bba71e9f25dbb2220 SHA512 94a2663497d333d543f363e9fea94fbcfdcdbbc0dfbaf009ba9181a808713aeb78f9b8805f56bea5fd3925a36f105427b3996795750589f378d8afbdadc2b86d |
30 |
DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed |
31 |
-DIST tensorflow-patches-2.2.0.tar.bz2 3197 BLAKE2B e88211e6eaed9818e63680aaa451cad1a0b53e6087e2d8a1c34126e539d509ed5180ce1bdd902f0a0acd357a4e334bb30638d18d15a585465881abf1ecfbb830 SHA512 5370700df4b3741e4f41629684c8bdba28182b5d488df241a8f4f55ba821797d38ef98676b30712c1716310054307fbec03db406d1cf17a7f3430697e8378d2c |
32 |
+DIST tensorflow-patches-2.2.0-r1.tar.bz2 3890 BLAKE2B cf4e0d579992cd09136fe3a11c5016e7b996ea959dad9f3a1ccff2fa623c2c4eab1c6673dfaf08b3b01220fd00c9edd5966e1162049f6d1e4fe5af280f491850 SHA512 8d07c9351b75faf90a137f65c2e6147d884744c5ab9b0bacadfa7bdc7b66ec2ec92920c7d23396bb70f7f4fb290f3f818591f23c6a4e91ab1a79290cb4ea1533 |
33 |
|
34 |
diff --git a/sci-libs/tensorflow/tensorflow-2.2.0.ebuild b/sci-libs/tensorflow/tensorflow-2.2.0-r1.ebuild |
35 |
similarity index 98% |
36 |
rename from sci-libs/tensorflow/tensorflow-2.2.0.ebuild |
37 |
rename to sci-libs/tensorflow/tensorflow-2.2.0-r1.ebuild |
38 |
index 7abd3707e97..cefe66efeca 100644 |
39 |
--- a/sci-libs/tensorflow/tensorflow-2.2.0.ebuild |
40 |
+++ b/sci-libs/tensorflow/tensorflow-2.2.0-r1.ebuild |
41 |
@@ -85,12 +85,13 @@ RDEPEND=" |
42 |
mpi? ( virtual/mpi ) |
43 |
python? ( |
44 |
${PYTHON_DEPS} |
45 |
- >=dev-libs/flatbuffers-1.8.0 |
46 |
+ >=dev-libs/flatbuffers-1.12.0 |
47 |
dev-python/absl-py[${PYTHON_USEDEP}] |
48 |
>=dev-python/astor-0.7.1[${PYTHON_USEDEP}] |
49 |
dev-python/astunparse[${PYTHON_USEDEP}] |
50 |
>=dev-python/gast-0.3.3[${PYTHON_USEDEP}] |
51 |
- >=dev-python/numpy-1.16[${PYTHON_USEDEP}] |
52 |
+ dev-python/h5py[${PYTHON_USEDEP}] |
53 |
+ >=dev-python/numpy-1.19[${PYTHON_USEDEP}] |
54 |
>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}] |
55 |
dev-python/opt-einsum[${PYTHON_USEDEP}] |
56 |
>=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}] |
57 |
@@ -101,7 +102,7 @@ RDEPEND=" |
58 |
>=net-libs/google-cloud-cpp-0.10.0 |
59 |
>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] |
60 |
>=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}] |
61 |
- >=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}] |
62 |
+ >=sci-visualization/tensorboard-2.2.0[${PYTHON_USEDEP}] |
63 |
)" |
64 |
DEPEND="${RDEPEND} |
65 |
python? ( |
66 |
@@ -109,7 +110,7 @@ DEPEND="${RDEPEND} |
67 |
dev-python/setuptools |
68 |
)" |
69 |
PDEPEND="python? ( |
70 |
- >=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}] |
71 |
+ >=sci-libs/tensorflow-estimator-2.2.0[${PYTHON_USEDEP}] |
72 |
)" |
73 |
BDEPEND=" |
74 |
app-arch/unzip |