diff --git a/mace/benchmark/BUILD b/mace/benchmark/BUILD index 6931dcdc4c9ec0ce15725a346395843c16ee8cd4..6f8d6948e3c77d85a7fbb0b808154f39bbe0d0c6 100644 --- a/mace/benchmark/BUILD +++ b/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", ], ) diff --git a/mace/codegen/BUILD b/mace/codegen/BUILD index 1c76e8dd709343e5cc1e105fac57688a19a991bf..33275e18764621e3624649e39d4c3da45c04c78a 100644 --- a/mace/codegen/BUILD +++ b/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() diff --git a/mace/tools/validation/BUILD b/mace/tools/validation/BUILD index 5a5a8da3ceeb54c652ee05a81018a3774716faa6..b16b01f37132fa2d875c7fce6cbeb511acac6468 100644 --- a/mace/tools/validation/BUILD +++ b/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", ], ) diff --git a/tools/converter.py b/tools/converter.py index 941ea6471332236ac30a4a032c5030cda799fe8a..b94aa80d325ad673dea08ab778c577cf659879b0 100644 --- a/tools/converter.py +++ b/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