diff --git a/.travis.yml b/.travis.yml index 629ee5bd0773d73270fbb4c5d8bd624c16af1ddd..b0ba55e06293a857defd7943f58ba3e5ed339c46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,7 @@ jobs: - python tools/bazel_adb_run.py --target="//mace/test:mace_api_test" --run_target=False --target_abis=arm64-v8a || exit 1 - python tools/bazel_adb_run.py --target="//mace/test:mace_api_mt_test" --run_target=False --target_abis=arm64-v8a || exit 1 - echo 'Extra Test on ARM64' - - python tools/bazel_adb_run.py --target="//mace/utils:tuner_test" --run_target=False --target_abis=arm64-v8a || exit 1 + - python tools/bazel_adb_run.py --target="//mace/utils:utils_test" --run_target=False --target_abis=arm64-v8a || exit 1 env: TYPE=Extra-Test-ARM64-v8a os: linux dist: xenial diff --git a/mace/core/runtime/cpu/cpu_runtime.cc b/mace/core/runtime/cpu/cpu_runtime.cc index 5db5b36b1bb8bd2d2399f1cfa4ba406e78654a40..e5742ec11aa483c1fc5f01738bad311ef1df0050 100644 --- a/mace/core/runtime/cpu/cpu_runtime.cc +++ b/mace/core/runtime/cpu/cpu_runtime.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include #include diff --git a/mace/libmace/mace.cc b/mace/libmace/mace.cc index 927930fec485769b44a9df48284af3940034d9da..022f8e351e31d4419a7ebac135cf812b70a34359 100644 --- a/mace/libmace/mace.cc +++ b/mace/libmace/mace.cc @@ -293,9 +293,10 @@ MaceTensor::MaceTensor(const std::vector &shape, std::shared_ptr data, const DataFormat format) { MACE_CHECK_NOTNULL(data.get()); - MACE_CHECK(format == DataFormat::NHWC || format == DataFormat::NCHW - || format == OIHW, - "MACE only support NHWC, NCHW and OIHW formats of input now."); + MACE_CHECK(format == DataFormat::DF_NONE || format == DataFormat::NHWC + || format == DataFormat::NCHW || format == OIHW, + "MACE only support DF_NONE, NHWC, NCHW and OIHW " + "formats of input now."); impl_ = make_unique(); impl_->shape = shape; impl_->data = data;