!76 升级Tensorflow到2.12.1
From: @wisespreading Reviewed-by: @zhunaipan Signed-off-by: @zhunaipan
This commit is contained in:
commit
e4e83ae4e3
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
16
fix-boringssl-compile.patch
Normal file
16
fix-boringssl-compile.patch
Normal file
@ -0,0 +1,16 @@
|
||||
--- tensorflow-2.12.1/tensorflow/workspace2.bzl.ori 2023-06-27 18:05:39.000000000 +0000
|
||||
+++ tensorflow-2.12.1/tensorflow/workspace2.bzl 2023-09-07 07:33:25.037000000 +0000
|
||||
@@ -567,10 +567,10 @@ def _tf_repositories():
|
||||
|
||||
tf_http_archive(
|
||||
name = "boringssl",
|
||||
- sha256 = "534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40",
|
||||
- strip_prefix = "boringssl-b9232f9e27e5668bc0414879dcdedb2a59ea75f2",
|
||||
+ sha256 = "9dc53f851107eaf87b391136d13b815df97ec8f76dadb487b58b2fc45e624d2c",
|
||||
+ strip_prefix = "boringssl-c00d7ca810e93780bd0c8ee4eea28f4f2ea4bcdc",
|
||||
system_build_file = "//third_party/systemlibs:boringssl.BUILD",
|
||||
- urls = tf_mirror_urls("https://github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz"),
|
||||
+ urls = tf_mirror_urls("https://github.com/google/boringssl/archive/c00d7ca810e93780bd0c8ee4eea28f4f2ea4bcdc.tar.gz"),
|
||||
)
|
||||
|
||||
# Note: if you update this, you have to update libpng too. See cl/437813808
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/tensorflow/tools/pip_package/setup.py 2022-11-30 08:53:15.528680400 +0800
|
||||
+++ b/tensorflow/tools/pip_package/setup.py 2022-11-30 08:53:37.069067700 +0800
|
||||
@@ -78,11 +78,11 @@ REQUIRED_PACKAGES = [
|
||||
--- a/tensorflow/tools/pip_package/setup.py 2023-09-13 06:21:22.906000000 +0000
|
||||
+++ b/tensorflow/tools/pip_package/setup.py 2023-09-13 06:24:39.350000000 +0000
|
||||
@@ -86,13 +86,13 @@ REQUIRED_PACKAGES = [
|
||||
'astunparse >= 1.6.0',
|
||||
'flatbuffers >= 2.0',
|
||||
# TODO(b/213222745) gast versions above 0.4.0 break TF's tests
|
||||
@ -8,18 +8,25 @@
|
||||
+ 'gast >= 0.2.1',
|
||||
'google_pasta >= 0.1.1',
|
||||
'h5py >= 2.9.0',
|
||||
'keras_preprocessing >= 1.1.1', # 1.1.0 needs tensorflow==1.7
|
||||
# TODO(b/239052279): replace with external dependency on JAX repo once JAX
|
||||
# no longer relies on TF.
|
||||
- 'jax >= 0.3.15',
|
||||
- 'libclang >= 13.0.0',
|
||||
+ #'jax >= 0.3.15',
|
||||
+ #'libclang >= 13.0.0',
|
||||
'numpy >= 1.20',
|
||||
# TODO(b/263178356): numpy 1.24 breaks TF's tests
|
||||
'numpy >= 1.22, <= 1.24.3',
|
||||
'opt_einsum >= 2.3.2',
|
||||
'packaging',
|
||||
@@ -99,7 +99,7 @@ REQUIRED_PACKAGES = [
|
||||
'termcolor >= 1.1.0',
|
||||
'typing_extensions >= 3.6.6',
|
||||
'wrapt >= 1.11.0',
|
||||
- 'tensorflow-io-gcs-filesystem >= 0.23.1',
|
||||
+ #'tensorflow-io-gcs-filesystem >= 0.23.1',
|
||||
@@ -111,9 +111,9 @@ REQUIRED_PACKAGES = [
|
||||
'typing_extensions>=3.6.6,<4.6.0',
|
||||
# TODO(b/266362323): wrapt==1.15.0rc0 incompatible with TF 2.12.0 RC0 (and
|
||||
# nightly, but works with TF 2.11)
|
||||
- 'wrapt >= 1.11.0, <1.15',
|
||||
- 'tensorflow-io-gcs-filesystem >= 0.23.1;platform_machine!="arm64" or ' +
|
||||
- 'platform_system!="Darwin"',
|
||||
+ 'wrapt >= 1.11.0',
|
||||
+ #'tensorflow-io-gcs-filesystem >= 0.23.1;platform_machine!="arm64" or ' +
|
||||
+ #'platform_system!="Darwin"',
|
||||
# grpcio does not build correctly on big-endian machines due to lack of
|
||||
# BoringSSL support.
|
||||
# See https://github.com/tensorflow/tensorflow/issues/17882.
|
||||
|
||||
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
%global _empty_manifest_terminate_build 0
|
||||
Name: tensorflow
|
||||
Version: 2.10.0
|
||||
Release: 3
|
||||
Version: 2.12.1
|
||||
Release: 0
|
||||
Summary: An Open Source Machine Learning Framework for Everyone
|
||||
License: Apache License 2.0
|
||||
URL: https://www.tensorflow.org/
|
||||
@ -9,8 +9,9 @@ Source0: https://github.com/tensorflow/tensorflow/archive/v%{version}.tar
|
||||
Source1: external.tar.bz2.partaa
|
||||
Source2: external.tar.bz2.partab
|
||||
Source3: external.tar.bz2.partac
|
||||
Source4: aarch64_external_files.patch
|
||||
Source4: aarch64_external_files.patch
|
||||
Patch0: modify-deps-on-libclang-gcsfs-gast.patch
|
||||
Patch1: fix-boringssl-compile.patch
|
||||
Requires: python3-future python3-numpy python3-six python3-astunparse python3-google-pasta python3-opt-einsum
|
||||
Requires: python3-typing-extensions python3-wrapt python3-h5py python3-protobuf python3-grpcio python3-absl-py
|
||||
Requires: python3-flatbuffers python3-gast
|
||||
@ -26,7 +27,7 @@ TensorFlow provides stable Python and C++ APIs, as well as non-guaranteed backwa
|
||||
Summary: An Open Source Machine Learning Framework for Everyone
|
||||
Provides: python-tensorflow
|
||||
Provides: python%{python3_version}dist(tensorflow) = %{version}
|
||||
BuildRequires: bazel == 5.1.1 gcc gcc-c++ git
|
||||
BuildRequires: bazel == 5.3.0 gcc gcc-c++ git
|
||||
BuildRequires: python3-numpy python3-devel python3-Keras-Preprocessing python3-pip python3-wheel python3-packaging python3-requests
|
||||
|
||||
%description -n python3-tensorflow
|
||||
@ -40,22 +41,22 @@ TensorFlow provides stable Python and C++ APIs, as well as non-guaranteed backwa
|
||||
%autosetup -p1
|
||||
extdir=$(bazel --output_user_root=`pwd`/../output_user_root info output_base)
|
||||
mkdir -p ${extdir}
|
||||
instdir=$(bazel --output_user_root=`pwd`/../output_user_root info install_base)
|
||||
cat %{SOURCE1} %{SOURCE2} %{SOURCE3} > external.tar.bz2
|
||||
tar xf external.tar.bz2 -C ${extdir}
|
||||
%ifarch aarch64
|
||||
patch -d ${extdir} -p0 < %{SOURCE4}
|
||||
%endif
|
||||
ln -sfn $(find ${extdir}/../install -name embedded_tools) ${extdir}/external/bazel_tools
|
||||
ln -sfn $(find ${extdir}/../install -maxdepth 2 -name platforms) ${extdir}/external/platforms
|
||||
for f in $(find $extdir -lname "/home/abuild/*"); do OLDLINK=$(readlink $f); echo $OLDLINK; NEWLINK=${HOME}/rpmbuild${OLDLINK#*rpmbuild}; ln -sf $NEWLINK $f-newlink; mv -Tf $f-newlink $f; done
|
||||
for f in $(find $extdir -lname "*/external/*"); do OLDLINK=$(readlink $f); echo $OLDLINK; NEWLINK=${extdir}/external/${OLDLINK#*external}; ln -sf $NEWLINK $f-newlink; mv -Tf $f-newlink $f; done
|
||||
rm -rf ${extdir}/external/local_config*
|
||||
ln -sfn ${instdir}/embedded_tools ${extdir}/external/bazel_tools
|
||||
for f in $(find $extdir/external -lname "*/external/*"); do OLDLINK=$(readlink $f); echo $OLDLINK; NEWLINK=${extdir}/external/${OLDLINK#*external}; ln -sf $NEWLINK $f-newlink; mv -Tf $f-newlink $f; done
|
||||
for f in $(find $extdir/external -lname "*/rpmbuild/*"); do OLDLINK=$(readlink $f); echo $OLDLINK; NEWLINK=${HOME}/rpmbuild/${OLDLINK#*rpmbuild}; ln -sf $NEWLINK $f-newlink; mv -Tf $f-newlink $f;done
|
||||
#rm -rf ${extdir}/external/local_config*
|
||||
|
||||
%build
|
||||
mkdir -p ${HOME}/.local/bin
|
||||
ln -s -f -T $(command -v python3) ${HOME}/.local/bin/python
|
||||
export PATH=${HOME}/.local/bin:$PATH
|
||||
bazel --output_user_root=`pwd`/../output_user_root build --host_copt=-Wno-stringop-truncation //tensorflow/tools/pip_package:build_pip_package --verbose_failures --experimental_local_memory_estimate --jobs=16
|
||||
bazel --output_user_root=`pwd`/../output_user_root build --nofetch --host_copt=-Wno-stringop-truncation //tensorflow/tools/pip_package:build_pip_package --verbose_failures --experimental_local_memory_estimate --jobs=16
|
||||
./bazel-bin/tensorflow/tools/pip_package/build_pip_package dist
|
||||
|
||||
%install
|
||||
@ -66,6 +67,9 @@ bazel --output_user_root=`pwd`/../output_user_root build --host_copt=-Wno-string
|
||||
%{_bindir}/*
|
||||
|
||||
%changelog
|
||||
* Wed Sep 13 2023 Jincheng Miao <jincheng.miao@intel.com> - 2.12.1-0
|
||||
- update version to 2.12.1
|
||||
|
||||
* Fri Apr 14 2023 ZhangChao <chaozhangm@isoftstone.com> - 2.10.0-3
|
||||
- Fix EBS build
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user