Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Jul 2021 00:31:46 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3dccfaa0cdd5 - main - science/py-tensorflow: Update 1.14.0 -> 1.15.5
Message-ID:  <202107090031.1690VkRu031237@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3dccfaa0cdd58e4ba5cde9d68ddf1351b55db1ef

commit 3dccfaa0cdd58e4ba5cde9d68ddf1351b55db1ef
Author:     Anthony Donnelly <amzo1337@gmail.com>
AuthorDate: 2021-07-09 00:27:30 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-07-09 00:31:37 +0000

    science/py-tensorflow: Update 1.14.0 -> 1.15.5
    
    PR:             250646
---
 science/py-tensorflow/Makefile                     | 40 ++++++++------
 science/py-tensorflow/Makefile.MASTER_SITES        | 59 +++++++++++----------
 science/py-tensorflow/distinfo                     | 56 +++++++++++---------
 science/py-tensorflow/files/bazelrc                |  2 +
 science/py-tensorflow/files/patch-WORKSPACE        | 61 ++++++++++++++++++++++
 .../patch-tensorflow_compiler_mlir_lite_BUILD      | 10 ++++
 ...ensorflow_compiler_mlir_lite_quantization_BUILD |  8 +++
 ...patch-tensorflow_compiler_mlir_tensorflow_BUILD | 10 ++++
 .../files/patch-tensorflow_contrib_bigtable_BUILD  | 20 +++++++
 ... patch-tensorflow_contrib_boosted__trees_BUILD} |  8 +--
 .../patch-tensorflow_contrib_ffmpeg_default_BUILD  | 10 ++++
 ...e_kernels_client_ignite__plain__client__unix.cc |  6 +--
 ... => patch-tensorflow_contrib_makefile_Makefile} | 16 +++---
 .../files/patch-tensorflow_core_BUILD              | 14 ++---
 ...-tensorflow_core_distributed__runtime_rpc_BUILD | 10 ++++
 ...e_distributed__runtime_rpc_grpc__server__lib.cc | 15 ++++++
 .../patch-tensorflow_core_platform_cloud_BUILD     | 10 ++++
 ...nsorflow_core_platform_cloud_gcs__dns__cache.cc |  6 +--
 ...sorflow_core_platform_default_build__config.bzl | 13 -----
 .../patch-tensorflow_core_platform_posix_env.cc    | 31 -----------
 .../patch-tensorflow_core_profiler_internal_BUILD  | 10 ++++
 ...patch-tensorflow_core_profiler_rpc_client_BUILD | 19 +++++++
 ...atch-tensorflow_core_protobuf_autotuning.proto} |  6 +--
 ..._micro_tools_make_targets_freebsd__makefile.inc |  4 +-
 .../patch-tensorflow_lite_kernels_internal_BUILD   | 11 ++++
 .../patch-tensorflow_lite_kernels_internal_build   | 11 ----
 ...nsorflow_lite_python_interpreter__wrapper_BUILD | 10 ++++
 .../files/patch-tensorflow_lite_tools_BUILD        | 10 ++++
 ...e => patch-tensorflow_lite_tools_make_Makefile} |  6 +--
 ...w_lite_tools_make_targets_freebsd__makefile.inc |  4 +-
 .../patch-tensorflow_lite_tools_optimize_BUILD     | 20 +++++++
 ...ensorflow_lite_tools_optimize_calibration_BUILD | 34 ++++++++++++
 ...tch-tensorflow_python_eager_pywrap__tfe__src.cc | 20 +++++++
 .../patch-tensorflow_python_lib_core_bfloat16.cc   | 11 ++++
 ...flow_python_lib_core_ndarray__tensor__bridge.cc | 11 ++++
 ...flow_stream__executor_stream__executor__pimpl.h | 10 ++++
 .../files/patch-tensorflow_tensorflow.bzl          | 22 ++++----
 ...d => patch-tensorflow_tools_lib__package_BUILD} |  8 +--
 .../patch-tensorflow_tools_pip__package_build      | 10 ----
 .../files/patch-tensorflow_workspace.bzl           | 20 +++----
 ...ld.bazel => patch-third__party_aws_BUILD.bazel} |  8 +--
 .../patch-third__party_com__google__absl.BUILD     | 13 +++++
 .../patch-third__party_flatbuffers_BUILD.system    | 18 +++++++
 .../files/patch-third__party_mlir_BUILD            | 10 ++++
 .../patch-third__party_systemlibs_enum34.build     | 17 ------
 ...patch-third__party_systemlibs_functools32.BUILD | 18 +++++++
 .../files/patch-third__party_systemlibs_grpc.BUILD | 11 ++++
 .../files/patch-third__party_systemlibs_grpc.build | 11 ----
 ...=> patch-third__party_systemlibs_jsoncpp.BUILD} | 16 +++---
 .../patch-third__party_systemlibs_protobuf.bzl     |  6 +--
 .../files/patch-third__party_systemlibs_swig.build | 11 ----
 ...-third__party_systemlibs_syslibs__configure.bzl | 12 ++---
 .../patch-third_party_gpus_rocm_configure.bzl      | 11 ----
 53 files changed, 558 insertions(+), 266 deletions(-)

diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index 0575e8928dd3..63d53cbe46dd 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tensorflow
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.14.0
-PORTREVISION=	18
+DISTVERSION=	1.15.5
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
@@ -13,7 +13,6 @@ COMMENT=	Computation using data flow graphs for scalable machine learning
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		fails to build
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
@@ -21,7 +20,8 @@ BUILD_DEPENDS=	${RUN_DEPENDS} \
 		bash:shells/bash \
 		cython:lang/cython \
 		swig:devel/swig \
-		bazel:devel/bazel029
+		bazel:devel/bazel029 \
+		git:devel/git
 LIB_DEPENDS=	libsnappy.so:archivers/snappy \
 		liblmdb.so:databases/lmdb \
 		libsqlite3.so:databases/sqlite3 \
@@ -36,10 +36,10 @@ LIB_DEPENDS=	libsnappy.so:archivers/snappy \
 		libpng.so:graphics/png \
 		libgpr.so:devel/grpc \
 		libcurl.so:ftp/curl \
-		libgoogle_cloud_cpp_common.so:devel/google-cloud-cpp \
+		libgoogle_cloud_cpp_common.so:devel/google-cloud-cpp117 \
 		libflatbuffers.so:devel/flatbuffers \
 		libdouble-conversion.so:devel/double-conversion
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}absl>=0.7.1:devel/py-absl@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}absl>=0.7.0:devel/py-absl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}astor>=0.5:devel/py-astor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gast>=0.2.2:devel/py-gast@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
@@ -52,7 +52,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}absl>=0.7.1:devel/py-absl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=1.11.2:devel/py-wrapt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR}
 
