Run buildifier on some files.

PiperOrigin-RevId: 222101413
This commit is contained in:
Yifei Feng 2018-11-19 10:46:50 -08:00 committed by TensorFlower Gardener
parent a4bcedd676
commit f96c3fb234
6 changed files with 60 additions and 58 deletions

View File

@ -13,7 +13,9 @@
# limitations under the License. # limitations under the License.
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
licenses(["notice"]) # Apache 2.0 licenses(["notice"]) # Apache 2.0
exports_files(["LICENSE"]) exports_files(["LICENSE"])
load("@protobuf_archive//:protobuf.bzl", "cc_proto_library") load("@protobuf_archive//:protobuf.bzl", "cc_proto_library")
@ -21,6 +23,9 @@ load("@protobuf_archive//:protobuf.bzl", "cc_proto_library")
cc_proto_library( cc_proto_library(
name = "bigtable_protos", name = "bigtable_protos",
srcs = [ srcs = [
"google/api/annotations.proto",
"google/api/auth.proto",
"google/api/http.proto",
"google/bigtable/admin/v2/bigtable_instance_admin.proto", "google/bigtable/admin/v2/bigtable_instance_admin.proto",
"google/bigtable/admin/v2/bigtable_table_admin.proto", "google/bigtable/admin/v2/bigtable_table_admin.proto",
"google/bigtable/admin/v2/common.proto", "google/bigtable/admin/v2/common.proto",
@ -31,15 +36,12 @@ cc_proto_library(
"google/iam/v1/iam_policy.proto", "google/iam/v1/iam_policy.proto",
"google/iam/v1/policy.proto", "google/iam/v1/policy.proto",
"google/longrunning/operations.proto", "google/longrunning/operations.proto",
"google/rpc/status.proto",
"google/rpc/error_details.proto", "google/rpc/error_details.proto",
"google/api/annotations.proto", "google/rpc/status.proto",
"google/api/auth.proto",
"google/api/http.proto",
], ],
include = ".", include = ".",
protoc = "@protobuf_archive//:protoc",
default_runtime = "@protobuf_archive//:protobuf", default_runtime = "@protobuf_archive//:protobuf",
deps = ["@protobuf_archive//:cc_wkt_protos"], protoc = "@protobuf_archive//:protoc",
use_grpc_plugin = True, use_grpc_plugin = True,
deps = ["@protobuf_archive//:cc_wkt_protos"],
) )

View File

@ -42,8 +42,8 @@ cc_library(
"src", "src",
"src/common", "src/common",
"src/cpu", "src/cpu",
"src/cpu/xbyak",
"src/cpu/gemm", "src/cpu/gemm",
"src/cpu/xbyak",
], ],
nocopts = "-fno-exceptions", nocopts = "-fno-exceptions",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],

View File

