Attachment 226299 Details for Bug 250646 – Fix GRPC build issues

[patch] Fix GRPC build issues

tensorflow.diff (text/plain), 42.14 KB, created by Anthony Donnelly on 2021-07-08 15:01:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anthony Donnelly

Created: 2021-07-08 15:01:11 UTC

Size: 42.14 KB

patch

obsolete

>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-.bazelrc b/science/py-tensorflow/files/patch-.bazelrc
>new file mode 100644
>index 000000000000..2cad28729998
>diff --git a/science/py-tensorflow/files/patch-WORKSPACE b/science/py-tensorflow/files/patch-WORKSPACE
>new file mode 100644
>index 000000000000..4b289afebcb8
>--- /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 = "/usr/local/include/json",
>++    build_file_content = """  
>++
>++package(
>++    default_visibility = [
>++    "//visibility:public",
>++    ],
>++)
>++
>++cc_library(
>++    name = "headers",
>++    srcs = glob(["*.h"]),
>++)
>++""",
>++)
>++
>++new_local_repository(
>++    name = "absl_Headers",
>++    path = "/usr/local/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
>new file mode 100644
>index 000000000000..86587ade0ef5
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_contrib_boosted__trees_BUILD
>@@ -0,0 +1,24 @@
>+--- 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",
>+     ],
>++    linkopts = select({
>++        "//tensorflow:freebsd": ["-lm", "-lexecinfo",],
>++    }),
>++
>+     alwayslink = 1,
>+ )
>+ 
>+@@ -37,6 +41,10 @@ cc_library(
>+         ":stats_accumulator_ops_op_lib",
>+         ":training_ops_op_lib",
>+     ],
>++    linkopts = select({
>++        "//tensorflow:freebsd": ["-lm", "-lexecinfo",],
>++    }),
>++
>+ )
>+ 
>+ py_library(
>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..78fb63a8fdcb
>--- /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/usr/local/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
>new file mode 100644
>index 000000000000..5c7bfd1f5c14
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_contrib_makefile_Makefile
>@@ -0,0 +1,49 @@
>+--- 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
>++        ifeq ($(UNAME_S),FreeBSD)
>++                HOST_OS := FREEBSD
>++        endif
>+ 	ifeq ($(UNAME_S),Darwin)
>+ 		HOST_OS := OSX
>+ 	endif
>+ endif
>+ 
>+-HOST_ARCH := $(shell if [[ $(shell uname -m) =~ i[345678]86 ]]; then echo x86_32; else echo $(shell uname -m); fi)
>++HOST_ARCH := $(shell if uname -m | grep -q i[345678]86; then echo x86_32; elif uname -m | grep -q amd64; then echo x86_64; else uname -m; fi)
>+ 
>+ # Where compiled objects are stored.
>+ HOST_OBJDIR := $(MAKEFILE_DIR)/gen/host_obj/
>+@@ -111,6 +114,9 @@ $(HOST_NSYNC_LIB) \
>+ ifeq ($(HOST_OS),LINUX)
>+ 	HOST_LIBS += -ldl -lpthread -lrt
>+ endif
>++ifeq ($(HOST_OS),FREEBSD)
>++        HOST_LIBS += -lexecinfo -lpthread
>++endif
>+ 
>+ # If we're on a Pi, link in pthreads and dl
>+ ifeq ($(HOST_OS),PI)
>+@@ -248,7 +254,7 @@ endif
>+ 	LDFLAGS += -all_load
>+ endif
>+ # Make sure that we don't strip global constructors on Linux.
>+-ifeq ($(TARGET),LINUX)
>++ifeq ($(TARGET),LINUX,FREEBSD)
>+ 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 @@ endif
>+ ifeq ($(TARGET),LINUX)
>+ 	LIBS += -ldl -lpthread -lrt
>+ endif
>++ifeq ($(TARGET),FREEBSD)
>++        LIBS += -lexecinfo -lpthread
>++endif
>++
>+ # If we're cross-compiling for the Raspberry Pi, use the right gcc.
>+ ifeq ($(TARGET),PI)
>+ 	CXXFLAGS += $(ANDROID_TYPES) -DRASPBERRY_PI
>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_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_protobuf_autotuning.proto b/science/py-tensorflow/files/patch-tensorflow_core_protobuf_autotuning.proto
>new file mode 100644
>index 000000000000..c23a828706c9
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_core_protobuf_autotuning.proto
>@@ -0,0 +1,21 @@
>+--- 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 {
>+-  int32 major = 1;
>+-  int32 minor = 2;
>++  int32 major_val = 1;
>++  int32 minor_val = 2;
>+   int32 patch = 3;
>+ }
>+ 
>+ message ComputeCapability {
>+-  int32 major = 1;
>+-  int32 minor = 2;
>++  int32 major_val = 1;
>++  int32 minor_val = 2;
>+ }
>+ 
>+ message AutotuneResult {
>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_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
>new file mode 100644
>index 000000000000..a0aa84faf993
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_lite_tools_make_Makefile
>@@ -0,0 +1,19 @@
>+--- 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
>++        ifeq ($(UNAME_S),FreeBSD)
>++                HOST_OS := freebsd
>++        endif
>+ 	ifeq ($(UNAME_S),Darwin)
>+ 		HOST_OS := osx
>+ 	endif
>+ endif
>+ 
>+-HOST_ARCH := $(shell if uname -m | grep -q i[345678]86; then echo x86_32; else uname -m; fi)
>++HOST_ARCH := $(shell if uname -m | grep -q i[345678]86; then echo x86_32; elif uname -m | grep -q amd64; then echo x86_64; else uname -m; fi)
>+ 
>+ # Override these on the make command line to target a specific architecture. For example:
>+ # make -f tensorflow/lite/tools/make/Makefile TARGET=rpi TARGET_ARCH=armv7l
>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 */
>++    0,                                            /* tp_print */
>+     nullptr,                                      /* tp_getattr */
>+     nullptr,                                      /* tp_setattr */
>+     nullptr,                                      /* tp_reserved */
>+@@ -1353,7 +1353,7 @@ static PyTypeObject TFE_Py_ForwardAccumulator_Type = {
>+     sizeof(TFE_Py_ForwardAccumulator),                      /* tp_basicsize */
>+     0,                                                      /* tp_itemsize */
>+     &TFE_Py_ForwardAccumulatorDelete,                       /* tp_dealloc */
>+-    nullptr,                                                /* tp_print */
>++    0,                                                      /* tp_print */
>+     nullptr,                                                /* tp_getattr */
>+     nullptr,                                                /* tp_setattr */
>+     nullptr,                                                /* tp_reserved */
>diff --git a/science/py-tensorflow/files/patch-tensorflow_python_lib_core_bfloat16.cc b/science/py-tensorflow/files/patch-tensorflow_python_lib_core_bfloat16.cc
>new file mode 100644
>index 000000000000..0f8a00f7c2a1
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_python_lib_core_bfloat16.cc
>@@ -0,0 +1,11 @@
>+--- tensorflow/python/lib/core/bfloat16.cc.orig	2021-07-07 11:57:12 UTC
>++++ tensorflow/python/lib/core/bfloat16.cc
>+@@ -317,7 +317,7 @@ PyTypeObject PyBfloat16_Type = {
>+     sizeof(PyBfloat16),                        // tp_basicsize
>+     0,                                         // tp_itemsize
>+     nullptr,                                   // tp_dealloc
>+-    nullptr,                                   // tp_print
>++    0,                                         // tp_print
>+     nullptr,                                   // tp_getattr
>+     nullptr,                                   // tp_setattr
>+     nullptr,                                   // tp_compare / tp_reserved
>diff --git a/science/py-tensorflow/files/patch-tensorflow_python_lib_core_ndarray__tensor__bridge.cc b/science/py-tensorflow/files/patch-tensorflow_python_lib_core_ndarray__tensor__bridge.cc
>new file mode 100644
>index 000000000000..72fb0877012d
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_python_lib_core_ndarray__tensor__bridge.cc
>@@ -0,0 +1,11 @@
>+--- tensorflow/python/lib/core/ndarray_tensor_bridge.cc.orig	2021-07-07 09:08:49 UTC
>++++ tensorflow/python/lib/core/ndarray_tensor_bridge.cc
>+@@ -86,7 +86,7 @@ PyTypeObject TensorReleaserType = {
>+     0,                                /* tp_itemsize */
>+     /* methods */
>+     TensorReleaser_dealloc,      /* tp_dealloc */
>+-    nullptr,                     /* tp_print */
>++    0,                           /* tp_print */
>+     nullptr,                     /* tp_getattr */
>+     nullptr,                     /* tp_setattr */
>+     nullptr,                     /* tp_compare */
>diff --git a/science/py-tensorflow/files/patch-tensorflow_stream__executor_stream__executor__pimpl.h b/science/py-tensorflow/files/patch-tensorflow_stream__executor_stream__executor__pimpl.h
>new file mode 100644
>index 000000000000..dcd27cf7ef3e
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_stream__executor_stream__executor__pimpl.h
>@@ -0,0 +1,10 @@
>+--- tensorflow/stream_executor/stream_executor_pimpl.h.orig	2021-07-07 09:04:03 UTC
>++++ tensorflow/stream_executor/stream_executor_pimpl.h
>+@@ -25,6 +25,7 @@ limitations under the License.
>+ #include "absl/base/macros.h"
>+ #include "absl/synchronization/mutex.h"
>+ #include "absl/types/optional.h"
>++#include "absl/memory/memory.h"
>+ #include "tensorflow/stream_executor/device_memory_allocator.h"
>+ #include "tensorflow/stream_executor/lib/status.h"
>+ #include "tensorflow/stream_executor/lib/statusor.h"
>diff --git a/science/py-tensorflow/files/patch-tensorflow_tensorflow.bzl b/science/py-tensorflow/files/patch-tensorflow_tensorflow.bzl
>index 9eb43a60af6b..9876ec727d3b 100644
>--- a/science/py-tensorflow/files/patch-tensorflow_tensorflow.bzl
>+++ b/science/py-tensorflow/files/patch-tensorflow_tensorflow.bzl
>@@ -1,14 +1,14 @@
>---- tensorflow/tensorflow.bzl.orig	2019-06-18 23:48:23.000000000 +0100
>-+++ tensorflow/tensorflow.bzl	2019-07-13 13:57:17.579194000 +0100
>-@@ -287,6 +287,7 @@
>+--- tensorflow/tensorflow.bzl.orig	2021-01-04 20:18:42 UTC
>++++ tensorflow/tensorflow.bzl
>+@@ -289,6 +289,7 @@ def tf_copts(
>+             "-Iexternal/gemmlowp",
>              "-Wno-sign-compare",
>-             "-fno-exceptions",
>              "-ftemplate-depth=900",
>-+	    "-I%%LOCALBASE%%/include",
>++	    "-I/usr/local/include",
>          ]) +
>+         (if_not_windows(["-fno-exceptions"]) if not allow_exceptions else []) +
>          if_cuda(["-DGOOGLE_CUDA=1"]) +
>-         if_tensorrt(["-DGOOGLE_TENSORRT=1"]) +
>-@@ -603,7 +604,7 @@
>+@@ -628,7 +629,7 @@ def tf_cc_binary(
>                  ],
>              ),
>              data = depset(data + added_data_deps),
>@@ -17,7 +17,7 @@
>              visibility = visibility,
>              **kwargs
>          )
>-@@ -657,7 +658,7 @@
>+@@ -693,7 +694,7 @@ def tf_gen_op_wrapper_cc(
>      tf_cc_binary(
>          name = tool,
>          copts = tf_copts(),
>@@ -26,16 +26,16 @@
>          linkstatic = 1,  # Faster to link this one-time-use binary dynamically
>          deps = [op_gen] + deps,
>      )
>-@@ -839,7 +840,7 @@
>+@@ -878,7 +879,7 @@ def tf_gen_op_wrapper_py(
>      tf_cc_binary(
>          name = tool_name,
>          copts = tf_copts(),
> -        linkopts = if_not_windows(["-lm", "-Wl,-ldl"]) + cc_linkopts,
>-+        linkopts = if_not_windows(["-L%%LOCALBASE%%/lib", "-lm", "-Wl, -lexecinfo"]) + cc_linkopts,
>++        linkopts = if_not_windows(["-L/usr/local/lib", "-lm", "-Wl, -lexecinfo"]) + cc_linkopts,
>          linkstatic = 1,  # Faster to link this one-time-use binary dynamically
>          visibility = [clean_dep("//tensorflow:internal")],
>          deps = ([
>-@@ -954,8 +955,9 @@
>+@@ -992,8 +993,9 @@ def tf_cc_test(
>              "//conditions:default": [
>                  "-lpthread",
>                  "-lm",
>@@ -46,7 +46,7 @@
>          deps = deps + tf_binary_dynamic_kernel_deps(kernels) + if_mkl_ml(
>              [
>                  clean_dep("//third_party/mkl:intel_binary_blob"),
>-@@ -1103,7 +1105,7 @@
>+@@ -1140,7 +1142,7 @@ def tf_gpu_only_cc_test(
>          ]) + if_rocm_is_configured([
>              clean_dep("//tensorflow/core:gpu_lib"),
>          ]),
>@@ -55,7 +55,7 @@
>          linkstatic = linkstatic or select({
>              # cc_tests with ".so"s in srcs incorrectly link on Darwin
>              # unless linkstatic=1.
>-@@ -1784,6 +1786,7 @@
>+@@ -1820,6 +1822,7 @@ def tf_custom_op_library(name, srcs = [], gpu_srcs = [
>          linkopts = linkopts + select({
>              "//conditions:default": [
>                  "-lm",
>diff --git a/science/py-tensorflow/files/patch-tensorflow_tools_lib__package_BUILD b/science/py-tensorflow/files/patch-tensorflow_tools_lib__package_BUILD
>new file mode 100644
>index 000000000000..660bc0831d34
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-tensorflow_tools_lib__package_BUILD
>@@ -0,0 +1,18 @@
>+--- tensorflow/tools/lib_package/BUILD.orig	2019-10-14 21:08:43 UTC
>++++ tensorflow/tools/lib_package/BUILD
>+@@ -151,7 +151,6 @@ genrule(
>+         "@gemmlowp//:LICENSE",
>+         "@gif_archive//:COPYING",
>+         "@highwayhash//:LICENSE",
>+-        "@hwloc//:COPYING",
>+         "@icu//:icu4c/LICENSE",
>+         "@jpeg//:LICENSE.md",
>+         "@lmdb//:LICENSE",
>+@@ -223,7 +222,6 @@ genrule(
>+         "@gemmlowp//:LICENSE",
>+         "@gif_archive//:COPYING",
>+         "@highwayhash//:LICENSE",
>+-        "@hwloc//:COPYING",
>+         "@icu//:icu4j/main/shared/licenses/LICENSE",
>+         "@jpeg//:LICENSE.md",
>+         "@lmdb//:LICENSE",
>diff --git a/science/py-tensorflow/files/patch-tensorflow_workspace.bzl b/science/py-tensorflow/files/patch-tensorflow_workspace.bzl
>index 29955c8d64d4..d25f9d632e8e 100644
>--- a/science/py-tensorflow/files/patch-tensorflow_workspace.bzl
>+++ b/science/py-tensorflow/files/patch-tensorflow_workspace.bzl
>@@ -1,10 +1,10 @@
>---- tensorflow/workspace.bzl.orig	2019-07-11 15:46:44.460265000 +0100
>-+++ tensorflow/workspace.bzl	2019-07-11 15:47:14.104299000 +0100
>-@@ -346,6 +346,7 @@
>-         ],
>-         sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1",
>-         build_file = clean_dep("//third_party:enum34.BUILD"),
>-+	system_build_file = clean_dep("//third_party/systemlibs:enum34.BUILD"),
>-         strip_prefix = "enum34-1.1.6/enum",
>-     )
>- 
>+--- tensorflow/workspace.bzl.orig	2021-07-08 11:05:27 UTC
>++++ tensorflow/workspace.bzl
>+@@ -324,6 +324,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = "
>+         build_file = clean_dep("//third_party:functools32.BUILD"),
>+         sha256 = "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d",
>+         strip_prefix = "functools32-3.2.3-2",
>++        system_build_file = clean_dep("//third_party/systemlibs:functools32.BUILD"),
>+         urls = [
>+             "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz",
>+             "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz",
>diff --git a/science/py-tensorflow/files/patch-third__party_aws_BUILD.bazel b/science/py-tensorflow/files/patch-third__party_aws_BUILD.bazel
>new file mode 100644
>index 000000000000..36d342464147
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_aws_BUILD.bazel
>@@ -0,0 +1,13 @@
>+--- third_party/aws/BUILD.bazel.orig	2019-10-14 21:08:43 UTC
>++++ third_party/aws/BUILD.bazel
>+@@ -30,7 +30,9 @@ cc_library(
>+         "@org_tensorflow//tensorflow:freebsd": glob([
>+             "aws-cpp-sdk-core/source/platform/linux-shared/*.cpp",
>+         ]),
>+-        "//conditions:default": [],
>++        "//conditions:default":glob([
>++            "aws-cpp-sdk-core/source/platform/linux-shared/*.cpp",
>++        ]),
>+     }) + glob([
>+         "aws-cpp-sdk-core/include/**/*.h",
>+         "aws-cpp-sdk-core/source/*.cpp",
>diff --git a/science/py-tensorflow/files/patch-third__party_com__google__absl.BUILD b/science/py-tensorflow/files/patch-third__party_com__google__absl.BUILD
>new file mode 100644
>index 000000000000..991743bb23d7
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_com__google__absl.BUILD
>@@ -0,0 +1,13 @@
>+--- third_party/com_google_absl.BUILD.orig	2021-07-07 09:58:12 UTC
>++++ third_party/com_google_absl.BUILD
>+@@ -2,4 +2,9 @@ package(default_visibility = ["//visibility:public"])
>+ 
>+ licenses(["notice"])  # Apache
>+ 
>+-exports_files(["LICENSE"])
>++exports_files(["LICENSE", "absl"])
>++
>++cc_library(
>++    name = "abslHeaders",
>++    hdrs = glob(["*/*/*.h", "*/*/*.h"]),
>++)
>diff --git a/science/py-tensorflow/files/patch-third__party_flatbuffers_BUILD.system b/science/py-tensorflow/files/patch-third__party_flatbuffers_BUILD.system
>new file mode 100644
>index 000000000000..470b556a8b5b
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_flatbuffers_BUILD.system
>@@ -0,0 +1,18 @@
>+--- third_party/flatbuffers/BUILD.system.orig	2021-01-04 20:18:42 UTC
>++++ third_party/flatbuffers/BUILD.system
>+@@ -9,6 +9,7 @@ filegroup(
>+ cc_library(
>+     name = "flatbuffers",
>+     linkopts = ["-lflatbuffers"],
>++    copts = ["-I/usr/local/include"],
>+     visibility = ["//visibility:public"],
>+ )
>+ 
>+@@ -16,6 +17,7 @@ cc_library(
>+ cc_library(
>+     name = "flatc_library",
>+     linkopts = ["-lflatbuffers"],
>++    copts = ["-I/usr/local/include"],
>+     visibility = ["//visibility:public"],
>+ )
>+ 
>diff --git a/science/py-tensorflow/files/patch-third__party_mlir_BUILD b/science/py-tensorflow/files/patch-third__party_mlir_BUILD
>new file mode 100644
>index 000000000000..fd3c96bbf451
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_mlir_BUILD
>@@ -0,0 +1,10 @@
>+--- third_party/mlir/BUILD.orig	2021-07-07 08:13:58 UTC
>++++ third_party/mlir/BUILD
>+@@ -1560,6 +1560,7 @@ cc_binary(
>+     linkopts = [
>+         "-lm",
>+         "-lpthread",
>++        "-lexecinfo",
>+     ],
>+     deps = [
>+         ":Support",
>diff --git a/science/py-tensorflow/files/patch-third__party_systemlibs_functools32.BUILD b/science/py-tensorflow/files/patch-third__party_systemlibs_functools32.BUILD
>new file mode 100644
>index 000000000000..087c0a4bc92a
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_systemlibs_functools32.BUILD
>@@ -0,0 +1,18 @@
>+--- third_party/systemlibs/functools32.BUILD.orig	2021-07-08 13:17:43 UTC
>++++ third_party/systemlibs/functools32.BUILD
>+@@ -0,0 +1,15 @@
>++# Description:
>++#   functools32 provides a backport of the functools module for Python 2.
>++
>++licenses(["notice"])  # Python 2.0
>++
>++package(default_visibility = ["//visibility:public"])
>++
>++filegroup(
>++    name = "LICENSE",
>++)
>++
>++py_library(
>++    name = "functools32",
>++    srcs_version = "PY2AND3",
>++)
>diff --git a/science/py-tensorflow/files/patch-third__party_systemlibs_functools32_BUILD b/science/py-tensorflow/files/patch-third__party_systemlibs_functools32_BUILD
>new file mode 100644
>index 000000000000..8e12b5144d43
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_systemlibs_functools32_BUILD
>@@ -0,0 +1,18 @@
>+--- /dev/null
>++++ third_party/systemlibs/functools32.BUILD
>+@@ -0,0 +1,15 @@
>++# Description:
>++#   functools32 provides a backport of the functools module for Python 2.
>++
>++licenses(["notice"])  # Python 2.0
>++
>++package(default_visibility = ["//visibility:public"])
>++
>++filegroup(
>++    name = "LICENSE",
>++)
>++
>++py_library(
>++    name = "functools32",
>++    srcs_version = "PY2AND3",
>++)
>diff --git a/science/py-tensorflow/files/patch-third__party_systemlibs_grpc.BUILD b/science/py-tensorflow/files/patch-third__party_systemlibs_grpc.BUILD
>new file mode 100644
>index 000000000000..18f1b0aeeaa9
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_systemlibs_grpc.BUILD
>@@ -0,0 +1,11 @@
>+--- third_party/systemlibs/grpc.BUILD.orig	2019-10-14 21:08:43 UTC
>++++ third_party/systemlibs/grpc.BUILD
>+@@ -7,7 +7,7 @@ filegroup(
>+ 
>+ cc_library(
>+     name = "grpc",
>+-    linkopts = ["-lgrpc"],
>++    linkopts = ["-lgrpc", "-lgpr"],
>+     visibility = ["//visibility:public"],
>+ )
>+ 
>diff --git a/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.BUILD b/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.BUILD
>new file mode 100644
>index 000000000000..2c2abe8c9d87
>--- /dev/null
>+++ b/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.BUILD
>@@ -0,0 +1,21 @@
>+--- third_party/systemlibs/jsoncpp.BUILD.orig	2019-10-14 21:08:43 UTC
>++++ third_party/systemlibs/jsoncpp.BUILD
>+@@ -8,9 +8,7 @@ filegroup(
>+ HEADERS = [
>+     "include/json/allocator.h",
>+     "include/json/assertions.h",
>+-    "include/json/autolink.h",
>+     "include/json/config.h",
>+-    "include/json/features.h",
>+     "include/json/forwards.h",
>+     "include/json/json.h",
>+     "include/json/reader.h",
>+@@ -25,7 +23,7 @@ genrule(
>+     cmd = """
>+       for i in $(OUTS); do
>+         i=$${i##*/}
>+-        ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i
>++        ln -sf $(INCLUDEDIR)/json/$$i $(@D)/include/json/$$i
>+       done
>+     """,
>+ )
>diff --git a/science/py-tensorflow/files/patch-third__party_systemlibs_protobuf.bzl b/science/py-tensorflow/files/patch-third__party_systemlibs_protobuf.bzl
>index db3f441180aa..7964d8b81db3 100644
>--- a/science/py-tensorflow/files/patch-third__party_systemlibs_protobuf.bzl
>+++ b/science/py-tensorflow/files/patch-third__party_systemlibs_protobuf.bzl
>@@ -1,11 +1,11 @@
>---- third_party/systemlibs/protobuf.bzl.orig	2019-07-26 12:28:57.790848000 +0100
>-+++ third_party/systemlibs/protobuf.bzl	2019-07-26 12:29:42.978059000 +0100
>-@@ -76,7 +76,7 @@
>+--- third_party/systemlibs/protobuf.bzl.orig	2021-01-04 20:18:42 UTC
>++++ third_party/systemlibs/protobuf.bzl
>+@@ -76,7 +76,7 @@ def _proto_gen_impl(ctx):
>      source_dir = _SourceDir(ctx)
>      gen_dir = _GenDir(ctx)
>      if source_dir:
> -        import_flags = ["-I" + source_dir, "-I" + gen_dir]
>-+        import_flags = ["-I%%LOCALBASE%%/include", "-I" + source_dir, "-I" + gen_dir]
>++        import_flags = ["-I/usr/local/include", "-I" + source_dir, "-I" + gen_dir]
>      else:
>          import_flags = ["-I."]
>  
>diff --git a/science/py-tensorflow/files/patch-third__party_systemlibs_syslibs__configure.bzl b/science/py-tensorflow/files/patch-third__party_systemlibs_syslibs__configure.bzl
>index 09307db161e2..9bf43b80d6ac 100644
>--- a/science/py-tensorflow/files/patch-third__party_systemlibs_syslibs__configure.bzl
>+++ b/science/py-tensorflow/files/patch-third__party_systemlibs_syslibs__configure.bzl
>@@ -1,10 +1,10 @@
>---- third_party/systemlibs/syslibs_configure.bzl.orig	2019-07-11 15:43:32.713320000 +0100
>-+++ third_party/systemlibs/syslibs_configure.bzl	2019-07-11 15:43:54.448882000 +0100
>-@@ -21,6 +21,7 @@
>-     "curl",
>-     "cython",
>+--- third_party/systemlibs/syslibs_configure.bzl.orig	2021-07-08 11:07:25 UTC
>++++ third_party/systemlibs/syslibs_configure.bzl
>+@@ -22,6 +22,7 @@ VALID_LIBS = [
>      "double_conversion",
>-+    "enum34_archive",
>+     "enum34_archive",
>      "flatbuffers",
>++    "functools32_archive",
>      "gast_archive",
>      "gif_archive",
>+     "grpc",

Actions: View | Diff

Attachments on bug 250646: 219115 | 219800 | 226298 | 226299 | 226310 | 226324 | 226491 | 226539 | 226550