-USES=		python:3.6+ shebangfix jpeg ssl
+USES=		python:3.7+ shebangfix jpeg ssl compiler:c++17-lang
 SHEBANG_GLOB=	*.py
 USE_GITHUB=	yes
 USE_PYTHON=	distutils
@@ -91,10 +91,16 @@ post-patch:
 	@${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" ${WRKDIR}/bazelrc \
 		${WRKSRC}/tensorflow/tensorflow.bzl ${WRKSRC}/.bazelrc \
 		${WRKSRC}/tensorflow/core/BUILD \
-		${WRKSRC}/third_party/systemlibs/protobuf.bzl
+		${WRKSRC}/third_party/systemlibs/protobuf.bzl \
+		${WRKSRC}/tensorflow/core/profiler/rpc/client/BUILD \
+		${WRKSRC}/WORKSPACE \
+		${WRKSRC}/tensorflow/core/profiler/internal/BUILD \
+		${WRKSRC}/tensorflow/contrib/ffmpeg/default/BUILD \
+		${WRKSRC}/third_party/flatbuffers/BUILD.system
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} \
+		BAZEL_CXXOPTS="-std=c++1z" \
 		PYTHON_BIN_PATH=${PYTHON_CMD} \
 		PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \
 		TF_NEED_JEMALLOC=0 \
@@ -121,22 +127,22 @@ do-configure:
 		TF_IGNORE_MAX_BAZEL_VERSION=1 \
 		CC_OPT_FLAGS="-march=${CPU_TARGET} -I${LOCALBASE}/include" \
 		PREFIX="${LOCALBASE}" \
-		TF_SYSTEM_LIBS="absl_py astor_archive boringssl com_github_googleapis_googleapis com_github_googlecloudplatform_google_cloud_cpp com_google_protobuf \
-				com_google_protobuf_cc com_googlesource_code_re2 curl cython double_conversion enum34_archive flatbuffers gast_archive gif_archive \
-				grpc hwloc icu jpeg jsoncpp_git keras_applications_archive lmdb nasm nsync org_sqlite pasta pcre png_archive protobuf_archive \
-				six_archive snappy swig termcolor_archive wrapt zlib_archive" \
+		TF_SYSTEM_LIBS="absl_py astor_archive boringssl com_github_googleapis_googleapis com_github_googlecloudplatform_google_cloud_cpp com_google_protobuf com_googlesource_code_re2 \
+			curl cython double_conversion enum34_archive flatbuffers functools32_archive gast_archive gif_archive grpc hwloc icu jpeg jsoncpp_git keras_applications_archive \
+			lmdb nasm nsync opt_einsum_archive org_sqlite pasta pcre png_archive six_archive snappy swig termcolor_archive wrapt zlib_archive" \
 		./configure
 
 do-build:
 	@cd ${WRKSRC} && \
-		bazel --bazelrc="${WRKDIR}/bazelrc" ${BAZEL_BOOT} build ${BAZEL_COPT} --host_copt="-I${LOCALBASE}/include" \
-		--host_linkopt="-L${LOCALBASE}/lib" --linkopt="-L${LOCALBASE}/lib" --config=opt \
-		--incompatible_no_support_tools_in_action_inputs=false \
-		--verbose_failures -s \
+		bazel --bazelrc="${WRKDIR}/bazelrc" ${BAZEL_BOOT} build --jobs 16 ${BAZEL_COPT} --host_copt="-I${LOCALBASE}/include" \
+		--host_linkopt="-L${LOCALBASE}/lib" --linkopt="-L${LOCALBASE}/lib" --config=c++17 --copt="-I${LOCALBASE}/include" \
+		--cxxopt="--std=c++1z" --verbose_failures -s \
+		--distdir=${WORKDIR}/bazel-dist \
+		//tensorflow:libtensorflow_framework.so \
 		//tensorflow:libtensorflow.so \
 		//tensorflow:libtensorflow_cc.so \
-		//tensorflow:install_headers \
 		//tensorflow/tools/pip_package:build_pip_package
+
 	@cd ${WRKSRC} && ${SETENV} TMPDIR=${WRKDIR} \
 		bazel-bin/tensorflow/tools/pip_package/build_pip_package \
 		${WRKDIR}/whl
diff --git a/science/py-tensorflow/Makefile.MASTER_SITES b/science/py-tensorflow/Makefile.MASTER_SITES
index 10dd9c5ee5f6..880ca476664f 100644
--- a/science/py-tensorflow/Makefile.MASTER_SITES
+++ b/science/py-tensorflow/Makefile.MASTER_SITES
@@ -1,34 +1,39 @@
-DISTFILES+=	v0.18.tar.gz:mkldnn \
-		daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz:abseil \
-		a0d250e79c79.tar.gz:eigen \
-		12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip:gemmlowp \
+DISTFILES+=	fft2d.tgz:oourafft2d \
+		49177915a14a.tar.gz:eigen \
+		43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz:abseil \
+		bazel-skylib.0.8.0.tar.gz:skylib \
+		92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz:toolchain \
+		308b05b2419edb5c8ee0471b67a40403df940149.tar.gz:closure \
+		0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip:rulescc \
+		rules_docker-v0.10.0.tar.gz:docker \
+		rules_swift.0.11.1.tar.gz:swift \
 		816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz:farmhash \
-		cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz:closure \
-		94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz:toolchain \
-		b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz:docker \
-		0.6.0.tar.gz:skylib \
-		rules_swift.0.9.0.tar.gz:swift \
-		fft.tgz:fft \
+		12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip:gemmlowp \
+		fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz:highwayhash \
+		36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz:kissfft \
+		94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz:bazel \
+		v2.3.0.tar.gz:pybind \
+		7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz:llvm \
 		1200fe90bb174a6224a525ee60148671a786a71f.tar.gz:neon \
-		fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz:highway \
 		license.rst.txt:license \
-		backports.weakref-1.0rc1.tar.gz:weakref \
-		0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip:rulescc
+		backports.weakref-1.0rc1.tar.gz:weakref 
 
-
-MASTER_SITES+=	https://github.com/intel/mkl-dnn/archive/:mkldnn \
+MASTER_SITES+=	http://www.kurims.kyoto-u.ac.jp/~ooura/:oourafft2d \
+		https://storage.googleapis.com/mirror.tensorflow.org/bitbucket.org/eigen/eigen/get/:eigen \
 		https://github.com/abseil/abseil-cpp/archive/:abseil \
-		https://bitbucket.org/eigen/eigen/get/:eigen \
-		https://github.com/google/gemmlowp/archive/:gemmlowp \
-		https://github.com/google/farmhash/archive/:farmhash \
+		https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/:skylib \
+		https://github.com/bazelbuild/bazel-toolchains/archive/:toolchain \
 		https://github.com/bazelbuild/rules_closure/archive/:closure \
