Merge branch 'strip_libmodels' into 'master'

strip generated models.a

See merge request !735

mace/benchmark/BUILD

@@ -35,7 +35,7 @@ cc_binary(
     deps = [
         ":statistics",
         "//external:gflags_nothreads",
-        "//mace/codegen:generated_models",
+        "//mace/codegen:libmodels",
         "//mace/codegen:generated_mace_engine_factory",
         "//mace/libmace:libmace",
     ],
@@ -65,7 +65,7 @@ cc_binary(
         ":statistics",
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",
-        "//mace/codegen:generated_models",
+        "//mace/codegen:libmodels",
         "//mace/libmace:libmace_dynamic",
     ],
 )

mace/codegen/BUILD

@@ -8,7 +8,7 @@ package(
 load("//mace:mace.bzl", "mace_version_genrule", "encrypt_opencl_kernel_genrule")
 
 cc_library(
-    name = "generated_models",
+    name = "libmodels",
     srcs = glob(["models/*/*.cc"]),
     hdrs = glob(["models/*/*.h"]),
     copts = ["-Werror", "-Wextra", "-Wno-missing-field-initializers"],
@@ -17,6 +17,16 @@ cc_library(
     ],
 )
 
+genrule(
+    name = "generated_models",
+    srcs = [
+        ":libmodels",
+    ],
+    outs = ["libgenerated_models.a"],
+    cmd = "$(STRIP) -x $(SRCS) -o $@",
+    visibility = ["//visibility:public"],
+)
+
 mace_version_genrule()
 
 encrypt_opencl_kernel_genrule()

mace/tools/validation/BUILD

@@ -15,7 +15,7 @@ cc_binary(
     deps = [
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",
-        "//mace/codegen:generated_models",
+        "//mace/codegen:libmodels",
         "//mace/libmace",
     ],
 )
@@ -42,7 +42,7 @@ cc_binary(
     deps = [
         "//external:gflags_nothreads",
         "//mace/codegen:generated_mace_engine_factory",
-        "//mace/codegen:generated_models",
+        "//mace/codegen:libmodels",
         "//mace/libmace:libmace_dynamic",
     ],
 )

tools/converter.py

@@ -66,7 +66,7 @@ LIBMACE_STATIC_TARGET = "//mace/libmace:libmace_static"
 LIBMACE_STATIC_PATH = "bazel-genfiles/mace/libmace/libmace.a"
 LIBMACE_DYNAMIC_PATH = "bazel-bin/mace/libmace/libmace.so"
 MODEL_LIB_TARGET = "//mace/codegen:generated_models"
-MODEL_LIB_PATH = "bazel-bin/mace/codegen/libgenerated_models.a"
+MODEL_LIB_PATH = "bazel-genfiles/mace/codegen/libgenerated_models.a"
 MACE_RUN_STATIC_NAME = "mace_run_static"
 MACE_RUN_DYNAMIC_NAME = "mace_run_dynamic"
 MACE_RUN_STATIC_TARGET = "//mace/tools/validation:" + MACE_RUN_STATIC_NAME