Merge branch 'fix-df-bug' into 'master'

Fix data format bug in MaceTensor.

See merge request !1037

.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

mace/core/runtime/cpu/cpu_runtime.cc

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <cerrno>
+#include <cmath>
 #include <cstring>
 #include <fstream>
 #include <string>

mace/libmace/mace.cc

@@ -293,9 +293,10 @@ MaceTensor::MaceTensor(const std::vector<int64_t> &shape,
                        std::shared_ptr<float> 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<MaceTensor::Impl>();
   impl_->shape = shape;
   impl_->data = data;