-		http://mirror.tensorflow.org/github.com/bazelbuild/bazel-toolchains/archive/:toolchain \
-		https://github.com/bazelbuild/rules_docker/archive/:docker \
-		https://github.com/bazelbuild/bazel-skylib/archive/:skylib \
-		https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/:swift \
-		http://www.kurims.kyoto-u.ac.jp/~ooura/:fft \
-		http://mirror.tensorflow.org/github.com/intel/ARM_NEON_2_x86_SSE/archive/:neon \
-		http://mirror.tensorflow.org/github.com/google/highwayhash/archive/:highway \
-		http://mirror.tensorflow.org/docs.python.org/2.7/_sources/:license \
+		https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/:docker \
+		https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/:swift \
+		https://github.com/google/farmhash/archive/:farmhash \
+		https://github.com/google/gemmlowp/archive/:gemmlowp \
+		https://github.com/google/highwayhash/archive/:highwayhash \
+		https://github.com/mborgerding/kissfft/archive/:kissfft \
+		https://github.com/nlopezgi/bazel-toolchains/archive/:bazel \
+		https://github.com/pybind/pybind11/archive/:pybind \
+		https://github.com/llvm-mirror/llvm/archive/:llvm \
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/:neon \
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/:license \
 		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/:weakref \
-		https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/:rulescc
+		https://github.com/bazelbuild/rules_cc/archive/:rulescc
diff --git a/science/py-tensorflow/distinfo b/science/py-tensorflow/distinfo
index 8b8542577643..82662ad2bd6f 100644
--- a/science/py-tensorflow/distinfo
+++ b/science/py-tensorflow/distinfo
@@ -1,35 +1,41 @@
-TIMESTAMP = 1570325271
-SHA256 (tensorflow/v0.18.tar.gz) = 38a1c02104ee9f630c1ad68164119cd58ad0aaf59e04ccbe7bd5781add7bfbea
-SIZE (tensorflow/v0.18.tar.gz) = 1497239
-SHA256 (tensorflow/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz) = 56cd3fbbbd94468a5fff58f5df2b6f9de7a0272870c61f6ca05b869934f4802a
-SIZE (tensorflow/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz) = 1275955
-SHA256 (tensorflow/a0d250e79c79.tar.gz) = 0dde8fb87f5dad2e409c9f4ea1bebc54e694cf4f3b633081b0d51a55c00f9c9f
-SIZE (tensorflow/a0d250e79c79.tar.gz) = 2468318
-SHA256 (tensorflow/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip) = 6678b484d929f2d0d3229d8ac4e3b815a950c86bb9f17851471d143f6d4f7834
-SIZE (tensorflow/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip) = 935628
+TIMESTAMP = 1625741393
+SHA256 (tensorflow/fft2d.tgz) = ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9
+SIZE (tensorflow/fft2d.tgz) = 54434
+SHA256 (tensorflow/49177915a14a.tar.gz) = b3e1c3df05377d22bb960f54acce8d7018bc9477f37e8f39f9d3c784f5aaa87f
+SIZE (tensorflow/49177915a14a.tar.gz) = 2496808
+SHA256 (tensorflow/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz) = acd93f6baaedc4414ebd08b33bebca7c7a46888916101d8c0b8083573526d070
+SIZE (tensorflow/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz) = 1281523
+SHA256 (tensorflow/bazel-skylib.0.8.0.tar.gz) = 2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc701f7818e
+SIZE (tensorflow/bazel-skylib.0.8.0.tar.gz) = 72941
+SHA256 (tensorflow/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz) = 88e818f9f03628eef609c8429c210ecf265ffe46c2af095f36c7ef8b1855fef5
+SIZE (tensorflow/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz) = 660374
+SHA256 (tensorflow/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz) = 5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9
+SIZE (tensorflow/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz) = 464906
+SHA256 (tensorflow/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip) = 36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89
+SIZE (tensorflow/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip) = 72534
+SHA256 (tensorflow/rules_docker-v0.10.0.tar.gz) = 7d453450e1eb70e238eea6b31f4115607ec1200e91afea01c25f9804f37e39c8
+SIZE (tensorflow/rules_docker-v0.10.0.tar.gz) = 549649
+SHA256 (tensorflow/rules_swift.0.11.1.tar.gz) = 96a86afcbdab215f8363e65a10cf023b752e90b23abf02272c4fc668fcb70311
+SIZE (tensorflow/rules_swift.0.11.1.tar.gz) = 107453
 SHA256 (tensorflow/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz) = 6560547c63e4af82b0f202cb710ceabb3f21347a4b996db565a411da5b17aba0
 SIZE (tensorflow/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz) = 467122
-SHA256 (tensorflow/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz) = e0a111000aeed2051f29fcc7a3f83be3ad8c6c93c186e64beb1ad313f0c7f9f9
-SIZE (tensorflow/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz) = 462798
+SHA256 (tensorflow/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip) = 6678b484d929f2d0d3229d8ac4e3b815a950c86bb9f17851471d143f6d4f7834
+SIZE (tensorflow/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip) = 935628
+SHA256 (tensorflow/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz) = 9c3e0e87d581feeb0c18d814d98f170ff23e62967a2bd6855847f0b2fe598a37
+SIZE (tensorflow/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz) = 138574
+SHA256 (tensorflow/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz) = 42b7ef406d5aa2d57a7b3b56fc44e8ad3011581692458a69958a911071efdcf2
+SIZE (tensorflow/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz) = 44744
 SHA256 (tensorflow/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz) = 109a99384f9d08f9e75136d218ebaebc68cc810c56897aea2224c57932052d30
 SIZE (tensorflow/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz) = 505681
-SHA256 (tensorflow/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz) = 4abb48f56b838957c9c72ac511b44f79612fcf39d08338fad14a8e3f6b0572ea
-SIZE (tensorflow/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz) = 460121
-SHA256 (tensorflow/0.6.0.tar.gz) = eb5c57e4c12e68c0c20bc774bfbc60a568e800d025557bc4ea022c6479acc867
-SIZE (tensorflow/0.6.0.tar.gz) = 29330
-SHA256 (tensorflow/rules_swift.0.9.0.tar.gz) = 9efe9699e9765e6b4a5e063e4a08f6b163cccaf0443f775d935baf5c3cd6ed0e
-SIZE (tensorflow/rules_swift.0.9.0.tar.gz) = 105918
-SHA256 (tensorflow/fft.tgz) = 52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296
-SIZE (tensorflow/fft.tgz) = 72213
+SHA256 (tensorflow/v2.3.0.tar.gz) = 0f34838f2c8024a6765168227ba587b3687729ebf03dc912f88ff75c7aa9cfe8
+SIZE (tensorflow/v2.3.0.tar.gz) = 564520
+SHA256 (tensorflow/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz) = 599b89411df88b9e2be40b019e7ab0f7c9c10dd5ab1c948cd22e678cc8f8f352
+SIZE (tensorflow/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz) = 50144723
 SHA256 (tensorflow/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz) = 213733991310b904b11b053ac224fee2d4e0179e46b52fe7f8735b8831e04dcc
 SIZE (tensorflow/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz) = 100612
