From 8777ff3fa6ebac4587454e8ab845d29be94b1aba Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Tue, 13 Dec 2016 19:12:41 -0800 Subject: [PATCH] Use yapf to auto format all BUILD and WORKSPACE files --- WORKSPACE | 7 +- paddle/cuda/src/hl_cuda_device.cc | 2 +- third_party/gflags_test/BUILD | 11 ++- third_party/gflags_test/gflags_test.cc | 9 +-- third_party/glog.BUILD | 98 +++++++++----------------- third_party/glog_test/BUILD | 11 ++- third_party/glog_test/glog_test.cc | 4 +- third_party/gtest.BUILD | 20 ++---- 8 files changed, 60 insertions(+), 102 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4581b89aaf0..f097c41da85 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ http_archive( name="protobuf", url="http://github.com/google/protobuf/archive/v3.1.0.tar.gz", sha256="0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7", - strip_prefix="protobuf-3.1.0", ) + strip_prefix="protobuf-3.1.0") # External dependency to gtest 1.7.0. This method comes from # https://www.bazel.io/versions/master/docs/tutorial/cpp.html. @@ -12,7 +12,7 @@ new_http_archive( url="https://github.com/google/googletest/archive/release-1.7.0.zip", sha256="b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0", build_file="third_party/gtest.BUILD", - strip_prefix="googletest-release-1.7.0", ) + strip_prefix="googletest-release-1.7.0") # External dependency to gflags. This method comes from # https://github.com/gflags/example/blob/master/WORKSPACE. @@ -20,8 +20,7 @@ new_git_repository( name="gflags", tag="v2.2.0", remote="https://github.com/gflags/gflags.git", - build_file="third_party/gflags.BUILD", -) + build_file="third_party/gflags.BUILD") # External dependency to glog. This method comes from # https://github.com/reyoung/bazel_playground/blob/master/WORKSPACE diff --git a/paddle/cuda/src/hl_cuda_device.cc b/paddle/cuda/src/hl_cuda_device.cc index b0bba73594d..d1814482929 100644 --- a/paddle/cuda/src/hl_cuda_device.cc +++ b/paddle/cuda/src/hl_cuda_device.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "hl_cuda.h" #include #include #include #include #include #include +#include "hl_cuda.h" #include "hl_cuda.ph" #include "hl_dso_loader.h" #include "hl_thread.ph" diff --git a/third_party/gflags_test/BUILD b/third_party/gflags_test/BUILD index a018299ec47..b50615203ba 100644 --- a/third_party/gflags_test/BUILD +++ b/third_party/gflags_test/BUILD @@ -1,11 +1,10 @@ licenses(["notice"]) # Apache 2.0 cc_test( - name = "gflags_test", - srcs = ["gflags_test.cc"], - copts = ["-Iexternal/gtest/include"], - deps = [ + name="gflags_test", + srcs=["gflags_test.cc"], + copts=["-Iexternal/gtest/include"], + deps=[ "@gtest//:gtest", "@gflags//:gflags", - ], -) + ], ) diff --git a/third_party/gflags_test/gflags_test.cc b/third_party/gflags_test/gflags_test.cc index 5e588c2279e..53286e7e5be 100644 --- a/third_party/gflags_test/gflags_test.cc +++ b/third_party/gflags_test/gflags_test.cc @@ -4,17 +4,14 @@ #include "gflags/gflags.h" #include "gtest/gtest.h" - DEFINE_bool(verbose, false, "Display program name before message"); DEFINE_string(message, "Hello world!", "Message to print"); -static bool IsNonEmptyMessage(const char *flagname, const std::string &value) -{ +static bool IsNonEmptyMessage(const char *flagname, const std::string &value) { return value[0] != '\0'; } DEFINE_validator(message, &IsNonEmptyMessage); - namespace third_party { namespace gflags_test { @@ -23,10 +20,10 @@ TEST(GflagsTest, ParseAndPrint) { gflags::SetVersionString("1.0.0"); int argc = 1; char program_name[] = "gflags_test"; - char** argv = new char*[2]; + char **argv = new char *[2]; argv[0] = program_name; argv[1] = NULL; - gflags::ParseCommandLineFlags(&argc, reinterpret_cast(&argv), true); + gflags::ParseCommandLineFlags(&argc, reinterpret_cast(&argv), true); EXPECT_EQ("gflags_test", std::string(gflags::ProgramInvocationShortName())); EXPECT_EQ("Hello world!", FLAGS_message); gflags::ShutDownCommandLineFlags(); diff --git a/third_party/glog.BUILD b/third_party/glog.BUILD index 52fe12a716c..a0ff1d6b416 100644 --- a/third_party/glog.BUILD +++ b/third_party/glog.BUILD @@ -1,13 +1,13 @@ licenses(["notice"]) cc_library( - visibility = ["//visibility:public"], - name = "glog", - includes = [ + visibility=["//visibility:public"], + name="glog", + includes=[ ".", "src", ], - copts = [ + copts=[ "-D_START_GOOGLE_NAMESPACE_='namespace google {'", "-D_END_GOOGLE_NAMESPACE_='}'", "-DGOOGLE_NAMESPACE='google'", @@ -45,7 +45,7 @@ cc_library( #"-fno-sanitize=address", "-Iexternal/glog/src", ], - srcs = [ + srcs=[ "src/demangle.cc", "src/logging.cc", "src/raw_logging.cc", @@ -59,7 +59,7 @@ cc_library( ":stl_logging_h", ":vlog_is_on_h", ], - hdrs = [ + hdrs=[ "src/demangle.h", "src/mock-log.h", "src/stacktrace.h", @@ -69,74 +69,47 @@ cc_library( "src/base/googleinit.h", "src/base/mutex.h", "src/glog/log_severity.h", - ], -) + ]) genrule( - name = "config_h", - srcs = [ - "src/config.h.cmake.in", - ], - outs = [ - "config.h", - ], - cmd = "awk '{ gsub(/^#cmakedefine/, \"//cmakedefine\"); print; }' $(<) > $(@)", + name="config_h", + srcs=["src/config.h.cmake.in"], + outs=["config.h"], + cmd="awk '{ gsub(/^#cmakedefine/, \"//cmakedefine\"); print; }' $(<) > $(@)", ) genrule( - name = "logging_h", - srcs = [ - "src/glog/logging.h.in", - ], - outs = [ - "glog/logging.h", - ], - cmd = "$(location :gen_sh) < $(<) > $(@)", - tools = [":gen_sh"], -) + name="logging_h", + srcs=["src/glog/logging.h.in"], + outs=["glog/logging.h"], + cmd="$(location :gen_sh) < $(<) > $(@)", + tools=[":gen_sh"]) genrule( - name = "raw_logging_h", - srcs = [ - "src/glog/raw_logging.h.in", - ], - outs = [ - "glog/raw_logging.h", - ], - cmd = "$(location :gen_sh) < $(<) > $(@)", - tools = [":gen_sh"], -) + name="raw_logging_h", + srcs=["src/glog/raw_logging.h.in"], + outs=["glog/raw_logging.h"], + cmd="$(location :gen_sh) < $(<) > $(@)", + tools=[":gen_sh"]) genrule( - name = "stl_logging_h", - srcs = [ - "src/glog/stl_logging.h.in", - ], - outs = [ - "glog/stl_logging.h", - ], - cmd = "$(location :gen_sh) < $(<) > $(@)", - tools = [":gen_sh"], -) + name="stl_logging_h", + srcs=["src/glog/stl_logging.h.in"], + outs=["glog/stl_logging.h"], + cmd="$(location :gen_sh) < $(<) > $(@)", + tools=[":gen_sh"]) genrule( - name = "vlog_is_on_h", - srcs = [ - "src/glog/vlog_is_on.h.in", - ], - outs = [ - "glog/vlog_is_on.h", - ], - cmd = "$(location :gen_sh) < $(<) > $(@)", - tools = [":gen_sh"], -) + name="vlog_is_on_h", + srcs=["src/glog/vlog_is_on.h.in"], + outs=["glog/vlog_is_on.h"], + cmd="$(location :gen_sh) < $(<) > $(@)", + tools=[":gen_sh"]) genrule( - name = "gen_sh", - outs = [ - "gen.sh", - ], - cmd = """ + name="gen_sh", + outs=["gen.sh"], + cmd=""" cat > $@ <<"EOF" #! /bin/sh sed -e 's/@ac_cv_have_unistd_h@/1/g' \ @@ -152,5 +125,4 @@ sed -e 's/@ac_cv_have_unistd_h@/1/g' \ -e 's/@ac_cv___attribute___noinline@/__attribute__((noinline))/g' \ -e 's/@ac_cv___attribute___noreturn@/__attribute__((noreturn))/g' \ -e 's/@ac_cv___attribute___printf_4_5@/__attribute__((__format__ (__printf__, 4, 5)))/g' -EOF""" -) +EOF""") diff --git a/third_party/glog_test/BUILD b/third_party/glog_test/BUILD index b0d790f6ae8..56d08e95f8e 100644 --- a/third_party/glog_test/BUILD +++ b/third_party/glog_test/BUILD @@ -1,11 +1,10 @@ licenses(["notice"]) # Apache 2.0 cc_test( - name = "glog_test", - srcs = ["glog_test.cc"], - copts = ["-Iexternal/gtest/include"], - deps =[ + name="glog_test", + srcs=["glog_test.cc"], + copts=["-Iexternal/gtest/include"], + deps=[ "@gtest//:gtest", "@glog//:glog", - ], -) + ], ) diff --git a/third_party/glog_test/glog_test.cc b/third_party/glog_test/glog_test.cc index a1e3fd71e4b..f1d737d625d 100644 --- a/third_party/glog_test/glog_test.cc +++ b/third_party/glog_test/glog_test.cc @@ -4,6 +4,4 @@ #include "glog/logging.h" #include "gtest/gtest.h" -TEST(GlogTest, Logging) { - LOG(INFO) << "Hello world"; -} +TEST(GlogTest, Logging) { LOG(INFO) << "Hello world"; } diff --git a/third_party/gtest.BUILD b/third_party/gtest.BUILD index e9187e51ef5..9255b51d9aa 100644 --- a/third_party/gtest.BUILD +++ b/third_party/gtest.BUILD @@ -1,14 +1,8 @@ cc_library( - name = "gtest", - srcs = glob( - ["src/*.cc"], - exclude = ["src/gtest-all.cc"] - ), - hdrs = glob([ - "include/**/*.h", - "src/*.h" - ]), - copts = ["-Iexternal/gtest/include"], - linkopts = ["-pthread"], - visibility = ["//visibility:public"], -) + name="gtest", + srcs=glob( + ["src/*.cc"], exclude=["src/gtest-all.cc"]), + hdrs=glob(["include/**/*.h", "src/*.h"]), + copts=["-Iexternal/gtest/include"], + linkopts=["-pthread"], + visibility=["//visibility:public"], ) -- GitLab