fix deps in tests

.gitlab-ci.yml

@@ -52,6 +52,7 @@ api_test:
     - if [ -z "$TARGET_SOCS" ]; then TARGET_SOCS=random; fi
     - python tools/bazel_adb_run.py --target="//mace/test:mace_api_test" --run_target=True --stdout_processor=unittest_stdout_processor --target_abis=armeabi-v7a,arm64-v8a --target_socs=$TARGET_SOCS
     - python tools/bazel_adb_run.py --target="//mace/test:mace_api_mt_test" --run_target=True --stdout_processor=unittest_stdout_processor --target_abis=armeabi-v7a,arm64-v8a --target_socs=$TARGET_SOCS
+    - python tools/bazel_adb_run.py --target="//mace/test:mace_api_exception_test" --run_target=True --stdout_processor=unittest_stdout_processor --target_abis=armeabi-v7a,arm64-v8a --target_socs=$TARGET_SOCS
 
 ops_benchmark:
   stage: ops_benchmark

mace/ops/core_test.cc

@@ -51,7 +51,7 @@ TEST(CoreTest, INIT_MODE) {
   for (auto &op_def : op_defs) {
     net_def.add_op()->CopyFrom(op_def);
   }
-  std::shared_ptr<OperatorRegistryBase> op_registry(new OperatorRegistryBase());
+  std::shared_ptr<OperatorRegistryBase> op_registry(new OperatorRegistry());
   auto net =
       CreateNet(op_registry, net_def, &ws, DeviceType::GPU, NetMode::INIT);
   net->Run();

mace/ops/ops_test_util.h

@@ -29,6 +29,7 @@
 #include "mace/core/tensor.h"
 #include "mace/core/workspace.h"
 #include "mace/kernels/opencl/helper.h"
+#include "mace/ops/ops_register.h"
 #include "mace/utils/utils.h"
 
 namespace mace {
@@ -110,7 +111,7 @@ class OpDefBuilder {
 
 class OpsTestNet {
  public:
-  OpsTestNet() : op_registry_(new OperatorRegistryBase()) {}
+  OpsTestNet() : op_registry_(new OperatorRegistry()) {}
 
   template <DeviceType D, typename T>
   void AddInputFromArray(const std::string &name,

mace/test/BUILD

@@ -24,8 +24,7 @@ cc_test(
     linkstatic = 1,
     deps = [
         "//mace/ops:test",
-        "//mace/kernels:kernels",
-        "//mace/ops:ops",
+        "//mace/libmace:libmace",
         "@gtest//:gtest_main",
     ],
 )
@@ -45,8 +44,7 @@ cc_test(
     linkstatic = 1,
     deps = [
         "//mace/ops:test",
-        "//mace/kernels:kernels",
-        "//mace/ops:ops",
+        "//mace/libmace:libmace",
         "@gtest//:gtest_main",
     ],
 )
@@ -66,8 +64,7 @@ cc_test(
     linkstatic = 1,
     deps = [
         "//mace/ops:test",
-        "//mace/kernels:kernels",
-        "//mace/ops:ops",
+        "//mace/libmace:libmace",
         "@gtest//:gtest_main",
     ],
 )