Merge branch 'master' into 'master'

fix compilation

See merge request !124

mace/dsp/BUILD

@@ -24,7 +24,7 @@ cc_library(
         "*.h",
         "hexagon/*.h",
     ]),
-    copts = ["-std=c++11"],
+    copts = ["-std=c++11", "-D_GLIBCXX_USE_C99_MATH_TR1"],
     deps = [
         "//mace/proto:cc_proto",
         "//mace/core:core",
@@ -36,7 +36,7 @@ cc_test(
     name = "dsp_test",
     testonly = 1,
     srcs = glob(["*_test.cc"]),
-    copts = ["-std=c++11"],
+    copts = ["-std=c++11", "-D_GLIBCXX_USE_C99_MATH_TR1"],
     linkopts = if_android([
         "-ldl",
         "-lm",
@@ -52,7 +52,7 @@ cc_test(
     name = "dsp_op_test",
     testonly = 1,
     srcs = glob(["test/*_test.cc"]),
-    copts = ["-std=c++11"],
+    copts = ["-std=c++11", "-D_GLIBCXX_USE_C99_MATH_TR1"],
     linkopts = if_android([
         "-ldl",
         "-lm",

mace/dsp/hexagon_control_wrapper.h

@@ -96,8 +96,8 @@ class HexagonControlWrapper {
     int res = hexagon_nn_execute_new(nn_id_, inputs, num_inputs,
                                      outputs, num_outputs);
 
-    delete(inputs);
-    delete(outputs);
+    delete [] inputs;
+    delete [] outputs;
     return res == 0;
   };
 

mace/dsp/util/BUILD

@@ -20,7 +20,7 @@ cc_library(
     hdrs = glob([
         "*.h",
     ]),
-    copts = ["-std=c++11"],
+    copts = ["-std=c++11", "-D_GLIBCXX_USE_C99_MATH_TR1"],
     deps = [
         "//mace/core:core",
     ],