Compare commits

...

11 Commits

Author SHA1 Message Date
openeuler-ci-bot
283033e9dd
!89 Add support for riscv64
From: @DingliZhang 
Reviewed-by: @jimmy_hero, @zhunaipan, @Jingwiw, @sinever 
Signed-off-by: @zhunaipan, @Jingwiw, @sinever
2024-12-21 04:17:50 +00:00
Dingli Zhang
2d0614e224 Add support for riscv64 2024-12-19 01:50:34 +00:00
openeuler-ci-bot
ce686e74e7
!80 [sync] PR-78: Increase the upper limit version of typing_extensions to fix install, typing_extensions>=3.6.6,<4.6.0 to typing_extensions>=3.6.6,<=4.10.0
From: @openeuler-sync-bot 
Reviewed-by: @sinever 
Signed-off-by: @sinever
2024-05-17 01:17:08 +00:00
zhangxianting
c59e9f2517 Increase the upper limit version of typing_extensions to fix install
(cherry picked from commit aa02c05c12988ac2b015a1ae5bab84455aee427d)
2024-05-16 15:49:36 +08:00
openeuler-ci-bot
e4e83ae4e3
!76 升级Tensorflow到2.12.1
From: @wisespreading 
Reviewed-by: @zhunaipan 
Signed-off-by: @zhunaipan
2023-09-19 13:10:44 +00:00
Jincheng Miao
72dbb236d0 update version to 2.12.1 2023-09-13 14:32:35 +08:00
openeuler-ci-bot
4d57d700f1
!74 [sync] PR-70: fix issue:【EBS】tensorflow build problem in openEuler:22.03:LTS:Next
From: @openeuler-sync-bot 
Reviewed-by: @sinever 
Signed-off-by: @sinever
2023-05-18 08:20:37 +00:00
zhangchao13
29eec08602 fix issue:【EBS】tensorflow build problem in openEuler:22.03:LTS:Next
(cherry picked from commit 9ac8fb7279594fa63e97452d633812084fae10c1)
2023-04-25 11:47:55 +08:00
openeuler-ci-bot
b4a221020f
!64 支持python-gast-0.5.3
From: @wisespreading 
Reviewed-by: @sinever 
Signed-off-by: @sinever
2022-11-30 21:04:31 +00:00
Jincheng Miao
d0df8c8efc Modify dependency on gast
Signed-off-by: Jincheng Miao <jincheng.miao@intel.com>
2022-11-30 14:13:00 +08:00
openeuler-ci-bot
e3cb870d36
!62 升级Tensorflow到2.10.0
From: @wisespreading 
Reviewed-by: @sinever, @zhunaipan 
Signed-off-by: @zhunaipan, @sinever
2022-11-16 03:49:49 +00:00
10 changed files with 311 additions and 407 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

View 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

View File

