Fix amalgamation compiling issue. (apache#2814)

* .gitignore
Add Eclipse project files

* Fix amalgamation compiling issue (apache#2602, apache#2808). Add minimum Android API
level requirement in README.

* Fix amalgamation compiling issue (apache#2602, apache#2808)

Keep ${OPENBLAS_ROOT}/include and ${OPENBLAS_ROOT}/lib in Makefile

.gitignore

@@ -110,3 +110,8 @@ scala-package/*/*/target/
 !scala-package/*/bin
 *.bak
 */node_modules/
+
+# Eclipse project config
+.project
+.cproject
+.pydevproject

amalgamation/Makefile

@@ -1,14 +1,14 @@
 export MXNET_ROOT=`pwd`/..
 # Change this to path of openblas
-export OPENBLAS_ROOT=`pwd`/OpenBLAS
+export OPENBLAS_ROOT=${MXNET_ROOT}/../OpenBLAS
 
 # Whether use minimum build without blas and SSE, this will make the library super slow
 ifndef MIN
-	export MIN= 0
+	export MIN=0
 endif
 
 ifndef ANDROID
-        export ANDROID=0
+    export ANDROID=0
 endif
 
 
@@ -17,8 +17,8 @@ endif
 
 CFLAGS=-std=c++11 -Wno-unknown-pragmas -Wall
 ifneq ($(MIN), 1)
-	CFLAGS+= -I${OPENBLAS_ROOT}/include
-	LDFLAGS+=-L${OPENBLAS_ROOT}/lib -lopenblas
+	CFLAGS += -I${OPENBLAS_ROOT} -I${OPENBLAS_ROOT}/include
+	LDFLAGS+= -L${OPENBLAS_ROOT} -L${OPENBLAS_ROOT}/lib -lopenblas
 endif
 
 
@@ -68,4 +68,4 @@ ${MXNET_ROOT}/lib/libmxnet_predict.so:  mxnet_predict-all.o
 	ls -alh $@
 
 clean:
-	rm -f *.d *.o
+	rm -f *.d *.o *.so *.a mxnet_predict-all.cc

amalgamation/README.md

@@ -24,7 +24,7 @@ This module is created by [Jack Deng](https://github.com/jdeng).
 
 Android
 ---------------
-Setup NDK and build your standalone toolchain. [Instructions](http://developer.android.com/ndk/guides/standalone_toolchain.html#itc) Use the Advanced Method!!! In particular set PATH, CC and CXX.
+Setup NDK and build your standalone toolchain. [Instructions](http://developer.android.com/ndk/guides/standalone_toolchain.html#itc) Use the Advanced Method!!! In particular set PATH, CC and CXX. The minimum API level required is 16.
 
 Example:
 ```
@@ -33,7 +33,7 @@ export CC=arm-linux-androideabi-gcc   # or export CC=arm-linux-androideabi-clang
 export CXX=arm-linux-androideabi-g++  # or export CXX=arm-linux-androideabi-clang++
 ```
 
-Build OpenBlas for Android: [Build OpenBlas](https://github.com/xianyi/OpenBLAS/wiki/How-to-build-OpenBLAS-for-Android)
+Build OpenBLAS for Android: [Build OpenBLAS](https://github.com/xianyi/OpenBLAS/wiki/How-to-build-OpenBLAS-for-Android) Please put OpenBLAS source code outside mxnet directory.
 Modify OPENBLAS_ROOT in Makefile
 Type ```make ANDROID=1```
 

amalgamation/amalgamation.py

@@ -30,14 +30,15 @@ def get_sources(def_file):
     sources = []
     files = []
     visited = set()
+    mxnet_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir))
     for line in open(def_file):
         files = files + line.strip().split(' ')
 
     for f in files:
         f = f.strip()
-        if not f or f.endswith('.o') or f == '\\': continue
+        if not f or f.endswith('.o:') or f == '\\': continue
         fn = os.path.relpath(f)
-        if fn.find('/usr/') < 0 and fn not in visited:
+        if os.path.abspath(f).startswith(mxnet_path) and fn not in visited:
             sources.append(fn)
             visited.add(fn)
     return sources