-SHA256 (tensorflow/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz) = 9c3e0e87d581feeb0c18d814d98f170ff23e62967a2bd6855847f0b2fe598a37
-SIZE (tensorflow/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz) = 138574
 SHA256 (tensorflow/license.rst.txt) = e76cacdf0bdd265ff074ccca03671c33126f597f39d0ed97bc3e5673d9170cf6
 SIZE (tensorflow/license.rst.txt) = 45132
 SHA256 (tensorflow/backports.weakref-1.0rc1.tar.gz) = 8813bf712a66b3d8b85dc289e1104ed220f1878cf981e2fe756dfaabe9a82892
 SIZE (tensorflow/backports.weakref-1.0rc1.tar.gz) = 7761
-SHA256 (tensorflow/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip) = 36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89
-SIZE (tensorflow/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip) = 72534
-SHA256 (tensorflow/tensorflow-tensorflow-v1.14.0_GH0.tar.gz) = aa2a6a1daafa3af66807cfe0bc77bfe1144a9a53df9a96bab52e3e575b3047ed
-SIZE (tensorflow/tensorflow-tensorflow-v1.14.0_GH0.tar.gz) = 41335204
+SHA256 (tensorflow/tensorflow-tensorflow-v1.15.5_GH0.tar.gz) = 4c4d23e311093ded2d2e287b18d7c45b07b5984ab88a1d2f91f8f13c886123db
+SIZE (tensorflow/tensorflow-tensorflow-v1.15.5_GH0.tar.gz) = 46212258
diff --git a/science/py-tensorflow/files/bazelrc b/science/py-tensorflow/files/bazelrc
index 829431f9eb25..98a37af78dce 100644
--- a/science/py-tensorflow/files/bazelrc
+++ b/science/py-tensorflow/files/bazelrc
@@ -15,3 +15,5 @@ build --define=PREFIX=%%LOCALBASE%%
 build --define=LIBDIR=%%LOCALBASE%%/lib
 
 build --config=noaws --config=nohdfs --config=noignite --config=nokafka
