Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tensorflow2 for openSUSE:Factory checked in at 2021-08-31 19:55:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tensorflow2 (Old) and /work/SRC/openSUSE:Factory/.tensorflow2.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tensorflow2" Tue Aug 31 19:55:45 2021 rev:21 rq:915219 version:2.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tensorflow2/tensorflow2.changes 2021-05-20 19:25:16.493889696 +0200 +++ /work/SRC/openSUSE:Factory/.tensorflow2.new.1899/tensorflow2.changes 2021-08-31 19:56:42.174039275 +0200 @@ -1,0 +2,134 @@ +Thu Aug 19 03:51:15 UTC 2021 - Fusion Future <qydwhotm...@gmail.com> + +- Update to 2.6.0 + Major changes are: + * Keras been split into a separate PIP package (keras), and its + code has been moved to the GitHub repositorykeras-team/keras. + The API endpoints for tf.keras stay unchanged, but are now + backed by the keras PIP package. The existing code in + tensorflow/python/keras is a staled copy and will be removed in + future release (2.7). Please remove any imports to + tensorflow.python.keras and replace them with public tf.keras + API instead. + * tf.train.experimental.enable_mixed_precision_graph_rewrite is + removed, as the API only works in graph mode and is not + customizable. The function is still accessible under + tf.compat.v1.mixed_precision.enable_mixed_precision_graph_rewrite, + but it is recommended to use the Keras mixed precision API + instead. + * tf.lite: Remove experimental.nn.dynamic_rnn, + experimental.nn.TfLiteRNNCell and + experimental.nn.TfLiteLSTMCell since they're no + longer supported. It's recommended to just use keras lstm + instead. + * tf.keras: The methods Model.to_yaml() and + keras.models.model_from_yaml have been replaced to raise a + RuntimeError as they can be abused to cause arbitrary code + execution. It is recommended to use JSON serialization instead + of YAML, or, a better alternative, serialize to H5. +- Major changes from 2.5.x: + * Support for Python3.9 has been added. + * The TF_CPP_MIN_VLOG_LEVEL environment variable has been renamed + to to TF_CPP_MAX_VLOG_LEVEL which correctly describes its + effect. +- Fixed multiple CVEs (boo#1189423): + * CVE-2021-37635 + * CVE-2021-37636 + * CVE-2021-37637 + * CVE-2021-37638 + * CVE-2021-37639 + * CVE-2021-37640 + * CVE-2021-37642 + * CVE-2021-37641 + * CVE-2021-37644 + * CVE-2021-37643 + * CVE-2021-37645 + * CVE-2021-37646 + * CVE-2021-37647 + * CVE-2021-37648 + * CVE-2021-37649 + * CVE-2021-37650 + * CVE-2021-37651 + * CVE-2021-37652 + * CVE-2021-37653 + * CVE-2021-37654 + * CVE-2021-37655 + * CVE-2021-37656 + * CVE-2021-37657 + * CVE-2021-37658 + * CVE-2021-37659 + * CVE-2021-37660 + * CVE-2021-37661 + * CVE-2021-37662 + * CVE-2021-37664 + * CVE-2021-37663 + * CVE-2021-37665 + * CVE-2021-37666 + * CVE-2021-37667 + * CVE-2021-37668 + * CVE-2021-37669 + * CVE-2021-37670 + * CVE-2021-37671 + * CVE-2021-37672 + * CVE-2021-37673 + * CVE-2021-37674 + * CVE-2021-37676 + * CVE-2021-37675 + * CVE-2021-37677 + * CVE-2021-37678 + * CVE-2021-37679 + * CVE-2021-37680 + * CVE-2021-37681 + * CVE-2021-37682 + * CVE-2021-37683 + * CVE-2021-37684 + * CVE-2021-37686 + * CVE-2021-37685 + * CVE-2021-37687 + * CVE-2021-37688 + * CVE-2021-37689 + * CVE-2021-37691 + * CVE-2021-37692 + * CVE-2021-37690 +- Updated sources: + * abseil-cpp.tar.gz + * cpuinfo.zip + * dill-0.3.2.zip + * eigen.tar.gz + * google-cloud-cpp.tar.gz + * libxsmm_1.14.tar.gz + * llvm.tar.gz + * oneDNN.tar.gz + * rules_cc.tar.gz + * rules_closure.tar.gz + * rules_docker-0.18.0.tar.gz + * ruy.zip + * tblib-1.7.0.tar.gz +- Added sources: + * ComputeLibrary.tar.gz + * oneDNN-v2.3-rc2.tar.gz + * platforms-0.0.2.tar.gz + * rules_proto.tar.gz + * tf_runtime.tar.gz + * tf_toolchains.tar.gz +- Removed sources: + * kafka-v0.11.5.tar.gz +- Add "tensorflow-2.6.0" prefix to existing patches to indicate + that patches are likely to be only applicable to a specific + version. + * fix-lite.patch -> tensorflow-2.6.0-fix-lite.patch + * numpy-tensor-small.patch -> tensorflow-2.6.0-numpy-tensor-small.patch + * removed-clog-build-as-included-in-cpuinfo.patch -> tensorflow-2.6.0-removed-clog-build-as-included-in-cpuinfo.patch + * removed-external-toolchains.patch -> tensorflow-2.6.0-removed-external-toolchains.patch + * remove-weakref.patch -> tensorflow-2.6.0-remove-weakref.patch + * tf-keras-hdf5-3.patch -> tensorflow-2.6.0-tf-keras-hdf5-3.patch +- Rebase all existing patches. +- Add tensorflow-2.6.0-compile-with-protobuf-3.16.patch to fix + build error with protobuf >= 3.16.0. (boo#1186860) + (https://github.com/protocolbuffers/protobuf/pull/8354) +- Update bazel version requirement to 3.7.2. +- Drop pcre-devel build requirement as it is not used anymore. +- Drop --incompatible_no_support_tools_in_action_inputs=false as it + is removed in bazel >= 3.6. + +------------------------------------------------------------------- Old: ---- dill-0.3.1.1.tar.gz fix-lite.patch kafka-v0.11.5.tar.gz libxsmm_1.9.tar.gz numpy-tensor-small.patch remove-weakref.patch removed-clog-build-as-included-in-cpuinfo.patch removed-external-toolchains.patch rules_docker-0.15.0.tar.gz tblib-1.3.2.tar.gz tensorflow-2.4.1.tar.gz tf-keras-hdf5-3.patch New: ---- ComputeLibrary.tar.gz dill-0.3.2.zip libxsmm_1.14.tar.gz oneDNN-v2.3-rc2.tar.gz platforms-0.0.2.tar.gz rules_docker-0.18.0.tar.gz rules_proto.tar.gz tblib-1.7.0.tar.gz tensorflow-2.6.0-compile-with-protobuf-3.16.patch tensorflow-2.6.0-fix-lite.patch tensorflow-2.6.0-numpy-tensor-small.patch tensorflow-2.6.0-remove-weakref.patch tensorflow-2.6.0-removed-clog-build-as-included-in-cpuinfo.patch tensorflow-2.6.0-removed-external-toolchains.patch tensorflow-2.6.0-tf-keras-hdf5-3.patch tensorflow-2.6.0.tar.gz tf_runtime.tar.gz tf_toolchains.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tensorflow2.spec ++++++ --- /var/tmp/diff_new_pack.TIpYlc/_old 2021-08-31 19:56:46.454045200 +0200 +++ /var/tmp/diff_new_pack.TIpYlc/_new 2021-08-31 19:56:46.458045205 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tensorflow2 +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -18,12 +18,12 @@ # %define pname tensorflow2 -%define vers 2.4.1 +%define vers 2.6.0 #%%define cand -rc4 -%define _vers 2_4_1 +%define _vers 2_6_0 %define libmaj 2 -%define libmin 4 -%define libref 1 +%define libmin 6 +%define libref 0 %define python_ver_hack python3.[0-9] %ifarch aarch64 %define mklconfig mkl_aarch64 @@ -137,25 +137,23 @@ # License17: Apache-2.0 Source17: https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip#/gemmlowp.zip # License18: BSD-3-Clause -Source18: https://github.com/hfp/libxsmm/archive/1.9.tar.gz#/libxsmm_1.9.tar.gz +Source18: https://github.com/hfp/libxsmm/archive/1.14.tar.gz#/libxsmm_1.14.tar.gz # License19: Apache-2.0 -Source19: https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz#/abseil-cpp.tar.gz +Source19: https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz#/abseil-cpp.tar.gz # License21: Apache-2.0 Source21: https://github.com/googleapis/googleapis/archive/541b1ded4abadcc38e8178680b0677f65594ea6f.zip#/googleapis.zip # License24: Apache-2.0 Source24: https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz#/highwayhash.tar.gz # License26: MPL-2.0 # NOTE: tensorflow only uses MPL-2.0 part of eigen -Source26: https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz#/eigen.tar.gz +Source26: https://gitlab.com/libeigen/eigen/-/archive/12e8d57108c50d8a63605c6eb0144c838c128337/eigen-12e8d57108c50d8a63605c6eb0144c838c128337.tar.gz#/eigen.tar.gz # License27: BSD-2-Clause Source27: https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz#/arm_neon_2_x86_sse.tar.gz Source28: https://docs.python.org/2.7/_sources/license.rst.txt#/license.rst.txt -# License34: BSD-3-Clause and Intel -Source34: https://github.com/edenhill/librdkafka/archive/v0.11.5.tar.gz#/kafka-v0.11.5.tar.gz # License35: Apache-2.0 -Source35: https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v0.4.0.tar.gz#/google-cloud-cpp.tar.gz +Source35: https://github.com/googleapis/google-cloud-cpp/archive/v1.17.1.tar.gz#/google-cloud-cpp.tar.gz # License37: Apache-2.0 -Source37: https://github.com/bazelbuild/rules_docker/archive/v0.15.0.tar.gz#/rules_docker-0.15.0.tar.gz +Source37: https://github.com/bazelbuild/rules_docker/releases/download/v0.18.0/rules_docker-v0.18.0.tar.gz#/rules_docker-0.18.0.tar.gz # License44: BSD like Source44: https://github.com/nanopb/nanopb/archive/f8ac463766281625ad710900479130c7fcb4d63b.tar.gz#/nanopb.tar.gz # License45: Python license itself, do need as sha256b have to match so could not use system one @@ -166,20 +164,20 @@ # License53: BSD like Source53: https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz # License54: Apache-2.0 WITH LLVM-exception OR NCSA -Source54: https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz#/llvm.tar.gz +Source54: https://github.com/llvm/llvm-project/archive/f7b1fa6f5ebec5780e626aa48d582f2519a01632.tar.gz#/llvm.tar.gz # License56: BSD-3-Clause Source56: https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz#/kissfft.tar.gz # Wrong rules package in Factory # License58: Apache-2.0 -Source58: https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip#/rules_cc.tar.gz +Source58: https://github.com/bazelbuild/rules_cc/archive/40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz#/rules_cc.tar.gz # Source59: Apache-2.0 Source59: https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip#/rules_android.zip # License60: BSD 2-Clause -Source60: https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip#/cpuinfo.zip +Source60: https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip#/cpuinfo.zip # License23: BSD-3-Clause Source62: https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz#/sobol_data.tar.gz # Source63: Apache-2.0 -Source63: https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip#/ruy.zip +Source63: https://github.com/google/ruy/archive/e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip#/ruy.zip # License64: Apache-2.0 Source64: https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz#/dlpack.tar.gz # License65: BSD like @@ -190,25 +188,39 @@ # License67: Apache-2.0 WITH LLVM-exception OR NCSA Source67: https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz # License68: Apache License 2.0 -Source68: https://github.com/oneapi-src/oneDNN/archive/v1.6.4.tar.gz#/oneDNN.tar.gz +Source68: https://github.com/oneapi-src/oneDNN/archive/v2.3.tar.gz#/oneDNN.tar.gz # License69: BSD-2-Clause -Source69: https://files.pythonhosted.org/packages/ec/c4/8c651f3240a73c28a218194f3d527eb2be5a173d08501060cdee84ade33f/tblib-1.3.2.tar.gz +Source69: https://files.pythonhosted.org/packages/d3/41/901ef2e81d7b1e834b9870d416cb09479e175a2be1c4aa1a9dcd0a555293/tblib-1.7.0.tar.gz # License70: BSD-3-Clause -Source70: https://files.pythonhosted.org/packages/c7/11/345f3173809cea7f1a193bfbf02403fff250a3360e0e118a1630985e547d/dill-0.3.1.1.tar.gz +Source70: https://files.pythonhosted.org/packages/e2/96/518a8ea959a734b70d2e95fef98bcbfdc7adad1c1e5f5dd9148c835205a5/dill-0.3.2.zip # License71: PSF Source71: https://files.pythonhosted.org/packages/6a/28/d32852f2af6b5ead85d396249d5bdf450833f3a69896d76eb480d9c5e406/typing_extensions-3.7.4.2.tar.gz +# License72: Apache License 2.0 +Source72: https://github.com/tensorflow/toolchains/archive/v1.1.21.tar.gz#/tf_toolchains.tar.gz +# License73: Apache License 2.0 +Source73: https://github.com/tensorflow/runtime/archive/b570a1921c9e55ac53c8972bd2bfd37cd0eb510d.tar.gz#/tf_runtime.tar.gz +# License74: MIT +Source74: https://github.com/ARM-software/ComputeLibrary/archive/v21.05.tar.gz#/ComputeLibrary.tar.gz +# License75: Apache License 2.0 +Source75: https://github.com/bazelbuild/platforms/releases/download/0.0.2/platforms-0.0.2.tar.gz +# License76: Apache License 2.0 +Source76: https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz#/rules_proto.tar.gz +# License77: Apache License 2.0 +Source77: https://github.com/oneapi-src/oneDNN/archive/v2.3-rc2.tar.gz#/oneDNN-v2.3-rc2.tar.gz Source100: https://github.com/google/googletest/archive/release-1.8.0.tar.gz -Patch10: removed-external-toolchains.patch +Patch10: tensorflow-2.6.0-removed-external-toolchains.patch # see https://github.com/tensorflow/tensorflow/pull/35943 -Patch13: remove-weakref.patch -Patch14: fix-lite.patch +Patch13: tensorflow-2.6.0-remove-weakref.patch +Patch14: tensorflow-2.6.0-fix-lite.patch # Fix from upstream for gcc10.1 -Patch20: removed-clog-build-as-included-in-cpuinfo.patch +Patch20: tensorflow-2.6.0-removed-clog-build-as-included-in-cpuinfo.patch # Fix for numpy 1.20 -- https://stackoverflow.com/questions/66373169 , https://github.com/tensorflow/tensorflow/issues/47691 -Patch21: numpy-tensor-small.patch +Patch21: tensorflow-2.6.0-numpy-tensor-small.patch # Fix for hdf5 3.0 -- https://github.com/tensorflow/tensorflow/issues/44467 -Patch22: tf-keras-hdf5-3.patch +Patch22: tensorflow-2.6.0-tf-keras-hdf5-3.patch +# PATCH-FIX-OPENSUSE tensorflow-2.6.0-compile-with-protobuf-3.16.patch https://github.com/protocolbuffers/protobuf/pull/8354 +Patch23: tensorflow-2.6.0-compile-with-protobuf-3.16.patch Requires: python3 Requires: python3-Keras-Preprocessing @@ -236,7 +248,7 @@ Provides: tensorflow %endif %if !%{is_lite} -BuildRequires: bazel == 3.4.1 +BuildRequires: bazel == 3.7.2 #BuildRequires: bazel-rules-cc-source #BuildRequires: bazel-apple-support-source #BuildRequires: bazel-rules-apple-source @@ -299,7 +311,6 @@ BuildRequires: lmdb-devel BuildRequires: memory-constraints BuildRequires: nasm -BuildRequires: pcre-devel # Requiring 3.9.1 which is the actual one in Leap 15.2 BuildRequires: protobuf-devel >= 3.9.1 BuildRequires: protobuf-java @@ -473,7 +484,6 @@ %makebazelcache %{SOURCE26} %makebazelcache %{SOURCE27} %makebazelcache %{SOURCE28} -%makebazelcache %{SOURCE34} %makebazelcache %{SOURCE35} %makebazelcache %{SOURCE44} %makebazelcache %{SOURCE45} @@ -494,16 +504,26 @@ %makebazelcache %{SOURCE69} %makebazelcache %{SOURCE70} %makebazelcache %{SOURCE71} +%makebazelcache %{SOURCE72} +%makebazelcache %{SOURCE73} +%makebazelcache %{SOURCE74} +%makebazelcache %{SOURCE75} +%makebazelcache %{SOURCE76} +%makebazelcache %{SOURCE77} # unpack tensorflow %setup -q -c -n %{pname}-%{version} %sanitize_dir -%patch10 -p 1 -%patch13 -p 1 -%patch14 -p 1 -%patch20 -p 1 -%patch21 -p 1 -%patch22 -p 1 +%patch10 -p 2 +%patch13 -p 2 +%patch14 -p 2 +%patch20 -p 2 +%patch21 -p 2 +%patch22 -p 2 +# https://github.com/protocolbuffers/protobuf/pull/8354 +if pkg-config --atleast-version 3.16.0 protobuf; then +%patch23 -p 2 +fi %define make_depend_src() test -e $(basename %{1}| sed 's/-.*//') && rmdir %{?2}%{!?2:$(basename %{1}| sed 's/-.*//')}; test -e %{2} && rmdir %{2}; tar xzf %{1}; mv $(basename %{1} | sed 's/\.tar\.gz//' ) %{?2}%{!?2:$(basename %{1}| sed 's/-.*//')} # extract bazel rules @@ -579,7 +599,6 @@ astor_archive,\ astunparse_archive,\ boringssl,\ - com_github_googleapis_googleapis,\ com_github_googlecloudplatform_google_cloud_cpp,\ com_github_grpc_grpc,\ com_google_protobuf,\ @@ -601,7 +620,6 @@ opt_einsum_archive,\ org_sqlite,\ pasta,\ - pcre,\ png,\ pybind11,\ six_archive,\ @@ -657,7 +675,6 @@ --config=%{mklconfig} \\\ --config=v2 \\\ --config=noaws \\\ - --incompatible_no_support_tools_in_action_inputs=false \\\ --override_repository="upb=/usr/share/bazel-workspaces/upb" \\\ --override_repository="bazel_skylib=/usr/src/bazel-skylib"\\\ --override_repository="bazel_toolchains=/home/abuild/rpmbuild/SOURCES/bazel-toolchains" \\\ ++++++ abseil-cpp.tar.gz ++++++ ++++ 68885 lines of diff (skipped) ++++++ cpuinfo.zip ++++++ Binary files /var/tmp/diff_new_pack.TIpYlc/_old and /var/tmp/diff_new_pack.TIpYlc/_new differ ++++++ eigen.tar.gz ++++++ ++++ 40789 lines of diff (skipped) ++++++ google-cloud-cpp.tar.gz ++++++ ++++ 379263 lines of diff (skipped) ++++++ libxsmm_1.9.tar.gz -> libxsmm_1.14.tar.gz ++++++ ++++ 362421 lines of diff (skipped) ++++++ license.rst.txt ++++++ --- /var/tmp/diff_new_pack.TIpYlc/_old 2021-08-31 19:56:48.958048666 +0200 +++ /var/tmp/diff_new_pack.TIpYlc/_new 2021-08-31 19:56:48.958048666 +0200 @@ -22,7 +22,7 @@ In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same year, the PythonLabs team moved to Digital Creations (now Zope Corporation; see -https://www.zope.org/). In 2001, the Python Software Foundation (PSF, see +http://www.zope.com/). In 2001, the Python Software Foundation (PSF, see https://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation is a sponsoring member of the PSF. @@ -87,7 +87,7 @@ analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright ?? 2001-2020 Python Software Foundation; All Rights + copyright, i.e., "Copyright ?? 2001-2019 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. ++++++ llvm.tar.gz ++++++ /work/SRC/openSUSE:Factory/tensorflow2/llvm.tar.gz /work/SRC/openSUSE:Factory/.tensorflow2.new.1899/llvm.tar.gz differ: char 13, line 1 ++++++ oneDNN.tar.gz ++++++ /work/SRC/openSUSE:Factory/tensorflow2/oneDNN.tar.gz /work/SRC/openSUSE:Factory/.tensorflow2.new.1899/oneDNN.tar.gz differ: char 13, line 1 ++++++ rules_cc.tar.gz ++++++ ++++ 22662 lines of diff (skipped) ++++++ rules_docker-0.15.0.tar.gz -> rules_docker-0.18.0.tar.gz ++++++ ++++ 8601 lines of diff (skipped) ++++++ ruy.zip ++++++ Binary files /var/tmp/diff_new_pack.TIpYlc/_old and /var/tmp/diff_new_pack.TIpYlc/_new differ ++++++ tblib-1.3.2.tar.gz -> tblib-1.7.0.tar.gz ++++++ ++++ 3008 lines of diff (skipped) ++++++ tensorflow-2.6.0-compile-with-protobuf-3.16.patch ++++++ --- a/tensorflow-2.6.0/tensorflow/core/kernels/example_parsing_ops.cc +++ b/tensorflow-2.6.0/tensorflow/core/kernels/example_parsing_ops.cc @@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKer resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out); OP_REQUIRES(ctx, status.ok(), errors::InvalidArgument("Error while parsing JSON: ", - string(status.error_message()))); + string(status.message()))); } } ++++++ tensorflow-2.6.0-fix-lite.patch ++++++ --- a/tensorflow-2.6.0/tensorflow/lite/tools/make/Makefile +++ b/tensorflow-2.6.0/tensorflow/lite/tools/make/Makefile @@ -48,11 +48,12 @@ INCLUDES := \ -I$(OBJDIR) # This is at the end so any globally-installed frameworks like protobuf don't # override local versions in the source tree. -INCLUDES += -I/usr/local/include +INCLUDES += -I/usr/include # These are the default libraries needed, but they can be added to or # overridden by the platform-specific settings in target makefiles. LIBS := \ +-lflatbuffers \ -lstdc++ \ -lpthread \ -lm \ @@ -162,8 +163,7 @@ $(wildcard tensorflow/lite/tools/optimiz $(PROFILER_SRCS) \ tensorflow/lite/tools/make/downloads/farmhash/src/farmhash.cc \ tensorflow/lite/tools/make/downloads/fft2d/fftsg.c \ -tensorflow/lite/tools/make/downloads/fft2d/fftsg2d.c \ -tensorflow/lite/tools/make/downloads/flatbuffers/src/util.cpp +tensorflow/lite/tools/make/downloads/fft2d/fftsg2d.c CORE_CC_ALL_SRCS += \ $(shell find tensorflow/lite/tools/make/downloads/absl/absl/ \ -type f -name \*.cc | grep -v test | grep -v benchmark | grep -v synchronization | grep -v debugging | grep -v hash | grep -v flags | grep -v random) ++++++ tensorflow-2.6.0-numpy-tensor-small.patch ++++++ --- a/tensorflow-2.6.0/tensorflow/python/ops/array_ops.py +++ b/tensorflow-2.6.0/tensorflow/python/ops/array_ops.py @@ -36,6 +36,7 @@ from tensorflow.python.framework import from tensorflow.python.framework.constant_op import constant from tensorflow.python.ops import gen_array_ops from tensorflow.python.ops import gen_math_ops +from tensorflow.python.ops import math_ops # go/tf-wildcard-import # pylint: disable=wildcard-import from tensorflow.python.ops.gen_array_ops import * @@ -2897,7 +2898,7 @@ def matrix_set_diag( def _constant_if_small(value, shape, dtype, name): try: - if np.prod(shape) < 1000: + if math_ops.reduce_prod(shape) < 1000: return constant(value, shape=shape, dtype=dtype, name=name) except (NotImplementedError, TypeError): # Happens when shape is a Tensor, list with Tensor elements, etc. ++++++ tensorflow-2.6.0-remove-weakref.patch ++++++ --- a/tensorflow-2.6.0/tensorflow/python/util/BUILD +++ b/tensorflow-2.6.0/tensorflow/python/util/BUILD @@ -458,7 +458,6 @@ py_library( "//tensorflow/python:global_test_configuration", ":tf_decorator", ":tf_export", - "@org_python_pypi_backports_weakref", "@com_google_protobuf//:protobuf_python", "//third_party/py/numpy", "@six_archive//:six", --- a/tensorflow-2.6.0/tensorflow/tools/pip_package/BUILD +++ b/tensorflow-2.6.0/tensorflow/tools/pip_package/BUILD @@ -215,7 +215,6 @@ filegroup( "@nasm//:LICENSE", "@nsync//:LICENSE", "@opt_einsum_archive//:LICENSE", - "@org_python_pypi_backports_weakref//:LICENSE", "@pasta//:LICENSE", "@png//:LICENSE", "@six_archive//:LICENSE", --- a/tensorflow-2.6.0/tensorflow/workspace2.bzl +++ b/tensorflow-2.6.0/tensorflow/workspace2.bzl @@ -517,17 +517,6 @@ def _tf_repositories(): ) tf_http_archive( - name = "org_python_pypi_backports_weakref", - build_file = "//third_party:backports_weakref.BUILD", - sha256 = "8813bf712a66b3d8b85dc289e1104ed220f1878cf981e2fe756dfaabe9a82892", - strip_prefix = "backports.weakref-1.0rc1/src", - urls = [ - "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz";, - "https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz";, - ], - ) - - tf_http_archive( name = "dill_archive", build_file = "//third_party:dill.BUILD", system_build_file = "//third_party/systemlibs:dill.BUILD", --- a/tensorflow-2.6.0/third_party/backports_weakref.BUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Description: -# Backport of new features in Python's weakref module. - -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) # Python 2.0 - -py_library( - name = "org_python_pypi_backports_weakref", - srcs = [ - "backports/__init__.py", - "backports/weakref.py", - ], - srcs_version = "PY3", -) - -genrule( - name = "license", - srcs = ["@org_python_license"], - outs = ["LICENSE"], - cmd = "cp $< $@", -) ++++++ tensorflow-2.6.0-removed-clog-build-as-included-in-cpuinfo.patch ++++++ --- a/tensorflow-2.6.0/tensorflow/tools/pip_package/BUILD +++ b/tensorflow-2.6.0/tensorflow/tools/pip_package/BUILD @@ -224,7 +224,6 @@ filegroup( "@termcolor_archive//:COPYING.txt", "@typing_extensions_archive//:LICENSE", "@zlib//:zlib.h", - "@clog//:LICENSE", "@cpuinfo//:LICENSE", ] + select({ "//tensorflow:android": [], --- a/tensorflow-2.6.0/tensorflow/workspace2.bzl +++ b/tensorflow-2.6.0/tensorflow/workspace2.bzl @@ -19,7 +19,6 @@ load("//tensorflow/tools/def_file_filter load("//third_party/FP16:workspace.bzl", FP16 = "repo") load("//third_party/absl:workspace.bzl", absl = "repo") load("//third_party/aws:workspace.bzl", aws = "repo") -load("//third_party/clog:workspace.bzl", clog = "repo") load("//third_party/cpuinfo:workspace.bzl", cpuinfo = "repo") load("//third_party/dlpack:workspace.bzl", dlpack = "repo") load("//third_party/eigen3:workspace.bzl", eigen3 = "repo") @@ -55,7 +54,6 @@ def _initialize_third_party(): FP16() absl() aws() - clog() cpuinfo() dlpack() eigen3() --- a/tensorflow-2.6.0/third_party/clog/BUILD +++ /dev/null @@ -1 +0,0 @@ -# This empty BUILD file is required to make Bazel treat this directory as a package. --- a/tensorflow-2.6.0/third_party/clog/BUILD.bazel +++ /dev/null @@ -1,55 +0,0 @@ -# Description: -# C-style (a-la printf) logging library - -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -exports_files(["LICENSE"]) - -cc_library( - name = "clog", - srcs = [ - "deps/clog/src/clog.c", - ], - hdrs = [ - "deps/clog/include/clog.h", - ], - copts = select({ - ":windows": [], - "//conditions:default": ["-Wno-unused-result"], - }), - defines = select({ - # When linkstatic=False, we need default visibility - ":macos_x86_64": ["CLOG_VISIBILITY="], - "//conditions:default": [], - }), - linkopts = select({ - ":android": ["-llog"], - "//conditions:default": [], - }), - linkstatic = select({ - # https://github.com/bazelbuild/bazel/issues/11552 - ":macos_x86_64": False, - "//conditions:default": True, - }), - strip_include_prefix = "deps/clog/include", -) - -config_setting( - name = "android", - values = {"crosstool_top": "//external:android/crosstool"}, -) - -config_setting( - name = "windows", - values = {"cpu": "x64_windows"}, -) - -config_setting( - name = "macos_x86_64", - values = { - "apple_platform_type": "macos", - "cpu": "darwin", - }, -) --- a/tensorflow-2.6.0/third_party/clog/workspace.bzl +++ /dev/null @@ -1,15 +0,0 @@ -"""Loads the clog library, used by cpuinfo and XNNPACK.""" - -load("//third_party:repo.bzl", "tf_http_archive") - -def repo(): - tf_http_archive( - name = "clog", - strip_prefix = "cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970", - sha256 = "3f2dc1970f397a0e59db72f9fca6ff144b216895c1d606f6c94a507c1e53a025", - urls = [ - "https://storage.googleapis.com/mirror.tensorflow.org/github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz";, - "https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz";, - ], - build_file = "//third_party/clog:BUILD.bazel", - ) --- a/tensorflow-2.6.0/third_party/cpuinfo/BUILD.bazel +++ b/tensorflow-2.6.0/third_party/cpuinfo/BUILD.bazel @@ -160,7 +160,7 @@ cc_library( "src/arm/midr.h", ], deps = [ - "@clog", + ":cpuinfo_clog", ], ) @@ -185,6 +185,35 @@ cc_library( ], ) +cc_library( + name = "cpuinfo_clog", + srcs = [ + "deps/clog/src/clog.c", + ], + hdrs = [ + "deps/clog/include/clog.h", + ], + copts = select({ + ":windows_x86_64": [], + "//conditions:default": ["-Wno-unused-result"], + }), + defines = select({ + # When linkstatic=False, we need default visibility + ":macos_x86_64": ["CLOG_VISIBILITY="], + "//conditions:default": [], + }), + linkopts = select({ + ":android_arm64": ["-llog"], + "//conditions:default": [], + }), + linkstatic = select({ + # https://github.com/bazelbuild/bazel/issues/11552 + ":macos_x86_64": False, + "//conditions:default": True, + }), + strip_include_prefix = "deps/clog/include", +) + ############################# Build configurations ############################# config_setting( ++++++ tensorflow-2.6.0-removed-external-toolchains.patch ++++++ --- a/tensorflow-2.6.0/tensorflow/workspace0.bzl +++ b/tensorflow-2.6.0/tensorflow/workspace0.bzl @@ -5,7 +5,6 @@ load("@bazel_tools//tools/build_defs/rep load("@bazel_toolchains//repositories:repositories.bzl", bazel_toolchains_repositories = "repositories") load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies") load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") -load("@local_config_android//:android.bzl", "android_workspace") load("@rules_cc//cc:repositories.bzl", "rules_cc_toolchains") def _tf_bind(): @@ -60,24 +59,6 @@ def workspace(): ) http_archive( - name = "mobile_ssd", - build_file = "//:models.BUILD", - sha256 = "bddd81ea5c80a97adfac1c9f770e6f55cbafd7cce4d3bbe15fbeb041e6b8f3e8", - urls = [ - "https://storage.googleapis.com/download.tensorflow.org/models/object_detection/ssd_mobilenet_v1_android_export.zip";, - ], - ) - - http_archive( - name = "mobile_multibox", - build_file = "//:models.BUILD", - sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96", - urls = [ - "https://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip";, - ], - ) - - http_archive( name = "stylize", build_file = "//:models.BUILD", sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa", @@ -111,7 +92,6 @@ def workspace(): # `git_repository` rules above, the following call will skip redefining them. swift_rules_dependencies() - android_workspace() # If a target is bound twice, the later one wins, so we have to do tf bindings # at the end of the WORKSPACE file. --- a/tensorflow-2.6.0/tensorflow/workspace1.bzl +++ b/tensorflow-2.6.0/tensorflow/workspace1.bzl @@ -1,6 +1,5 @@ """TensorFlow workspace initialization. Consult the WORKSPACE on how to use it.""" -load("//third_party/android:android_configure.bzl", "android_configure") load("//third_party/toolchains/preconfig/generate:archives.bzl", "bazel_toolchains_archive") load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories") @@ -13,7 +12,6 @@ def workspace(): closure_repositories() bazel_toolchains_archive() - android_configure(name = "local_config_android") grpc_deps() ++++++ tensorflow-2.6.0-tf-keras-hdf5-3.patch ++++++ --- a/tensorflow-2.6.0/tensorflow/python/keras/saving/hdf5_format.py +++ b/tensorflow-2.6.0/tensorflow/python/keras/saving/hdf5_format.py @@ -681,7 +681,7 @@ def load_weights_from_hdf5_group(f, laye for name in layer_names: g = f[name] weight_names = load_attributes_from_hdf5_group(g, 'weight_names') - if weight_names: + if np.any(weight_names): filtered_layer_names.append(name) layer_names = filtered_layer_names if len(layer_names) != len(filtered_layers): ++++++ tensorflow-2.4.1.tar.gz -> tensorflow-2.6.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/tensorflow2/tensorflow-2.4.1.tar.gz /work/SRC/openSUSE:Factory/.tensorflow2.new.1899/tensorflow-2.6.0.tar.gz differ: char 12, line 1
