README.md

@@ -11,6 +11,8 @@ iPhone5s | Meizu M3 note
 
 > NOTE: Cmake version 3.7.2 builds faster lib than version 3.5.1 (verified on Ubuntu 16.10/Android NDK r14). Don't know why. So please use a newer cmake if you can.
 
+> NOTE: NDK version r16+ is not supported. NDK r16 moves all standalone headers to [unified headers](https://android.googlesource.com/platform/ndk/+/ndk-release-r16/CHANGELOG.md). It causes a lot of cross compile problems which I cannot resolve. See issue [#52](https://github.com/solrex/caffe-mobile/issues/52).
+
 # For iPhone or iPhone Simulator
 
 ## Step 1: Build Caffe-Mobile Lib with cmake
@@ -109,6 +111,7 @@ $ make -j 4
 
  - Based on https://github.com/BVLC/caffe
  - Inspired by https://github.com/chyh1990/caffe-compact
+ - Android JNI code based on https://github.com/sh1r0/caffe
  - Use https://github.com/Yangqing/ios-cmake
  - Use https://github.com/taka-no-me/android-cmake
  - Windows build script inspired by https://github.com/luoyetx/mini-caffe/tree/master/android

examples/android/CaffeSimple/app/build.gradle

@@ -35,6 +35,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:support-v4:25.1.0'
     // Specifid for MNIST grayscale png file reading. You can remove it as you need.
     //compile 'ar.com.hjg:pngj:2.0.1'
     testCompile 'junit:junit:4.12'

examples/android/CaffeSimple/app/src/main/java/com/yangwenbo/caffesimple/MainActivity.java

@@ -1,18 +1,22 @@
 package com.yangwenbo.caffesimple;
 
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
+import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v4.content.ContextCompat;
 import android.os.Bundle;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.Manifest;
 
 import com.yangwenbo.caffemobile.CaffeMobile;
 
@@ -39,6 +43,28 @@ public int compareTo(Cate other) {
         }
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+        switch (requestCode) {
+            case 0: {
+                // If request is cancelled, the result arrays are empty.
+                if (grantResults.length > 0
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+
+                    // permission was granted, yay! Do the
+                    // contacts-related task you need to do.
+
+                } else {
+
+                    // permission denied, boo! Disable the
+                    // functionality that depends on this permission.
+                }
+                return;
+            }
+        }
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,6 +74,11 @@ protected void onCreate(Bundle savedInstanceState) {
         tv.append("Loading caffe model...");
         tv.setMovementMethod(new ScrollingMovementMethod());
         // Show test image
+        if (ContextCompat.checkSelfPermission(this,
+                Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},0);
+        }
         final File imageFile = new File(Environment.getExternalStorageDirectory(), "test_image.jpg");
         Bitmap bmp = BitmapFactory.decodeFile(imageFile.getPath());
         ImageView img = (ImageView) findViewById(R.id.testImage);

examples/android/CaffeSimple/app/src/main/res/layout/activity_main.xml

@@ -13,18 +13,17 @@
     tools:context="com.yangwenbo.caffesimple.MainActivity">
 
     <Button
-        android:text="Run Caffe Model"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="100dp"
         android:id="@+id/button"
-        android:layout_alignParentTop="true"
-        android:textAlignment="center"
         android:layout_width="150dp"
-        android:layout_height="30dp" />
+        android:layout_height="36dp"
+        android:layout_marginStart="100dp"
+        android:layout_alignParentTop="true"
+        android:text="Run Caffe Model"
+        android:textAlignment="center" />
 
     <ImageView
-        android:layout_width="28dp"
-        android:layout_height="28dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         app:srcCompat="@mipmap/ic_launcher"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"

src/jni/caffe_jni.cpp

@@ -1,3 +1,9 @@
+/**
+ * Original version of this file is provided in https://github.com/sh1r0/caffe,
+ * which is part of https://github.com/sh1r0/caffe-android-lib.
+ * Thanks to github user "sh1r0" for sharing this.
+ */
+
 #include <jni.h>
 
 #include "caffe_mobile.hpp"

src/jni/caffe_mobile.cpp

@@ -1,3 +1,9 @@
+/**
+ * Original version of this file is provided in https://github.com/sh1r0/caffe,
+ * which is part of https://github.com/sh1r0/caffe-android-lib.
+ * Thanks to github user "sh1r0" for sharing this.
+ */
+
 #include "caffe_mobile.hpp"
 
 namespace caffe {

src/jni/caffe_mobile.hpp

@@ -1,3 +1,9 @@
+/**
+ * Original version of this file is provided in https://github.com/sh1r0/caffe,
+ * which is part of https://github.com/sh1r0/caffe-android-lib.
+ * Thanks to github user "sh1r0" for sharing this.
+ */
+
 #ifndef JNI_CAFFE_MOBILE_HPP_
 #define JNI_CAFFE_MOBILE_HPP_
 

third_party/build-openblas.sh

@@ -3,7 +3,7 @@
 PLATFORM=Android
 
 # Options for All
-OPENBLAS_VERSION=0.2.19
+OPENBLAS_VERSION=0.3.2
 MAKE_FLAGS="$MAKE_FLAGS -j 4"
 BUILD_DIR=".cbuild"
 
@@ -127,6 +127,7 @@ function build-Android {
         make ${MAKE_FLAGS} \
             NOFORTRAN=1 \
             NO_NOLAPACKE=1 \
+            NO_SHARED=1 \
             OSNAME=Android \
             SMP=1 \
             USE_THREAD=1 \
@@ -136,7 +137,7 @@ function build-Android {
             HOSTCC=gcc \
             TARGET=$TARGET \
             ARM_SOFTFP_ABI=$ARM_SOFTFP_ABI \
-            BINARY=$BINARY
+            BINARY=$BINARY || exit 1
         make \
             SMP=1 \
             PREFIX="../$PREFIX" \
@@ -147,9 +148,9 @@ function build-Android {
     ln -s $PREFIX OpenBLAS
 }
 
-if [ "${ANDROID_ABI}" = "armeabi-v7a with NEON" ]; then
-  fetch-OpenBLAS-softfp
-else 
-  fetch-OpenBLAS
-fi 
+#if [ "${ANDROID_ABI}" = "armeabi-v7a with NEON" ]; then
+#  fetch-OpenBLAS-softfp
+#else 
+fetch-OpenBLAS
+#fi 
 build-$PLATFORM