From 13b916f32a635e3104e36b0ba9f01ab44d77e508 Mon Sep 17 00:00:00 2001 From: dolphin8 Date: Fri, 29 Jun 2018 08:05:08 +0000 Subject: [PATCH] fix Dockerfile --- Dockerfile | 6 +++--- src/operators/kernel/central-arm-func/batchnorm_arm_func.h | 1 + tools/android-cmake/android.toolchain.cmake | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82a08b3a27..8f54b870d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,6 @@ RUN apt-get autoremove -y && apt-get clean RUN pip install --upgrade pip RUN pip install wheel && pip install pre-commit RUN ln -s clang-format-5.0 /usr/bin/clang-format -# RUN cd /tmp && curl -O http://mirrors.neusoft.edu.cn/android/repository/android-ndk-r17b-linux-x86_64.zip -# RUN cd /opt && unzip /tmp/android-ndk-r17b-linux-x86_64.zip -# ENV NDK_ROOT /opt/android-ndk-r17b +RUN cd /tmp && curl -O http://mirrors.neusoft.edu.cn/android/repository/android-ndk-r17b-linux-x86_64.zip +RUN cd /opt && unzip /tmp/android-ndk-r17b-linux-x86_64.zip +ENV NDK_ROOT /opt/android-ndk-r17b diff --git a/src/operators/kernel/central-arm-func/batchnorm_arm_func.h b/src/operators/kernel/central-arm-func/batchnorm_arm_func.h index 7f02d768b7..2086265ec6 100644 --- a/src/operators/kernel/central-arm-func/batchnorm_arm_func.h +++ b/src/operators/kernel/central-arm-func/batchnorm_arm_func.h @@ -16,6 +16,7 @@ limitations under the License. */ #pragma once +#include #include "operators/op_param.h" namespace paddle_mobile { diff --git a/tools/android-cmake/android.toolchain.cmake b/tools/android-cmake/android.toolchain.cmake index 4db5cd41b4..a57d9c102f 100644 --- a/tools/android-cmake/android.toolchain.cmake +++ b/tools/android-cmake/android.toolchain.cmake @@ -37,7 +37,7 @@ # ANDROID_DISABLE_FORMAT_STRING_CHECKS # ANDROID_CCACHE -cmake_minimum_required(VERSION 3.6.0) +# cmake_minimum_required(VERSION 3.6.0) # Inhibit all of CMake's own NDK handling code. set(CMAKE_SYSTEM_VERSION 1) -- GitLab