+build --define tensorflow_mkldnn_contraction_kernel=0
+build --incompatible_no_support_tools_in_action_inputs=false
diff --git a/science/py-tensorflow/files/patch-WORKSPACE b/science/py-tensorflow/files/patch-WORKSPACE
new file mode 100644
index 000000000000..25f4dbfacc15
--- /dev/null
+++ b/science/py-tensorflow/files/patch-WORKSPACE
@@ -0,0 +1,61 @@
+--- WORKSPACE.orig	2021-01-04 20:18:42 UTC
++++ WORKSPACE
+@@ -12,6 +12,15 @@ http_archive(
+     ],
+ )
+ 
++http_archive(
++    name = "io_bazel_rules_docker",
++    sha256 = "7d453450e1eb70e238eea6b31f4115607ec1200e91afea01c25f9804f37e39c8",
++    strip_prefix = "rules_docker-0.10.0",
++    urls = [
++        "https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz",
++    ],
++)
++
+ # Load tf_repositories() before loading dependencies for other repository so
+ # that dependencies like com_google_protobuf won't be overridden.
+ load("//tensorflow:workspace.bzl", "tf_repositories")
+@@ -78,6 +87,42 @@ http_file(
+     executable = 1,
+     urls = ["https://github.com/google/xctestrunner/releases/download/0.2.7/ios_test_runner.par"],
+ )  # https://github.com/google/xctestrunner/releases
++
++new_local_repository(
++    name = "jsonHeaders",
++    path = "%%LOCALBASE%%/include/json",
++    build_file_content = """  
++
++package(
++    default_visibility = [
++    "//visibility:public",
++    ],
++)
++
++cc_library(
++    name = "headers",
++    srcs = glob(["*.h"]),
++)
++""",
++)
++
++new_local_repository(
++    name = "absl_Headers",
++    path = "%%LOCALBASE%%/include/absl",
++    build_file_content = """
++
++package(
++    default_visibility = [
++    "//visibility:public",
++    ],
++)
++cc_library(
++    name = "abslHeaders",
++    srcs = glob(["*/*.h", "*/*/*.h", "*/*/*/*/*/*.h"]),
++)
++
++""",
++)
+ # Use `swift_rules_dependencies` to fetch the toolchains. With the
+ # `git_repository` rules above, the following call will skip redefining them.
+ load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies")
diff --git a/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_lite_BUILD b/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_lite_BUILD
new file mode 100644
index 000000000000..634c75832985
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_lite_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/compiler/mlir/lite/BUILD.orig	2021-07-06 22:08:16 UTC
++++ tensorflow/compiler/mlir/lite/BUILD
+@@ -318,6 +318,7 @@ tf_native_cc_binary(
+     srcs = [
+         "operator_writer_gen.cc",
+     ],
++    linkopts = ["-lexecinfo"],
+     deps = [
+         "@llvm//:support",
+         "@llvm//:tablegen",
diff --git a/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_lite_quantization_BUILD b/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_lite_quantization_BUILD
new file mode 100644
index 000000000000..4950e762ded3
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_lite_quantization_BUILD
@@ -0,0 +1,8 @@
+--- tensorflow/compiler/mlir/lite/quantization/BUILD.orig	2021-07-06 10:09:38 UTC
++++ tensorflow/compiler/mlir/lite/quantization/BUILD
+@@ -57,4 +57,5 @@ tf_native_cc_binary(
+         "@llvm//:tablegen",
+         "@local_config_mlir//:TableGen",
+     ],
++    linkopts = ["-lexecinfo"],
+ )
diff --git a/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_tensorflow_BUILD b/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_tensorflow_BUILD
new file mode 100644
index 000000000000..06fd4143a230
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_compiler_mlir_tensorflow_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/compiler/mlir/tensorflow/BUILD.orig	2021-07-06 11:28:13 UTC
++++ tensorflow/compiler/mlir/tensorflow/BUILD
+@@ -586,6 +586,7 @@ tf_native_cc_binary(
+     srcs = [
+         "translate/derived_attr_populator_gen.cc",
+     ],
++    linkopts = ["-lexecinfo"],
+     deps = [
+         "@llvm//:support",
+         "@llvm//:tablegen",
diff --git a/science/py-tensorflow/files/patch-tensorflow_contrib_bigtable_BUILD b/science/py-tensorflow/files/patch-tensorflow_contrib_bigtable_BUILD
new file mode 100644
index 000000000000..9796bd510efa
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_contrib_bigtable_BUILD
@@ -0,0 +1,20 @@
+--- tensorflow/contrib/bigtable/BUILD.orig	2021-01-04 20:18:42 UTC
++++ tensorflow/contrib/bigtable/BUILD
+@@ -82,6 +82,8 @@ tf_kernel_library(
+         "//tensorflow/core:framework_headers_lib",
+         "//third_party/eigen3",
+         "@com_github_googlecloudplatform_google_cloud_cpp//google/cloud/bigtable:bigtable_client",
++        "@com_google_absl//absl/base",
++        "@com_google_absl//absl/synchronization",
+     ],
+ )
+ 
+@@ -94,6 +96,8 @@ cc_library(
+         "//tensorflow/core:framework_headers_lib",
+         "//third_party/eigen3",
+         "@com_github_googlecloudplatform_google_cloud_cpp//google/cloud/bigtable:bigtable_client",
++        "@com_google_absl//absl/base",
++        "@com_google_absl//absl/synchronization",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_contrib_boosted__trees_build b/science/py-tensorflow/files/patch-tensorflow_contrib_boosted__trees_BUILD
similarity index 66%
rename from science/py-tensorflow/files/patch-tensorflow_contrib_boosted__trees_build
rename to science/py-tensorflow/files/patch-tensorflow_contrib_boosted__trees_BUILD
index 3711842c1939..86587ade0ef5 100644
--- a/science/py-tensorflow/files/patch-tensorflow_contrib_boosted__trees_build
+++ b/science/py-tensorflow/files/patch-tensorflow_contrib_boosted__trees_BUILD
@@ -1,6 +1,6 @@
---- tensorflow/contrib/boosted_trees/BUILD.orig	2019-07-07 15:35:52.034885000 +0100
-+++ tensorflow/contrib/boosted_trees/BUILD	2019-07-07 15:50:02.149725000 +0100
-@@ -27,6 +27,10 @@
+--- tensorflow/contrib/boosted_trees/BUILD.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/contrib/boosted_trees/BUILD
+@@ -24,6 +24,10 @@ cc_library(
          ":stats_accumulator_ops_kernels",
          ":training_ops_kernels",
      ],
@@ -11,7 +11,7 @@
      alwayslink = 1,
  )
  
-@@ -40,6 +44,10 @@
+@@ -37,6 +41,10 @@ cc_library(
          ":stats_accumulator_ops_op_lib",
          ":training_ops_op_lib",
      ],
diff --git a/science/py-tensorflow/files/patch-tensorflow_contrib_ffmpeg_default_BUILD b/science/py-tensorflow/files/patch-tensorflow_contrib_ffmpeg_default_BUILD
new file mode 100644
index 000000000000..174649a5e926
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_contrib_ffmpeg_default_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/contrib/ffmpeg/default/BUILD.orig	2021-01-04 20:18:42 UTC
++++ tensorflow/contrib/ffmpeg/default/BUILD
+@@ -18,6 +18,7 @@ cc_library(
+         # Header is shared between implementations.
+         "//tensorflow/contrib/ffmpeg:ffmpeg_lib.h",
+     ],
++    copts = ["-I%%LOCALBASE%%/include"],
+     deps = [
+         "//tensorflow/core:framework_headers_lib",
+         "//third_party/eigen3",
diff --git a/science/py-tensorflow/files/patch-tensorflow_contrib_ignite_kernels_client_ignite__plain__client__unix.cc b/science/py-tensorflow/files/patch-tensorflow_contrib_ignite_kernels_client_ignite__plain__client__unix.cc
index 12d7a8e0d5af..eb84acb94185 100644
--- a/science/py-tensorflow/files/patch-tensorflow_contrib_ignite_kernels_client_ignite__plain__client__unix.cc
+++ b/science/py-tensorflow/files/patch-tensorflow_contrib_ignite_kernels_client_ignite__plain__client__unix.cc
@@ -1,6 +1,6 @@
---- tensorflow/contrib/ignite/kernels/client/ignite_plain_client_unix.cc.orig	2019-07-07 13:40:21.593527000 +0100
-+++ tensorflow/contrib/ignite/kernels/client/ignite_plain_client_unix.cc	2019-07-07 13:40:59.586340000 +0100
-@@ -20,6 +20,10 @@
+--- tensorflow/contrib/ignite/kernels/client/ignite_plain_client_unix.cc.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/contrib/ignite/kernels/client/ignite_plain_client_unix.cc
+@@ -19,6 +19,10 @@ limitations under the License.
  #include <sys/socket.h>
  #include <unistd.h>
  
diff --git a/science/py-tensorflow/files/patch-tensorflow_contrib_makefile_makefile b/science/py-tensorflow/files/patch-tensorflow_contrib_makefile_Makefile
similarity index 80%
rename from science/py-tensorflow/files/patch-tensorflow_contrib_makefile_makefile
rename to science/py-tensorflow/files/patch-tensorflow_contrib_makefile_Makefile
index d4ca3e053e57..5c7bfd1f5c14 100644
--- a/science/py-tensorflow/files/patch-tensorflow_contrib_makefile_makefile
+++ b/science/py-tensorflow/files/patch-tensorflow_contrib_makefile_Makefile
@@ -1,6 +1,6 @@
---- ./tensorflow/contrib/makefile/Makefile.orig	2019-07-08 16:51:36.748365000 +0100
-+++ ./tensorflow/contrib/makefile/Makefile	2019-07-08 16:51:21.774903000 +0100
-@@ -60,12 +60,15 @@
+--- tensorflow/contrib/makefile/Makefile.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/contrib/makefile/Makefile
+@@ -60,12 +60,15 @@ else
  	ifeq ($(UNAME_S),Linux)
  	        HOST_OS := LINUX
  	endif
@@ -17,9 +17,9 @@
  
  # Where compiled objects are stored.
  HOST_OBJDIR := $(MAKEFILE_DIR)/gen/host_obj/
-@@ -111,6 +114,9 @@
+@@ -111,6 +114,9 @@ $(HOST_NSYNC_LIB) \
  ifeq ($(HOST_OS),LINUX)
- 	HOST_LIBS += -ldl -lpthread
+ 	HOST_LIBS += -ldl -lpthread -lrt
  endif
 +ifeq ($(HOST_OS),FREEBSD)
 +        HOST_LIBS += -lexecinfo -lpthread
@@ -27,7 +27,7 @@
  
  # If we're on a Pi, link in pthreads and dl
  ifeq ($(HOST_OS),PI)
-@@ -248,7 +254,7 @@
+@@ -248,7 +254,7 @@ endif
  	LDFLAGS += -all_load
  endif
  # Make sure that we don't strip global constructors on Linux.
@@ -36,9 +36,9 @@
  ifeq ($(HAS_GEN_HOST_PROTOC),true)
  	LIBFLAGS += -L$(MAKEFILE_DIR)/gen/protobuf-host/lib
  	export LD_LIBRARY_PATH=$(MAKEFILE_DIR)/gen/protobuf-host/lib
-@@ -261,6 +267,10 @@
+@@ -261,6 +267,10 @@ endif
  ifeq ($(TARGET),LINUX)
- 	LIBS += -ldl -lpthread
+ 	LIBS += -ldl -lpthread -lrt
  endif
 +ifeq ($(TARGET),FREEBSD)
 +        LIBS += -lexecinfo -lpthread
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_BUILD b/science/py-tensorflow/files/patch-tensorflow_core_BUILD
index c699215b4922..99e14f8f3334 100644
--- a/science/py-tensorflow/files/patch-tensorflow_core_BUILD
+++ b/science/py-tensorflow/files/patch-tensorflow_core_BUILD
@@ -1,6 +1,6 @@
---- tensorflow/core/BUILD.orig	2019-06-18 23:48:23.000000000 +0100
-+++ tensorflow/core/BUILD	2019-07-14 09:27:38.471527000 +0100
-@@ -2412,7 +2412,7 @@
+--- tensorflow/core/BUILD.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/core/BUILD
+@@ -2432,7 +2432,7 @@ cc_library(
      copts = tf_copts(),
      defines = LIB_INTERNAL_DEFINES,
      linkopts = select({
@@ -9,7 +9,7 @@
          "//tensorflow:windows": [],
          "//tensorflow:android": [],
          "//conditions:default": [
-@@ -2512,7 +2512,7 @@
+@@ -2515,7 +2515,7 @@ cc_library(
      hdrs = ["lib/gif/gif_io.h"],
      copts = tf_copts(),
      linkopts = select({
@@ -18,7 +18,7 @@
          "//tensorflow:windows": [],
          "//conditions:default": ["-ldl"],
      }),
-@@ -2536,7 +2536,7 @@
+@@ -2539,7 +2539,7 @@ cc_library(
      ],
      copts = tf_copts(),
      linkopts = select({
@@ -27,7 +27,7 @@
          "//tensorflow:windows": [],
          "//conditions:default": ["-ldl"],
      }),
-@@ -2566,7 +2566,7 @@
+@@ -2570,7 +2570,7 @@ cc_library(
      ],
      copts = tf_copts(),
      linkopts = select({
@@ -36,7 +36,7 @@
          "//tensorflow:windows": [],
          "//conditions:default": ["-ldl"],
      }),
-@@ -2897,7 +2897,7 @@
+@@ -2907,7 +2907,7 @@ tf_cuda_library(
      hdrs = FRAMEWORK_INTERNAL_PUBLIC_HEADERS,
      copts = tf_copts(),
      linkopts = select({
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_distributed__runtime_rpc_BUILD b/science/py-tensorflow/files/patch-tensorflow_core_distributed__runtime_rpc_BUILD
new file mode 100644
index 000000000000..627b871ae92a
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_core_distributed__runtime_rpc_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/core/distributed_runtime/rpc/BUILD.orig	2021-07-08 11:22:26 UTC
++++ tensorflow/core/distributed_runtime/rpc/BUILD
+@@ -253,6 +253,7 @@ cc_library(
+     name = "grpc_master_service_impl",
+     srcs = ["grpc_master_service_impl.cc"],
+     hdrs = ["grpc_master_service_impl.h"],
++    copts = ["-I%%LOCALBASE%%/include"],
+     deps = [
+         "//tensorflow:grpc++",
+         "//tensorflow/core:master_proto_cc",
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_distributed__runtime_rpc_grpc__server__lib.cc b/science/py-tensorflow/files/patch-tensorflow_core_distributed__runtime_rpc_grpc__server__lib.cc
new file mode 100644
index 000000000000..ac5d828514d6
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_core_distributed__runtime_rpc_grpc__server__lib.cc
@@ -0,0 +1,15 @@
+--- tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc.orig	2021-07-08 14:14:12 UTC
++++ tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+@@ -487,12 +487,6 @@ class GrpcServerFactory : public ServerFactory {
+ class GrpcServerRegistrar {
+  public:
+   GrpcServerRegistrar() {
+-    gpr_allocation_functions alloc_fns;
+-    memset(&alloc_fns, 0, sizeof(alloc_fns));
+-    alloc_fns.malloc_fn = port::Malloc;
+-    alloc_fns.realloc_fn = port::Realloc;
+-    alloc_fns.free_fn = port::Free;
+-    gpr_set_allocation_functions(alloc_fns);
+     ServerFactory::Register("GRPC_SERVER", new GrpcServerFactory());
+   }
+ };
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_platform_cloud_BUILD b/science/py-tensorflow/files/patch-tensorflow_core_platform_cloud_BUILD
new file mode 100644
index 000000000000..e42ac50a37f2
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_core_platform_cloud_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/core/platform/cloud/BUILD.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/core/platform/cloud/BUILD
+@@ -220,6 +220,7 @@ cc_library(
+         "//tensorflow/core:lib_internal",
+         "@boringssl//:crypto",
+         "@jsoncpp_git//:jsoncpp",
++	"@jsonHeaders//:headers",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_platform_cloud_gcs__dns__cache.cc b/science/py-tensorflow/files/patch-tensorflow_core_platform_cloud_gcs__dns__cache.cc
index 5d3ee387c329..3d1763b04a83 100644
--- a/science/py-tensorflow/files/patch-tensorflow_core_platform_cloud_gcs__dns__cache.cc
+++ b/science/py-tensorflow/files/patch-tensorflow_core_platform_cloud_gcs__dns__cache.cc
@@ -1,6 +1,6 @@
---- tensorflow/core/platform/cloud/gcs_dns_cache.cc.orig	2019-06-18 23:48:23.000000000 +0100
-+++ tensorflow/core/platform/cloud/gcs_dns_cache.cc	2019-07-06 18:15:09.827112000 +0100
-@@ -24,6 +24,11 @@
+--- tensorflow/core/platform/cloud/gcs_dns_cache.cc.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/core/platform/cloud/gcs_dns_cache.cc
+@@ -26,6 +26,11 @@ limitations under the License.
  #endif
  #include <sys/types.h>
  
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_platform_default_build__config.bzl b/science/py-tensorflow/files/patch-tensorflow_core_platform_default_build__config.bzl
deleted file mode 100644
index 3ca7e7a22203..000000000000
--- a/science/py-tensorflow/files/patch-tensorflow_core_platform_default_build__config.bzl
+++ /dev/null
@@ -1,13 +0,0 @@
---- tensorflow/core/platform/default/build_config.bzl.orig	2019-07-06 21:55:11.899673000 +0100
-+++ tensorflow/core/platform/default/build_config.bzl	2019-07-06 21:56:04.571430000 +0100
-@@ -796,9 +796,7 @@
-         "//tensorflow:ios": [],
-         "//tensorflow:windows": [],
-         "//tensorflow:macos": [],
--        "//conditions:default": [
--            "@hwloc",
--        ],
-+        "//tensorflow:freebsd": [],
-     })
- 
- def tf_additional_numa_copts():
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_platform_posix_env.cc b/science/py-tensorflow/files/patch-tensorflow_core_platform_posix_env.cc
deleted file mode 100644
index b50356e83924..000000000000
--- a/science/py-tensorflow/files/patch-tensorflow_core_platform_posix_env.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- tensorflow/core/platform/posix/env.cc.orig	2019-06-18 23:48:23.000000000 +0100
-+++ tensorflow/core/platform/posix/env.cc	2019-07-06 21:03:28.090735000 +0100
-@@ -28,6 +28,10 @@
- #include <thread>
- #include <vector>
- 
-+#ifdef __FREEBSD__
-+#include <pthread.h>
-+#endif
-+
- #include "tensorflow/core/lib/core/error_codes.pb.h"
- #include "tensorflow/core/platform/env.h"
- #include "tensorflow/core/platform/load_library.h"
-@@ -113,7 +117,7 @@
-     // Has to be casted to long first, else this error appears:
-     // static_cast from 'pthread_t' (aka 'pthread *') to 'int32' (aka 'int')
-     // is not allowed
--    return static_cast<int32>(static_cast<int64>(pthread_self()));
-+    return static_cast<int32>((int64)(pthread_self()));
- #else
-     return static_cast<int32>(pthread_self());
- #endif
-@@ -129,7 +133,7 @@
-         return true;
-       }
-     }
--#if defined(__ANDROID__) || defined(__EMSCRIPTEN__)
-+#if defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__FreeBSD__)
-     return false;
- #else
-     char buf[100];
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_profiler_internal_BUILD b/science/py-tensorflow/files/patch-tensorflow_core_profiler_internal_BUILD
new file mode 100644
index 000000000000..17e360821407
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_core_profiler_internal_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/core/profiler/internal/BUILD.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/core/profiler/internal/BUILD
+@@ -38,6 +38,7 @@ cc_library(
+         "//tensorflow/core:lib",
+         "//tensorflow/core:protos_all_cc",
+         "@jsoncpp_git//:jsoncpp",
++        "@jsonHeaders//:headers",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_profiler_rpc_client_BUILD b/science/py-tensorflow/files/patch-tensorflow_core_profiler_rpc_client_BUILD
new file mode 100644
index 000000000000..3734a026f362
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_core_profiler_rpc_client_BUILD
@@ -0,0 +1,19 @@
+--- tensorflow/core/profiler/rpc/client/BUILD.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/core/profiler/rpc/client/BUILD
+@@ -37,6 +37,8 @@ cc_library(
+         "//tensorflow/core:lib",
+         "//tensorflow/core:protos_all_cc",
+         "//tensorflow/core/profiler:op_profile_proto_cc",
++	"@com_google_absl//absl/base",
++	"@com_google_absl//absl/synchronization",
+     ],
+ )
+ 
+@@ -48,6 +50,7 @@ cc_library(
+         "//tensorflow/core:lib",
+         "//tensorflow/core:protos_all_cc",
+         "@jsoncpp_git//:jsoncpp",
++	"@jsonHeaders//:headers",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_core_proto_autotuning.proto b/science/py-tensorflow/files/patch-tensorflow_core_protobuf_autotuning.proto
similarity index 63%
rename from science/py-tensorflow/files/patch-tensorflow_core_proto_autotuning.proto
rename to science/py-tensorflow/files/patch-tensorflow_core_protobuf_autotuning.proto
index 197b0575861b..c23a828706c9 100644
--- a/science/py-tensorflow/files/patch-tensorflow_core_proto_autotuning.proto
+++ b/science/py-tensorflow/files/patch-tensorflow_core_protobuf_autotuning.proto
@@ -1,6 +1,6 @@
---- tensorflow/core/protobuf/autotuning.proto.orig	2019-06-18 23:48:23.000000000 +0100
-+++ tensorflow/core/protobuf/autotuning.proto	2019-07-30 11:45:04.342068000 +0100
-@@ -11,14 +11,14 @@
+--- tensorflow/core/protobuf/autotuning.proto.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/core/protobuf/autotuning.proto
+@@ -11,14 +11,14 @@ import "google/protobuf/any.proto";
  import "google/protobuf/duration.proto";
  
  message CudnnVersion {
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_experimental_micro_tools_make_targets_freebsd__makefile.inc b/science/py-tensorflow/files/patch-tensorflow_lite_experimental_micro_tools_make_targets_freebsd__makefile.inc
index 9558cdfd6513..15a38269c889 100644
--- a/science/py-tensorflow/files/patch-tensorflow_lite_experimental_micro_tools_make_targets_freebsd__makefile.inc
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_experimental_micro_tools_make_targets_freebsd__makefile.inc
@@ -1,5 +1,5 @@
---- /dev/null	2019-07-08 14:38:21.999045000 +0100
-+++ tensorflow/lite/experimental/micro/tools/make/targets/freebsd_makefile.inc	2019-07-08 14:37:33.196932000 +0100
+--- tensorflow/lite/experimental/micro/tools/make/targets/freebsd_makefile.inc.orig	2021-07-05 16:52:18 UTC
++++ tensorflow/lite/experimental/micro/tools/make/targets/freebsd_makefile.inc
 @@ -0,0 +1,10 @@
 +# Settings for x86 on FreeBSD
 +ifeq ($(TARGET), freebsd)
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_kernels_internal_BUILD b/science/py-tensorflow/files/patch-tensorflow_lite_kernels_internal_BUILD
new file mode 100644
index 000000000000..3d2e73353bf0
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_kernels_internal_BUILD
@@ -0,0 +1,11 @@
+--- tensorflow/lite/kernels/internal/BUILD.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/lite/kernels/internal/BUILD
+@@ -662,7 +662,7 @@ cc_library(
+             ":sse_tensor_utils",
+         ],
+         "//conditions:default": [
+-            ":portable_tensor_utils",
++	    ":neon_tensor_utils",
+         ],
+     }),
+ )
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_kernels_internal_build b/science/py-tensorflow/files/patch-tensorflow_lite_kernels_internal_build
deleted file mode 100644
index e47c7f0da602..000000000000
--- a/science/py-tensorflow/files/patch-tensorflow_lite_kernels_internal_build
+++ /dev/null
@@ -1,11 +0,0 @@
---- tensorflow/lite/kernels/internal/BUILD.orig	2019-07-09 13:22:19.397153000 +0100
-+++ tensorflow/lite/kernels/internal/BUILD	2019-07-09 13:22:38.288994000 +0100
-@@ -607,7 +607,7 @@
-             ":neon_tensor_utils",
-         ],
-         "//conditions:default": [
--            ":portable_tensor_utils",
-+	    ":neon_tensor_utils",
-         ],
-     }),
- )
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_python_interpreter__wrapper_BUILD b/science/py-tensorflow/files/patch-tensorflow_lite_python_interpreter__wrapper_BUILD
new file mode 100644
index 000000000000..cd3a3ade6063
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_python_interpreter__wrapper_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/lite/python/interpreter_wrapper/BUILD.orig	2021-07-05 17:39:13 UTC
++++ tensorflow/lite/python/interpreter_wrapper/BUILD
+@@ -31,6 +31,7 @@ cc_library(
+         "//tensorflow/lite/kernels:builtin_ops",
+         "//third_party/python_runtime:headers",
+         "@com_google_absl//absl/memory",
++	"@com_google_absl//absl/strings:str_format",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_tools_BUILD b/science/py-tensorflow/files/patch-tensorflow_lite_tools_BUILD
new file mode 100644
index 000000000000..6b2504c8c28d
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_tools_BUILD
@@ -0,0 +1,10 @@
+--- tensorflow/lite/tools/BUILD.orig	2021-01-04 20:18:42 UTC
++++ tensorflow/lite/tools/BUILD
+@@ -76,6 +76,7 @@ cc_library(
+         "//tensorflow/lite/c:c_api_internal",
+         "//tensorflow/lite/schema:schema_fbs",
+         "@com_google_absl//absl/container:flat_hash_set",
++        "@com_google_absl//absl/time",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_makefile b/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_Makefile
similarity index 77%
rename from science/py-tensorflow/files/patch-tensorflow_lite_tools_make_makefile
rename to science/py-tensorflow/files/patch-tensorflow_lite_tools_make_Makefile
index e59b928023d7..a0aa84faf993 100644
--- a/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_makefile
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_Makefile
@@ -1,6 +1,6 @@
---- tensorflow/lite/tools/make/Makefile.orig	2019-07-08 14:04:30.373727000 +0100
-+++ tensorflow/lite/tools/make/Makefile	2019-07-08 16:44:36.249811000 +0100
-@@ -16,12 +16,15 @@
+--- tensorflow/lite/tools/make/Makefile.orig	2019-10-14 21:08:43 UTC
++++ tensorflow/lite/tools/make/Makefile
+@@ -16,12 +16,15 @@ else
  	ifeq ($(UNAME_S),Linux)
  		HOST_OS := linux
  	endif
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_targets_freebsd__makefile.inc b/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_targets_freebsd__makefile.inc
index 1c66895e0274..b0070b6117cd 100644
--- a/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_targets_freebsd__makefile.inc
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_targets_freebsd__makefile.inc
@@ -1,5 +1,5 @@
---- /dev/null	2019-07-08 14:12:50.536743000 +0100
-+++ tensorflow/lite/tools/make/targets/freebsd_makefile.inc	2019-07-08 14:11:35.495868000 +0100
+--- tensorflow/lite/tools/make/targets/freebsd_makefile.inc.orig	2021-07-05 16:52:18 UTC
++++ tensorflow/lite/tools/make/targets/freebsd_makefile.inc
 @@ -0,0 +1,16 @@
 +# Settings for FreeBSD.
 +ifeq ($(TARGET), freebsd)
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_tools_optimize_BUILD b/science/py-tensorflow/files/patch-tensorflow_lite_tools_optimize_BUILD
new file mode 100644
index 000000000000..b399267b5bcb
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_tools_optimize_BUILD
@@ -0,0 +1,20 @@
+--- tensorflow/lite/tools/optimize/BUILD.orig	2021-01-04 20:18:42 UTC
++++ tensorflow/lite/tools/optimize/BUILD
+@@ -26,6 +26,8 @@ cc_library(
+         "//tensorflow/lite/schema:schema_fbs",
+         "//third_party/eigen3",
+         "@com_google_absl//absl/memory",
++        "@com_google_absl//absl/strings",
++        "@com_google_absl//absl/base",
+     ],
+ )
+ 
+@@ -40,6 +42,8 @@ cc_library(
+         "//tensorflow/lite/kernels/internal:types",
+         "//tensorflow/lite/schema:schema_fbs",
+         "@com_google_absl//absl/memory",
++        "@com_google_absl//absl/strings",
++        "@com_google_absl//absl/base",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_lite_tools_optimize_calibration_BUILD b/science/py-tensorflow/files/patch-tensorflow_lite_tools_optimize_calibration_BUILD
new file mode 100644
index 000000000000..15c1ee95393c
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_lite_tools_optimize_calibration_BUILD
@@ -0,0 +1,34 @@
+--- tensorflow/lite/tools/optimize/calibration/BUILD.orig	2021-07-05 17:42:23 UTC
++++ tensorflow/lite/tools/optimize/calibration/BUILD
+@@ -25,6 +25,7 @@ cc_library(
+         "//tensorflow/lite/kernels:builtin_ops",
+         "//tensorflow/lite/schema:schema_fbs",
+         "@com_google_absl//absl/memory",
++	"@com_google_absl//absl/strings",
+         "@flatbuffers",
+     ],
+ )
+@@ -49,6 +50,7 @@ tf_cc_test(
+         "//tensorflow/lite:framework",
+         "//tensorflow/lite/kernels:builtin_ops",
+         "@com_google_absl//absl/memory",
++	"@com_google_absl//absl/strings",
+         "@com_google_googletest//:gtest",
+     ],
+ )
+@@ -62,6 +64,7 @@ cc_library(
+         "//tensorflow/lite:framework",
+         "//tensorflow/lite/core/api",
+         "@com_google_absl//absl/memory",
++	"@com_google_absl//absl/strings",
+     ],
+ )
+ 
+@@ -84,6 +87,7 @@ cc_library(
+         ":calibration_logger",
+         "//tensorflow/lite:framework",
+         "@com_google_absl//absl/memory",
++	"@com_google_absl//absl/strings",
+     ],
+ )
+ 
diff --git a/science/py-tensorflow/files/patch-tensorflow_python_eager_pywrap__tfe__src.cc b/science/py-tensorflow/files/patch-tensorflow_python_eager_pywrap__tfe__src.cc
new file mode 100644
index 000000000000..093b4919c896
--- /dev/null
+++ b/science/py-tensorflow/files/patch-tensorflow_python_eager_pywrap__tfe__src.cc
@@ -0,0 +1,20 @@
+--- tensorflow/python/eager/pywrap_tfe_src.cc.orig	2021-07-07 11:59:05 UTC
++++ tensorflow/python/eager/pywrap_tfe_src.cc
+@@ -1319,7 +1319,7 @@ static PyTypeObject TFE_Py_Tape_Type = {
+     sizeof(TFE_Py_Tape),                          /* tp_basicsize */
+     0,                                            /* tp_itemsize */
+     &TFE_Py_Tape_Delete,                          /* tp_dealloc */
+-    nullptr,                                      /* tp_print */
*** 461 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107090031.1690VkRu031237>