@ -64,13 +64,13 @@ nccl_library(
":device_srcs", ":device_srcs",
], ],
copts = ["-DNCCL_OP=0"] + rdc_copts(), copts = ["-DNCCL_OP=0"] + rdc_copts(),
linkstatic = True,
prefix = "sum_", prefix = "sum_",
deps = [ deps = [
":src_hdrs",
":include_hdrs", ":include_hdrs",
":src_hdrs",
"@local_config_cuda//cuda:cuda_headers", "@local_config_cuda//cuda:cuda_headers",
], ],
linkstatic = True,
) )
nccl_library( nccl_library(
@ -80,13 +80,13 @@ nccl_library(
":device_srcs", ":device_srcs",
], ],
copts = ["-DNCCL_OP=1"] + rdc_copts(), copts = ["-DNCCL_OP=1"] + rdc_copts(),
linkstatic = True,
prefix = "_prod", prefix = "_prod",
deps = [ deps = [
":src_hdrs",
":include_hdrs", ":include_hdrs",
":src_hdrs",
"@local_config_cuda//cuda:cuda_headers", "@local_config_cuda//cuda:cuda_headers",
], ],
linkstatic = True,
) )
nccl_library( nccl_library(
@ -96,13 +96,13 @@ nccl_library(
":device_srcs", ":device_srcs",
], ],
copts = ["-DNCCL_OP=2"] + rdc_copts(), copts = ["-DNCCL_OP=2"] + rdc_copts(),
linkstatic = True,
prefix = "min_", prefix = "min_",
deps = [ deps = [
":src_hdrs",
":include_hdrs", ":include_hdrs",
":src_hdrs",
"@local_config_cuda//cuda:cuda_headers", "@local_config_cuda//cuda:cuda_headers",
], ],
linkstatic = True,
) )
nccl_library( nccl_library(
@ -112,28 +112,28 @@ nccl_library(
":device_srcs", ":device_srcs",
], ],
copts = ["-DNCCL_OP=3"] + rdc_copts(), copts = ["-DNCCL_OP=3"] + rdc_copts(),
linkstatic = True,
prefix = "max_", prefix = "max_",
deps = [ deps = [
":src_hdrs",
":include_hdrs", ":include_hdrs",
":src_hdrs",
"@local_config_cuda//cuda:cuda_headers", "@local_config_cuda//cuda:cuda_headers",
], ],
linkstatic = True,
) )
nccl_library( nccl_library(
name = "functions", name = "functions",
srcs = [ srcs = [
":device_hdrs",
"src/collectives/device/functions.cu", "src/collectives/device/functions.cu",
":device_hdrs",
], ],
copts = rdc_copts(), copts = rdc_copts(),
linkstatic = True,
deps = [ deps = [
":src_hdrs",
":include_hdrs", ":include_hdrs",
":src_hdrs",
"@local_config_cuda//cuda:cuda_headers", "@local_config_cuda//cuda:cuda_headers",
], ],
linkstatic = True,
) )
rdc_library( rdc_library(
@ -162,13 +162,13 @@ nccl_library(
"src/nccl.h", "src/nccl.h",
], ],
hdrs = ["src/nccl.h"], hdrs = ["src/nccl.h"],
copts = cuda_default_copts(),
include_prefix = "third_party/nccl", include_prefix = "third_party/nccl",
strip_include_prefix = "src", strip_include_prefix = "src",
copts = cuda_default_copts(), visibility = ["//visibility:public"],
deps = [ deps = [
":device_code", ":device_code",
":include_hdrs", ":include_hdrs",
":src_hdrs", ":src_hdrs",
], ],
visibility = ["//visibility:public"],
) )

View File

@ -97,13 +97,6 @@ cc_library(
"src/ngraph/runtime/cpu/pass/cpu_workspace_insertion.cpp", "src/ngraph/runtime/cpu/pass/cpu_workspace_insertion.cpp",
], ],
hdrs = glob(["src/ngraph/runtime/cpu/**/*.hpp"]) + glob([]), hdrs = glob(["src/ngraph/runtime/cpu/**/*.hpp"]) + glob([]),
deps = [
":ngraph_headers",
"@eigen_archive//:eigen",
"@nlohmann_json_lib",
"@tbb",
"@mkl_dnn//:mkl_dnn",
],
copts = [ copts = [
"-I external/ngraph/src", "-I external/ngraph/src",
"-I external/nlohmann_json_lib/include/", "-I external/nlohmann_json_lib/include/",
@ -113,6 +106,13 @@ cc_library(
'-D PROJECT_ROOT_DIR=\\"\\"', '-D PROJECT_ROOT_DIR=\\"\\"',
], ],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [
":ngraph_headers",
"@eigen_archive//:eigen",
"@mkl_dnn",
"@nlohmann_json_lib",
"@tbb",
],
alwayslink = 1, alwayslink = 1,
) )
@ -138,12 +138,6 @@ cc_library(
"src/ngraph/runtime/*.cpp", "src/ngraph/runtime/*.cpp",
"src/ngraph/type/*.cpp", "src/ngraph/type/*.cpp",
]), ]),
deps = [
":ngraph_headers",
":ngraph_cpu_backend",
"@eigen_archive//:eigen",
"@nlohmann_json_lib",
],
copts = [ copts = [
"-I external/ngraph/src", "-I external/ngraph/src",
"-I external/nlohmann_json_lib/include/", "-I external/nlohmann_json_lib/include/",
@ -152,5 +146,11 @@ cc_library(
'-D PROJECT_ROOT_DIR=\\"\\"', '-D PROJECT_ROOT_DIR=\\"\\"',
], ],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [
":ngraph_cpu_backend",
":ngraph_headers",
"@eigen_archive//:eigen",
"@nlohmann_json_lib",
],
alwayslink = 1, alwayslink = 1,
) )

