From 50c291a3ace58006f8fa9cf44a36f6e42bff2b54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 5 Jun 2023 21:37:49 +0100 Subject: gentoo auto-resync : 05:06:2023 - 21:37:49 --- ...ras-2.12.0-0001-bazel-Use-system-protobuf.patch | 330 +++++++++++++++++++++ 1 file changed, 330 insertions(+) create mode 100644 sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch (limited to 'sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch') diff --git a/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch new file mode 100644 index 000000000000..6870d534cf75 --- /dev/null +++ b/sci-libs/keras/files/keras-2.12.0-0001-bazel-Use-system-protobuf.patch @@ -0,0 +1,330 @@ +From ac16152a7709f90c1dedac63157655c836c257bb Mon Sep 17 00:00:00 2001 +From: Jason Zaman +Date: Sun, 14 Nov 2021 17:59:39 -0800 +Subject: [PATCH] bazel: Use system protobuf + +--- + WORKSPACE | 52 ---------- + keras/protobuf/BUILD | 2 +- + third_party/BUILD | 8 +- + third_party/protobuf.bzl | 216 +++++++++++++++++++++++++++++++++++++++ + 4 files changed, 224 insertions(+), 54 deletions(-) + create mode 100644 third_party/protobuf.bzl + +diff --git a/WORKSPACE b/WORKSPACE +index c0ebc4e52..61282aead 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -1,53 +1 @@ + workspace(name = "org_keras") +- +-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +- +-# Needed by protobuf +-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +-http_archive( +- name = "bazel_skylib", +- urls = [ +- "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", +- "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", +- ], +- sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506", +-) +-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") +-bazel_skylib_workspace() +- +-# Needed by protobuf +-http_archive( +- name = "six_archive", +- build_file = "//third_party:six.BUILD", +- sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", +- strip_prefix = "six-1.16.0", +- urls = ["https://pypi.python.org/packages/source/s/six/six-1.16.0.tar.gz"], +-) +- +-bind( +- name = "six", +- actual = "@six_archive//:six", +-) +- +-http_archive( +- name = "com_google_protobuf", +- sha256 = "f66073dee0bc159157b0bd7f502d7d1ee0bc76b3c1eac9836927511bdc4b3fc1", +- strip_prefix = "protobuf-3.21.9", +- urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"], +-) +- +-# ZLIB. Need by com_google_protobuf. +-http_archive( +- name = "zlib", +- build_file = "@com_google_protobuf//:third_party/zlib.BUILD", +- sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30", +- strip_prefix = "zlib-1.2.13", +- urls = [ +- "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.13.tar.gz", +- "https://zlib.net/zlib-1.2.13.tar.gz", +- ], +-) +- +- +-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") +-protobuf_deps() +diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD +index 413dcb74d..80133c064 100644 +--- a/keras/protobuf/BUILD ++++ b/keras/protobuf/BUILD +@@ -1,7 +1,7 @@ + # Description: + # Contains Keras protobufs + +-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") ++load("//third_party:protobuf.bzl", "py_proto_library") + + package( + default_visibility = [ +diff --git a/third_party/BUILD b/third_party/BUILD +index 9be54076c..9399232f6 100644 +--- a/third_party/BUILD ++++ b/third_party/BUILD +@@ -1,4 +1,5 @@ + package( ++ default_visibility = ["//visibility:public"], + licenses = ["notice"], # Apache 2.0 + ) + +@@ -7,4 +8,9 @@ exports_files([ + "six.BUILD", + ]) + +-package(default_visibility = ["//visibility:public"]) ++genrule( ++ name = "protoc", ++ outs = ["protoc.bin"], ++ cmd = "ln -s $$(which protoc) $@", ++ executable = 1, ++) +diff --git a/third_party/protobuf.bzl b/third_party/protobuf.bzl +new file mode 100644 +index 000000000..3a7ef0a27 +--- /dev/null ++++ b/third_party/protobuf.bzl +@@ -0,0 +1,216 @@ ++def _GetPath(ctx, path): ++ if ctx.label.workspace_root: ++ return ctx.label.workspace_root + "/" + path ++ else: ++ return path ++ ++def _IsNewExternal(ctx): ++ # Bazel 0.4.4 and older have genfiles paths that look like: ++ # bazel-out/local-fastbuild/genfiles/external/repo/foo ++ # After the exec root rearrangement, they look like: ++ # ../repo/bazel-out/local-fastbuild/genfiles/foo ++ return ctx.label.workspace_root.startswith("../") ++ ++def _GenDir(ctx): ++ if _IsNewExternal(ctx): ++ # We are using the fact that Bazel 0.4.4+ provides repository-relative paths ++ # for ctx.genfiles_dir. ++ return ctx.genfiles_dir.path + ( ++ "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else "" ++ ) ++ ++ # This means that we're either in the old version OR the new version in the local repo. ++ # Either way, appending the source path to the genfiles dir works. ++ return ctx.var["GENDIR"] + "/" + _SourceDir(ctx) ++ ++def _SourceDir(ctx): ++ if not ctx.attr.includes: ++ return ctx.label.workspace_root ++ if not ctx.attr.includes[0]: ++ return _GetPath(ctx, ctx.label.package) ++ if not ctx.label.package: ++ return _GetPath(ctx, ctx.attr.includes[0]) ++ return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0]) ++ ++def _PyOuts(srcs, use_grpc_plugin = False): ++ ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs] ++ if use_grpc_plugin: ++ ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs] ++ return ret ++ ++def _proto_gen_impl(ctx): ++ """General implementation for generating protos""" ++ srcs = ctx.files.srcs ++ deps = [] ++ deps += ctx.files.srcs ++ source_dir = _SourceDir(ctx) ++ gen_dir = _GenDir(ctx) ++ if source_dir: ++ import_flags = ["-I" + source_dir, "-I" + gen_dir] ++ else: ++ import_flags = ["-I."] ++ ++ for dep in ctx.attr.deps: ++ import_flags += dep.proto.import_flags ++ deps += dep.proto.deps ++ import_flags = depset(import_flags).to_list() ++ deps = depset(deps).to_list() ++ ++ args = [] ++ if ctx.attr.gen_cc: ++ args += ["--cpp_out=" + gen_dir] ++ if ctx.attr.gen_py: ++ args += ["--python_out=" + gen_dir] ++ ++ inputs = srcs + deps ++ tools = [ctx.executable.protoc] ++ if ctx.executable.plugin: ++ plugin = ctx.executable.plugin ++ lang = ctx.attr.plugin_language ++ if not lang and plugin.basename.startswith("protoc-gen-"): ++ lang = plugin.basename[len("protoc-gen-"):] ++ if not lang: ++ fail("cannot infer the target language of plugin", "plugin_language") ++ ++ outdir = gen_dir ++ if ctx.attr.plugin_options: ++ outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir ++ args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)] ++ args += ["--%s_out=%s" % (lang, outdir)] ++ tools.append(plugin) ++ ++ if args: ++ ctx.actions.run( ++ inputs = inputs, ++ outputs = ctx.outputs.outs, ++ arguments = args + import_flags + [s.path for s in srcs], ++ executable = ctx.executable.protoc, ++ mnemonic = "ProtoCompile", ++ tools = tools, ++ use_default_shell_env = True, ++ ) ++ ++ return struct( ++ proto = struct( ++ srcs = srcs, ++ import_flags = import_flags, ++ deps = deps, ++ ), ++ ) ++ ++proto_gen = rule( ++ attrs = { ++ "srcs": attr.label_list(allow_files = True), ++ "deps": attr.label_list(providers = ["proto"]), ++ "includes": attr.string_list(), ++ "protoc": attr.label( ++ cfg = "host", ++ executable = True, ++ allow_single_file = True, ++ mandatory = True, ++ ), ++ "plugin": attr.label( ++ cfg = "host", ++ allow_files = True, ++ executable = True, ++ ), ++ "plugin_language": attr.string(), ++ "plugin_options": attr.string_list(), ++ "gen_cc": attr.bool(), ++ "gen_py": attr.bool(), ++ "outs": attr.output_list(), ++ }, ++ output_to_genfiles = True, ++ implementation = _proto_gen_impl, ++) ++"""Generates codes from Protocol Buffers definitions. ++ ++This rule helps you to implement Skylark macros specific to the target ++language. You should prefer more specific `cc_proto_library `, ++`py_proto_library` and others unless you are adding such wrapper macros. ++ ++Args: ++ srcs: Protocol Buffers definition files (.proto) to run the protocol compiler ++ against. ++ deps: a list of dependency labels; must be other proto libraries. ++ includes: a list of include paths to .proto files. ++ protoc: the label of the protocol compiler to generate the sources. ++ plugin: the label of the protocol compiler plugin to be passed to the protocol ++ compiler. ++ plugin_language: the language of the generated sources ++ plugin_options: a list of options to be passed to the plugin ++ gen_cc: generates C++ sources in addition to the ones from the plugin. ++ gen_py: generates Python sources in addition to the ones from the plugin. ++ outs: a list of labels of the expected outputs from the protocol compiler. ++""" ++ ++def py_proto_library( ++ name, ++ srcs = [], ++ deps = [], ++ py_libs = [], ++ py_extra_srcs = [], ++ include = None, ++ default_runtime = None, ++ protoc = "//third_party:protoc", ++ use_grpc_plugin = False, ++ **kwargs): ++ """Bazel rule to create a Python protobuf library from proto source files ++ ++ NOTE: the rule is only an internal workaround to generate protos. The ++ interface may change and the rule may be removed when bazel has introduced ++ the native rule. ++ ++ Args: ++ name: the name of the py_proto_library. ++ srcs: the .proto files of the py_proto_library. ++ deps: a list of dependency labels; must be py_proto_library. ++ py_libs: a list of other py_library targets depended by the generated ++ py_library. ++ py_extra_srcs: extra source files that will be added to the output ++ py_library. This attribute is used for internal bootstrapping. ++ include: a string indicating the include path of the .proto files. ++ default_runtime: the implicitly default runtime which will be depended on by ++ the generated py_library target. ++ protoc: the label of the protocol compiler to generate the sources. ++ use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin ++ when processing the proto files. ++ **kwargs: other keyword arguments that are passed to py_library. ++ ++ """ ++ outs = _PyOuts(srcs, use_grpc_plugin) ++ ++ includes = [] ++ if include != None: ++ includes = [include] ++ ++ grpc_python_plugin = None ++ if use_grpc_plugin: ++ grpc_python_plugin = "//external:grpc_python_plugin" ++ # Note: Generated grpc code depends on Python grpc module. This dependency ++ # is not explicitly listed in py_libs. Instead, host system is assumed to ++ # have grpc installed. ++ ++ proto_gen( ++ name = name + "_genproto", ++ srcs = srcs, ++ deps = [s + "_genproto" for s in deps], ++ includes = includes, ++ protoc = protoc, ++ gen_py = 1, ++ outs = outs, ++ visibility = ["//visibility:public"], ++ plugin = grpc_python_plugin, ++ plugin_language = "grpc", ++ ) ++ ++ if default_runtime and not default_runtime in py_libs + deps: ++ py_libs = py_libs + [default_runtime] ++ ++ native.py_library( ++ name = name, ++ srcs = outs + py_extra_srcs, ++ deps = py_libs + deps, ++ imports = includes, ++ **kwargs ++ ) +-- +2.39.3 + -- cgit v1.2.3