@ -0,0 +1,36 @@
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -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
- 'gast >= 0.2.1, <= 0.4.0',
+ 'gast >= 0.2.1',
'google_pasta >= 0.1.1',
'h5py >= 2.9.0',
# 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',
# TODO(b/263178356): numpy 1.24 breaks TF's tests
'numpy >= 1.22, <= 1.24.3',
'opt_einsum >= 2.3.2',
@@ -108,12 +108,12 @@ REQUIRED_PACKAGES = [
'setuptools',
'six >= 1.12.0',
'termcolor >= 1.1.0',
- 'typing_extensions>=3.6.6,<4.6.0',
+ 'typing_extensions>=3.6.6,<=4.10.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.

View File

@ -1,20 +0,0 @@
--- a/tensorflow/tools/pip_package/setup.py 2022-11-14 23:25:07.647922300 +0800
+++ b/tensorflow/tools/pip_package/setup.py 2022-11-14 23:25:36.901952800 +0800
@@ -82,7 +82,7 @@ REQUIRED_PACKAGES = [
'google_pasta >= 0.1.1',
'h5py >= 2.9.0',
'keras_preprocessing >= 1.1.1', # 1.1.0 needs tensorflow==1.7
- 'libclang >= 13.0.0',
+ #'libclang >= 13.0.0',
'numpy >= 1.20',
'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',
# grpcio does not build correctly on big-endian machines due to lack of
# BoringSSL support.
# See https://github.com/tensorflow/tensorflow/issues/17882.

View File

@ -0,0 +1,163 @@
diff -Nurp external-x86_64/go_sdk/BUILD.bazel external/go_sdk/BUILD.bazel
--- external-x86_64/go_sdk/BUILD.bazel 2023-08-28 15:08:25.000000000 +0800
+++ external/go_sdk/BUILD.bazel 2023-08-31 11:47:56.000000000 +0800
@@ -7,8 +7,8 @@ package(default_visibility = ["//visibil
filegroup(
name = "libs",
srcs = glob(
- ["pkg/linux_amd64/**/*.a"],
- exclude = ["pkg/linux_amd64/**/cmd/**"],
+ ["pkg/linux_riscv64/**/*.a"],
+ exclude = ["pkg/linux_riscv64/**/cmd/**"],
),
)
@@ -34,7 +34,7 @@ go_sdk(
name = "go_sdk",
srcs = [":srcs"],
go = "bin/go",
- goarch = "amd64",
+ goarch = "riscv64",
goos = "linux",
headers = [":headers"],
libs = [":libs"],
@@ -60,7 +60,7 @@ package_list(
declare_toolchains(
builder = ":builder",
- host = "linux_amd64",
+ host = "linux_riscv64",
sdk = ":go_sdk",
)
diff -Nurp external-x86_64/go_sdk/src/internal/buildcfg/zbootstrap.go external/go_sdk/src/internal/buildcfg/zbootstrap.go
--- external-x86_64/go_sdk/src/internal/buildcfg/zbootstrap.go 2022-07-12 23:23:16.000000000 +0800
+++ external/go_sdk/src/internal/buildcfg/zbootstrap.go 2022-07-12 23:23:09.000000000 +0800
@@ -12,7 +12,7 @@ const defaultGOMIPS64 = `hardfloat`
const defaultGOPPC64 = `power8`
const defaultGOEXPERIMENT = ``
const defaultGO_EXTLINK_ENABLED = ``
-const defaultGO_LDSO = `/lib64/ld-linux-x86-64.so.2`
+const defaultGO_LDSO = `/lib/ld-linux-riscv64-lp64d.so.1`
const version = `go1.18.4`
const defaultGOOS = runtime.GOOS
const defaultGOARCH = runtime.GOARCH
diff -Nurp external-x86_64/local_config_cc/BUILD external/local_config_cc/BUILD
--- external-x86_64/local_config_cc/BUILD 2023-08-30 14:17:49.000000000 +0800
+++ external/local_config_cc/BUILD 2023-08-31 11:49:36.000000000 +0800
@@ -47,15 +47,15 @@ filegroup(
cc_toolchain_suite(
name = "toolchain",
toolchains = {
- "k8|compiler": ":cc-compiler-k8",
- "k8": ":cc-compiler-k8",
+ "riscv64|compiler": ":cc-compiler-riscv64",
+ "riscv64": ":cc-compiler-riscv64",
"armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
"armeabi-v7a": ":cc-compiler-armeabi-v7a",
},
)
cc_toolchain(
- name = "cc-compiler-k8",
+ name = "cc-compiler-riscv64",
toolchain_identifier = "local",
toolchain_config = ":local",
all_files = ":compiler_deps",
@@ -72,7 +72,7 @@ cc_toolchain(
cc_toolchain_config(
name = "local",
- cpu = "k8",
+ cpu = "riscv64",
compiler = "compiler",
toolchain_identifier = "local",
host_system_name = "local",
@@ -80,11 +80,11 @@ cc_toolchain_config(
target_libc = "local",
abi_version = "local",
abi_libc_version = "local",
- cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-openEuler-linux/12/include",
+ cxx_builtin_include_directories = ["/usr/lib/gcc/riscv64-openEuler-linux/12/include",
"/usr/local/include",
"/usr/include",
"/usr/include/c++/12",
- "/usr/include/c++/12/x86_64-openEuler-linux",
+ "/usr/include/c++/12/riscv64-openEuler-linux",
"/usr/include/c++/12/backward"],
tool_paths = {"ar": "/usr/bin/ar",
"ld": "/usr/bin/ld",
@@ -110,8 +110,7 @@ cc_toolchain_config(
"-fdata-sections"],
dbg_compile_flags = ["-g"],
cxx_flags = ["-std=c++0x"],
- link_flags = ["-fuse-ld=gold",
- "-Wl,-no-as-needed",
+ link_flags = ["-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
"-B/usr/bin",
"-pass-exit-codes"],
@@ -125,7 +124,7 @@ cc_toolchain_config(
"-D__TIME__=\"redacted\""],
coverage_compile_flags = ["--coverage"],
coverage_link_flags = ["--coverage"],
- supports_start_end_lib = True,
+ supports_start_end_lib = False,
)
# Android tooling requires a default toolchain for the armeabi-v7a cpu.
diff -Nurp external-x86_64/local_config_cc/builtin_include_directory_paths external/local_config_cc/builtin_include_directory_paths
--- external-x86_64/local_config_cc/builtin_include_directory_paths 2023-08-30 14:17:48.000000000 +0800
+++ external/local_config_cc/builtin_include_directory_paths 2023-08-31 11:49:24.000000000 +0800
@@ -4,9 +4,9 @@ changes to it will be reflected in the a
paths change, Bazel will make sure to rerun the action, even though none of
declared action inputs or the action commandline changes.
-/usr/lib/gcc/x86_64-openEuler-linux/12/include
+/usr/lib/gcc/riscv64-openEuler-linux/12/include
/usr/local/include
/usr/include
/usr/include/c++/12
-/usr/include/c++/12/x86_64-openEuler-linux
+/usr/include/c++/12/riscv64-openEuler-linux
/usr/include/c++/12/backward
diff -Nurp external-x86_64/local_config_cc_toolchains/BUILD external/local_config_cc_toolchains/BUILD
--- external-x86_64/local_config_cc_toolchains/BUILD 2023-08-30 14:17:45.000000000 +0800
+++ external/local_config_cc_toolchains/BUILD 2023-08-31 11:47:52.000000000 +0800
@@ -1,10 +1,10 @@
load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS")
toolchain(
- name = "cc-toolchain-k8",
+ name = "cc-toolchain-riscv64",
exec_compatible_with = HOST_CONSTRAINTS,
target_compatible_with = HOST_CONSTRAINTS,
- toolchain = "@local_config_cc//:cc-compiler-k8",
+ toolchain = "@local_config_cc//:cc-compiler-riscv64",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)
diff -Nurp external-x86_64/local_config_platform/constraints.bzl external/local_config_platform/constraints.bzl
--- external-x86_64/local_config_platform/constraints.bzl 2023-08-30 15:04:11.000000000 +0800
+++ external/local_config_platform/constraints.bzl 2023-09-05 15:51:53.000000000 +0800
@@ -1,6 +1,6 @@
# DO NOT EDIT: automatically generated constraints list for local_config_platform
# Auto-detected host platform constraints.
HOST_CONSTRAINTS = [
- '@platforms//cpu:x86_64',
+ '@platforms//cpu:riscv64',
'@platforms//os:linux',
]
+ENV:PATH /root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin
diff -Nurp external-x86_64/local_execution_config_platform/BUILD external/local_execution_config_platform/BUILD
--- external-x86_64/local_execution_config_platform/BUILD 2023-08-28 15:02:02.000000000 +0800
+++ external/local_execution_config_platform/BUILD 2023-08-31 11:47:06.000000000 +0800
@@ -18,7 +18,7 @@ platform(
name = "platform",
visibility = ["//visibility:public"],
constraint_values = [
- "@platforms//cpu:x86_64",
+ "@platforms//cpu:riscv64",
"@platforms//os:linux",
":platform_constraint",
],

View File

@ -1,7 +1,7 @@
%global _empty_manifest_terminate_build 0
Name: tensorflow
Version: 2.10.0
Release: 1
Version: 2.12.1
Release: 2
Summary: An Open Source Machine Learning Framework for Everyone
License: Apache License 2.0
URL: https://www.tensorflow.org/
@ -9,9 +9,13 @@ 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
Patch0: remove-deps-on-libclang-gcsfs.patch
Requires: python3-future python3-numpy
Source4: aarch64_external_files.patch
Source5: riscv64_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
%description
TensorFlow is an end-to-end open source platform for machine learning. It has a comprehensive, flexible ecosystem of tools, libraries, and community resources that lets researchers push the state-of-the-art in ML and developers easily build and deploy ML-powered applications.
@ -24,7 +28,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
@ -38,20 +42,30 @@ 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
rm -rf ${extdir}/external/local_config*
%ifarch riscv64
patch -d ${extdir} -p0 < %{SOURCE5}
%endif
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
%ifarch riscv64
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 \
--define=build_with_mkl=false --define=enable_mkl=false --define=tensorflow_mkldnn_contraction_kernel=0 --define=build_with_mkl_dnn_v1_only=false --define=tensorflow_use_mkldnn=false
%else
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
%endif
./bazel-bin/tensorflow/tools/pip_package/build_pip_package dist
%install
@ -62,6 +76,21 @@ bazel --output_user_root=`pwd`/../output_user_root build --host_copt=-Wno-string
%{_bindir}/*
%changelog
* Thu Dec 12 2024 Dingli Zhang <dingli@iscas.ac.cn> - 2.12.1-2
- Add support for riscv64
* Tue Apr 02 2024 zhangxianting <zhangxianting@unionech.com> - 2.12.1-1
* Increase the upper limit version of typing_extensions to fix install, typing_extensions>=3.6.6,<4.6.0 to typing_extensions>=3.6.6,<=4.10.0
* 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
* Wed Nov 30 2022 Jincheng Miao <jincheng.miao@intel.com> - 2.10.0-2
- Modify dependency on gast
* Mon Nov 14 2022 Jincheng Miao <jincheng.miao@intel.com> - 2.10.0-1
- update version to 2.10.0 for oneDNN with AMX