Skip to content

Commit 42e425a

Browse files
Implements pywrap_tensorflow_macro_opensource using cc_shared_library.
`dynamic_deps` is not used. PiperOrigin-RevId: 465617454
1 parent 151284b commit 42e425a

File tree

3 files changed

+21
-84
lines changed

3 files changed

+21
-84
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f440f8ec3f63e5d663e1f9d9614f05a39422102a
1+
5.1.1

tensorflow/python/BUILD

Lines changed: 5 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3245,70 +3245,11 @@ py_library(
32453245
pywrap_tensorflow_macro(
32463246
name = "pywrap_tensorflow_internal",
32473247
srcs = ["pywrap_tensorflow_internal.cc"],
3248-
static_deps = [
3249-
"@arm_neon_2_x86_sse//:__subpackages__",
3250-
"@bazel_tools//:__subpackages__",
3251-
"@boringssl//:__subpackages__",
3252-
"@clog//:__subpackages__",
3253-
"@com_github_cares_cares//:__subpackages__",
3254-
"@com_github_googlecloudplatform_tensorflow_gcp_tools//:__subpackages__",
3255-
"@com_github_grpc_grpc//:__subpackages__",
3256-
"@com_google_absl//:__subpackages__",
3257-
"@com_google_googleapis//:__subpackages__",
3258-
"@com_google_protobuf//:__subpackages__",
3259-
"@com_googlesource_code_re2//:__subpackages__",
3260-
"@compute_library//:__subpackages__",
3261-
"@cpuinfo//:__subpackages__",
3262-
"@cudnn_frontend_archive//:__subpackages__",
3263-
"@curl//:__subpackages__",
3264-
"@dlpack//:__subpackages__",
3265-
"@double_conversion//:__subpackages__",
3266-
"@eigen_archive//:__subpackages__",
3267-
"@farmhash_archive//:__subpackages__",
3268-
"@farmhash_gpu_archive//:__subpackages__",
3269-
"@fft2d//:__subpackages__",
3270-
"@flatbuffers//:__subpackages__",
3271-
"@FP16//:__subpackages__",
3272-
"@FXdiv//:__subpackages__",
3273-
"@gemmlowp//:__subpackages__",
3274-
"@gif//:__subpackages__",
3275-
"@highwayhash//:__subpackages__",
3276-
"@hwloc//:__subpackages__",
3277-
"@icu//:__subpackages__",
3278-
"@jsoncpp_git//:__subpackages__",
3279-
"@libjpeg_turbo//:__subpackages__",
3280-
"@libxsmm_archive//:__subpackages__",
3281-
"@llvm_openmp//:__subpackages__",
3282-
"@llvm-project//:__subpackages__",
3283-
"@llvm_terminfo//:__subpackages__",
3284-
"@llvm_zlib//:__subpackages__",
3285-
"@lmdb//:__subpackages__",
3286-
"@local_config_cuda//:__subpackages__",
3287-
"@local_config_git//:__subpackages__",
3288-
"@local_config_nccl//:__subpackages__",
3289-
"@local_config_python//:__subpackages__",
3290-
"@local_config_rocm//:__subpackages__",
3291-
"@local_config_tensorrt//:__subpackages__",
3292-
"@local_execution_config_platform//:__subpackages__",
3293-
"@mkl_dnn_acl_compatible//:__subpackages__",
3294-
"@mkl_dnn_v1//:__subpackages__",
3295-
"@nccl_archive//:__subpackages__",
3296-
"@nsync//:__subpackages__",
3297-
"@org_sqlite//:__subpackages__",
3298-
"@platforms//:__subpackages__",
3299-
"@png//:__subpackages__",
3300-
"@pthreadpool//:__subpackages__",
3301-
"@pybind11//:__subpackages__",
3302-
"@ruy//:__subpackages__",
3303-
"@snappy//:__subpackages__",
3304-
"@sobol_data//:__subpackages__",
3305-
"//:__subpackages__",
3306-
"@upb//:__subpackages__",
3307-
"@XNNPACK//:__subpackages__",
3308-
"@zlib//:__subpackages__",
3309-
],
33103248
# copybara:comment_begin(OSS Windows only: DEF file for exported symbols)
3311-
win_def_file = ":pywrap_tensorflow_filtered_def_file",
3249+
win_def_file = select({
3250+
"//tensorflow:windows": ":pywrap_tensorflow_filtered_def_file",
3251+
"//conditions:default": None,
3252+
}),
33123253
# copybara:comment_end
33133254
deps = [
33143255
":bfloat16_lib",
@@ -3537,7 +3478,7 @@ genrule(
35373478
visibility = ["//visibility:public"],
35383479
)
35393480

3540-
# Get the import library of _pywrap_tensorflow_internal.pyd, platform-specific to Windows.
3481+
# Get the import library of _pywrap_tensorflow_internal.pyd
35413482
filegroup(
35423483
name = "get_pywrap_tensorflow_import_lib_file",
35433484
srcs = [":_pywrap_tensorflow_internal.so"],

tensorflow/tensorflow.bzl

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,16 +2082,14 @@ def _collect_deps_aspect_impl(target, ctx):
20822082
all_deps += ctx.rule.attr.deps
20832083
if hasattr(ctx.rule.attr, "data"):
20842084
all_deps += ctx.rule.attr.data
2085-
if hasattr(ctx.rule.attr, "roots"):
2086-
all_deps += ctx.rule.attr.roots
20872085
for dep in all_deps:
20882086
direct.append(dep.label)
20892087
if hasattr(dep, "tf_collected_deps"):
20902088
transitive.append(dep.tf_collected_deps)
20912089
return struct(tf_collected_deps = depset(direct = direct, transitive = transitive))
20922090

20932091
collect_deps_aspect = aspect(
2094-
attr_aspects = ["deps", "data", "roots"],
2092+
attr_aspects = ["deps", "data"],
20952093
implementation = _collect_deps_aspect_impl,
20962094
)
20972095

@@ -2287,13 +2285,10 @@ _append_init_to_versionscript = rule(
22872285
def pywrap_tensorflow_macro(
22882286
name,
22892287
srcs = [],
2290-
roots = [],
22912288
deps = [],
2292-
dynamic_deps = [],
2293-
static_deps = [],
22942289
copts = [],
22952290
version_script = None,
2296-
win_def_file = None):
2291+
**kwargs):
22972292
"""Builds the pywrap_tensorflow_internal shared object."""
22982293
module_name = name.split("/")[-1]
22992294

@@ -2303,7 +2298,7 @@ def pywrap_tensorflow_macro(
23032298

23042299
# TODO(b/137885063): tf_cc_shared_object needs to be cleaned up; we really
23052300
# shouldn't be passing a name qualified with .so here.
2306-
cc_shared_library_name = cc_library_base + ".so"
2301+
cc_library_name = cc_library_base + ".so"
23072302
cc_library_pyd_name = "/".join(
23082303
name.split("/")[:-1] + ["_" + module_name + ".pyd"],
23092304
)
@@ -2339,7 +2334,12 @@ def pywrap_tensorflow_macro(
23392334
"$(location %s.lds)" % vscriptname,
23402335
],
23412336
})
2342-
additional_linker_inputs = if_windows([], otherwise = ["%s.lds" % vscriptname])
2337+
extra_deps += select({
2338+
clean_dep("//tensorflow:windows"): [],
2339+
"//conditions:default": [
2340+
"%s.lds" % vscriptname,
2341+
],
2342+
})
23432343

23442344
# Due to b/149224972 we have to add libtensorflow_framework.so
23452345
# as a dependency so the linker doesn't try and optimize and
@@ -2353,8 +2353,8 @@ def pywrap_tensorflow_macro(
23532353
],
23542354
)
23552355

2356-
tf_cc_shared_library(
2357-
name = cc_shared_library_name,
2356+
tf_cc_shared_object(
2357+
name = cc_library_name,
23582358
srcs = srcs,
23592359
# framework_so is no longer needed as libtf.so is included via the extra_deps.
23602360
framework_so = [],
@@ -2365,12 +2365,8 @@ def pywrap_tensorflow_macro(
23652365
]),
23662366
linkopts = extra_linkopts,
23672367
linkstatic = 1,
2368-
roots = roots,
23692368
deps = deps + extra_deps,
2370-
dynamic_deps = dynamic_deps,
2371-
static_deps = static_deps,
2372-
win_def_file = win_def_file,
2373-
additional_linker_inputs = additional_linker_inputs,
2369+
**kwargs
23742370
)
23752371

23762372
# When a non-versioned .so is added as a 'src' to a bazel target, it uses
@@ -2386,14 +2382,14 @@ def pywrap_tensorflow_macro(
23862382
name_os = pattern % (cc_library_base, "")
23872383
native.genrule(
23882384
name = name_os + "_rule",
2389-
srcs = [":" + cc_shared_library_name],
2385+
srcs = [":" + cc_library_name],
23902386
outs = [name_os],
23912387
cmd = "cp $< $@",
23922388
)
23932389

23942390
native.genrule(
23952391
name = "gen_" + cc_library_pyd_name,
2396-
srcs = [":" + cc_shared_library_name],
2392+
srcs = [":" + cc_library_name],
23972393
outs = [cc_library_pyd_name],
23982394
cmd = "cp $< $@",
23992395
)
@@ -2418,7 +2414,7 @@ def pywrap_tensorflow_macro(
24182414
srcs_version = "PY3",
24192415
data = select({
24202416
clean_dep("//tensorflow:windows"): [":" + cc_library_pyd_name],
2421-
"//conditions:default": [":" + cc_shared_library_name],
2417+
"//conditions:default": [":" + cc_library_name],
24222418
}),
24232419
)
24242420

0 commit comments

Comments
 (0)