Merge branch 'develop' into develop

src/operators/op_param.h

@@ -993,7 +993,7 @@ class FusionConvAddBNReluParam : public OpParam {
     input_variance_ = InputVarianceFrom<LoDTensor>(inputs, scope);
     epsilon_ = GetAttr<float>("epsilon", attrs);
     momentum_ = GetAttr<float>("momentum", attrs);
-    is_test_ = GetAttr<bool>("is_test", attrs);
+    //    is_test_ = GetAttr<bool>("is_test", attrs);
   }
   Tensor *Bias() const { return bias_; }
 

tools/build.sh

@@ -93,10 +93,7 @@ build_for_ios() {
 #    rm -rf "../build"
     PLATFORM="ios"
     MODE="Release"
-#    IOS_ARCH="armv7"
-#    IOS_ARCH="armv7s"
-    IOS_ARCH="arm64"    # Users could choose "armv7" or "armv7s" platforms.
-    BUILD_DIR=../build/release/"${PLATFORM}"/"${IOS_ARCH}"
+    BUILD_DIR=../build/release/"${PLATFORM}"/
     TOOLCHAIN_FILE="./tools/ios-cmake/ios.toolchain.cmake"
     mkdir -p "${BUILD_DIR}"
     if [ $# -eq 1 ]; then

tools/ios-cmake/ios.toolchain.cmake

@@ -34,6 +34,7 @@ set (CMAKE_SYSTEM_VERSION 1)
 set (UNIX True)
 set (APPLE True)
 set (IOS True)
+set (IOS_ARCH armv7 armv7s arm64)
 
 # Required as of cmake 2.8.10
 set (CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)