From c59be5ae4265eb974ee2aff6fe55742b3d4a7563 Mon Sep 17 00:00:00 2001 From: yejianwu Date: Thu, 17 May 2018 22:16:57 +0800 Subject: [PATCH] update copts in bazel --- mace/benchmark/BUILD | 13 ++++++++----- mace/codegen/BUILD | 10 +++++----- mace/core/BUILD | 6 ++++-- mace/examples/BUILD | 2 +- mace/kernels/BUILD | 4 ++-- mace/ops/BUILD | 8 ++++---- mace/public/BUILD | 2 +- mace/test/BUILD | 4 ++-- mace/utils/BUILD | 8 ++++---- tools/sh_commands.py | 4 ---- 10 files changed, 31 insertions(+), 30 deletions(-) diff --git a/mace/benchmark/BUILD b/mace/benchmark/BUILD index 279586b9..4bbb48e0 100644 --- a/mace/benchmark/BUILD +++ b/mace/benchmark/BUILD @@ -16,7 +16,7 @@ cc_library( srcs = ["statistics.cc"], hdrs = ["statistics.h"], linkstatic = 1, - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "//mace/kernels", "//mace/utils", @@ -28,8 +28,12 @@ cc_binary( srcs = [ "benchmark_model.cc", ], - copts = if_android(["-DMACE_ENABLE_OPENCL"]), - linkopts = ["-Werror"] + if_openmp_enabled(["-fopenmp"]), + copts = [ + "-Werror", + "-Wextra", + "-Wno-missing-field-initializers", + ] + if_android(["-DMACE_ENABLE_OPENCL"]), + linkopts = if_openmp_enabled(["-fopenmp"]), linkstatic = 1, deps = [ ":statistics", @@ -41,7 +45,6 @@ cc_binary( cc_library( name = "libmace_merged", - copts = ["-Werror"], srcs = [ "libmace_merged.a", ], @@ -53,7 +56,7 @@ cc_binary( srcs = ["model_throughput_test.cc"], linkopts = if_openmp_enabled(["-fopenmp"]), linkstatic = 1, - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ ":libmace_merged", "//external:gflags_nothreads", diff --git a/mace/codegen/BUILD b/mace/codegen/BUILD index e8a35acd..16f09ac6 100644 --- a/mace/codegen/BUILD +++ b/mace/codegen/BUILD @@ -10,7 +10,7 @@ cc_library( srcs = glob(["models/*/*.cc"]), hdrs = glob(["models/*/*.h"]), linkstatic = 1, - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "//mace/core", "//mace/ops", @@ -20,28 +20,28 @@ cc_library( cc_library( name = "generated_opencl", srcs = glob(["opencl/*.cc"]), - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], linkstatic = 1, ) cc_library( name = "generated_tuning_params", srcs = ["tuning/tuning_params.cc"], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], linkstatic = 1, ) cc_library( name = "generated_version", srcs = ["version/version.cc"], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], linkstatic = 1, ) cc_library( name = "generated_mace_engine_factory", hdrs = ["engine/mace_engine_factory.h"], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "//mace/public", ], diff --git a/mace/core/BUILD b/mace/core/BUILD index 46696338..abc5094e 100644 --- a/mace/core/BUILD +++ b/mace/core/BUILD @@ -44,6 +44,8 @@ cc_library( )) + if_hexagon_enabled(glob(["runtime/hexagon/*.h"])), copts = [ "-Werror", + "-Wextra", + "-Wno-missing-field-initializers", ] + if_openmp_enabled([ "-fopenmp", "-DMACE_ENABLE_OPENMP", @@ -77,7 +79,7 @@ cc_library( hdrs = glob([ "runtime/opencl/*.h", ]), - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "@opencl_clhpp//:opencl_clhpp", "@opencl_headers//:opencl20_headers", @@ -94,7 +96,7 @@ cc_library( hdrs = [ "testing/test_benchmark.h", ], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ ":core", "//external:gflags_nothreads", diff --git a/mace/examples/BUILD b/mace/examples/BUILD index c66b1563..3f2fc38d 100644 --- a/mace/examples/BUILD +++ b/mace/examples/BUILD @@ -6,7 +6,7 @@ cc_binary( srcs = ["example.cc"], linkopts = if_openmp_enabled(["-fopenmp"]), linkstatic = 1, - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "//external:gflags_nothreads", "//mace/codegen:generated_models", diff --git a/mace/kernels/BUILD b/mace/kernels/BUILD index afa394c5..3e837d85 100644 --- a/mace/kernels/BUILD +++ b/mace/kernels/BUILD @@ -38,7 +38,7 @@ cc_library( "opencl/*.h", "buffer_to_image.h", ])), - copts = ["-Werror"] + + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"] + if_openmp_enabled(["-fopenmp"]) + if_neon_enabled(["-DMACE_ENABLE_NEON"]) + if_android_armv7(["-mfpu=neon"]) + @@ -62,7 +62,7 @@ cc_test( "opencl/*_test.cc", ], ), - copts = ["-Werror"] + + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"] + if_openmp_enabled(["-fopenmp"]) + if_neon_enabled(["-DMACE_ENABLE_NEON"]) + if_android_armv7(["-mfpu=neon"]) + diff --git a/mace/ops/BUILD b/mace/ops/BUILD index 9dfc2768..c925ff13 100644 --- a/mace/ops/BUILD +++ b/mace/ops/BUILD @@ -15,7 +15,7 @@ cc_library( hdrs = [ "ops_test_util.h", ], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "//mace/core", "@gtest//:gtest", @@ -41,7 +41,7 @@ cc_library( ["*.h"], exclude = ["ops_test_util.h"], ), - copts = ["-Werror"] + + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"] + if_openmp_enabled(["-fopenmp"]) + if_neon_enabled(["-DMACE_ENABLE_NEON"]) + if_android_armv7(["-mfpu=neon"]) + @@ -60,7 +60,7 @@ cc_test( srcs = glob( ["*_test.cc"], ), - copts = ["-Werror"] + + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"] + if_openmp_enabled(["-fopenmp"]) + if_neon_enabled(["-DMACE_ENABLE_NEON"]) + if_android_armv7(["-mfpu=neon"]) + @@ -80,7 +80,7 @@ cc_test( name = "ops_benchmark", testonly = 1, srcs = glob(["*_benchmark.cc"]), - copts = ["-Werror"] + + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"] + if_openmp_enabled(["-fopenmp"]) + if_neon_enabled(["-DMACE_ENABLE_NEON"]) + if_android_armv7(["-mfpu=neon"]) + diff --git a/mace/public/BUILD b/mace/public/BUILD index 5f1be828..d0fe0d94 100644 --- a/mace/public/BUILD +++ b/mace/public/BUILD @@ -13,7 +13,7 @@ cc_library( "mace.h", "mace_runtime.h", ], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "//mace/proto:mace_cc", ], diff --git a/mace/test/BUILD b/mace/test/BUILD index a874421d..afc2738a 100644 --- a/mace/test/BUILD +++ b/mace/test/BUILD @@ -13,7 +13,7 @@ cc_test( name = "mace_api_test", testonly = 1, srcs = ["mace_api_test.cc"], - copts = ["-Werror"] + + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"] + if_openmp_enabled(["-fopenmp"]) + if_neon_enabled(["-DMACE_ENABLE_NEON"]) + if_android_armv7(["-mfpu=neon"]) + @@ -34,7 +34,7 @@ cc_test( name = "mace_api_mt_test", testonly = 1, srcs = ["mace_api_mt_test.cc"], - copts = ["-Werror"] + + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"] + if_openmp_enabled(["-fopenmp"]) + if_neon_enabled(["-DMACE_ENABLE_NEON"]) + if_android_armv7(["-mfpu=neon"]) + diff --git a/mace/utils/BUILD b/mace/utils/BUILD index e42a2a74..140d1103 100644 --- a/mace/utils/BUILD +++ b/mace/utils/BUILD @@ -28,7 +28,7 @@ cc_library( linkopts = if_android([ "-llog", ]), - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ "//mace/public", "//mace/proto:mace_cc", @@ -40,7 +40,7 @@ cc_library( srcs = [ "tuner_development.cc", ], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ ":utils", ], @@ -51,7 +51,7 @@ cc_library( srcs = [ "tuner_production.cc", ], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], deps = [ ":utils", "//mace/codegen:generated_tuning_params", @@ -64,7 +64,7 @@ cc_test( srcs = [ "tuner_test.cc", ], - copts = ["-Werror"], + copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"], linkopts = if_android([ "-pie", "-lm", # Required by unordered_map diff --git a/tools/sh_commands.py b/tools/sh_commands.py index d8307aa6..9ab3dd00 100644 --- a/tools/sh_commands.py +++ b/tools/sh_commands.py @@ -287,8 +287,6 @@ def bazel_build(target, target, "--copt=-std=c++11", "--copt=-D_GLIBCXX_USE_C99_MATH_TR1", - "--copt=-Wextra", - "--copt=-Wno-missing-field-initializers", "--copt=-O3", "--define", "openmp=%s" % str(enable_openmp).lower(), @@ -315,8 +313,6 @@ def bazel_build(target, "--cpu=%s" % abi, "--copt=-std=c++11", "--copt=-D_GLIBCXX_USE_C99_MATH_TR1", - "--copt=-Wextra", - "--copt=-Wno-missing-field-initializers", "--copt=-DMACE_OBFUSCATE_LITERALS", "--copt=-O3", "--define", -- GitLab