Merge branch 'fix' into 'master'

Minor fixes

See merge request !8

mace/core/integral_types.h

@@ -6,14 +6,14 @@
 #ifndef MACE_CORE_INTEGRAL_TYPES_H_
 #define MACE_CORE_INTEGRAL_TYPES_H_
 
-typedef signed char int8;
-typedef short int16;
-typedef int int32;
+typedef int8_t int8;
+typedef int16_t int16;
+typedef int32_t int32;
 typedef int64_t int64;
 
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef unsigned int uint32;
+typedef uint8_t uint8;
+typedef uint16_t uint16;
+typedef uint32_t uint32;
 typedef uint64_t uint64;
 
 #endif // MACE_CORE_INTEGRAL_TYPES_H_

mace/kernels/BUILD

@@ -17,6 +17,9 @@ cc_library(
     deps = [
         "//mace/core:core",
     ],
-    copts = ['-std=c++11'],
+    copts = ['-std=c++11'] + if_android([
+        "-mfpu=neon", # TODO recheck the flags
+        "-mfloat-abi=hard",
+        ]),
 )