View File

@ -10,6 +10,10 @@ load(
cc_library( cc_library(
name = "ngraph_tf", name = "ngraph_tf",
srcs = [ srcs = [
"logging/ngraph_log.cc",
"logging/ngraph_log.h",
"logging/tf_graph_writer.cc",
"logging/tf_graph_writer.h",
"src/ngraph_api.cc", "src/ngraph_api.cc",
"src/ngraph_api.h", "src/ngraph_api.h",
"src/ngraph_assign_clusters.cc", "src/ngraph_assign_clusters.cc",
@ -41,27 +45,23 @@ cc_library(
"src/tf_deadness_analysis.h", "src/tf_deadness_analysis.h",
"src/tf_graphcycles.cc", "src/tf_graphcycles.cc",
"src/tf_graphcycles.h", "src/tf_graphcycles.h",
"logging/ngraph_log.h",
"logging/ngraph_log.cc",
"logging/tf_graph_writer.h",
"logging/tf_graph_writer.cc",
],
deps = [
"@org_tensorflow//tensorflow/core:protos_all_proto_text",
"@org_tensorflow//tensorflow/core:framework_headers_lib",
"@org_tensorflow//tensorflow/core:core_cpu_headers_lib",
"@ngraph//:ngraph_core",
"@com_google_absl//absl/container:container_memory",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/types:variant",
], ],
copts = [ copts = [
"-I external/ngraph_tf/src", "-I external/ngraph_tf/src",
"-I external/ngraph_tf/logging", "-I external/ngraph_tf/logging",
"-I external/ngraph/src", "-I external/ngraph/src",
], ],
alwayslink = 1,
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [
"@com_google_absl//absl/container:container_memory",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/types:variant",
"@ngraph//:ngraph_core",
"@org_tensorflow//tensorflow/core:core_cpu_headers_lib",
"@org_tensorflow//tensorflow/core:framework_headers_lib",
"@org_tensorflow//tensorflow/core:protos_all_proto_text",
],
alwayslink = 1,
) )
tf_cc_test( tf_cc_test(
@ -82,6 +82,12 @@ tf_cc_test(
"test/test_utilities.h", "test/test_utilities.h",
"test/tf_exec.cpp", "test/tf_exec.cpp",
], ],
extra_copts = [
"-fexceptions ",
"-I external/ngraph_tf/src",
"-I external/ngraph_tf/logging",
"-I external/ngraph/src",
],
deps = [ deps = [
":ngraph_tf", ":ngraph_tf",
"@com_google_googletest//:gtest", "@com_google_googletest//:gtest",
@ -89,10 +95,4 @@ tf_cc_test(
"@org_tensorflow//tensorflow/cc:client_session", "@org_tensorflow//tensorflow/cc:client_session",
"@org_tensorflow//tensorflow/core:tensorflow", "@org_tensorflow//tensorflow/core:tensorflow",
], ],
extra_copts = [
"-fexceptions ",
"-I external/ngraph_tf/src",
"-I external/ngraph_tf/logging",
"-I external/ngraph/src",
],
) )

View File

@ -14,6 +14,10 @@ genrule(
srcs = glob(["**"]) + [ srcs = glob(["**"]) + [
"@local_config_cc//:toolchain", "@local_config_cc//:toolchain",
], ],
outs = [
"libtbb.a",
"libtbbmalloc.a",
],
cmd = """ cmd = """
set -e set -e
WORK_DIR=$$PWD WORK_DIR=$$PWD
@ -45,19 +49,15 @@ genrule(
cp build/build_{release,debug}/*.a $$DEST_DIR cp build/build_{release,debug}/*.a $$DEST_DIR
cd $$WORK_DIR cd $$WORK_DIR
""", """,
outs = [
"libtbb.a",
"libtbbmalloc.a",
],
) )
cc_library( cc_library(
name = "tbb", name = "tbb",
srcs = ["libtbb.a"],
hdrs = glob([ hdrs = glob([
"include/serial/**", "include/serial/**",
"include/tbb/**/**", "include/tbb/**/**",
]), ]),
srcs = ["libtbb.a"],
includes = ["include"], includes = ["include"],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )