- added support for CrystaX and Google NDK

ctuning · Nov 14, 2016 · d79aac1 · d79aac1
1 parent 431144e
commit d79aac1
Show file tree

Hide file tree

Showing 44 changed files with 10,299 additions and 188 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,6 @@
 * 2016.11.14 - added ViennaCL trunk package (CPU / OpenCL) targeting Android and Linux
              - added clBLAS and clBLAST targetting Android (though problems with native NDK)
+             - added support for CrystaX and Google NDK
 
 * 2016.11.11 - added OpenCV package for Android
              - added OpenBLAS package for Android

diff --git a/package/.cm/alias-a-lib-clblas-trunk-android b/package/.cm/alias-a-lib-clblas-trunk-android
@@ -0,0 +1 @@
+9f45f78aa8e2dbb3
diff --git a/package/.cm/alias-a-lib-clblas-with-internal-boost-trunk b/package/.cm/alias-a-lib-clblas-with-internal-boost-trunk
diff --git a/package/.cm/alias-a-lib-clblast-trunk-android b/package/.cm/alias-a-lib-clblast-trunk-android
@@ -0,0 +1 @@
+74e239b5cb03d3bf
diff --git a/package/.cm/alias-a-lib-viennacl-opencl-trunk-android b/package/.cm/alias-a-lib-viennacl-opencl-trunk-android
@@ -0,0 +1 @@
+9494ad8af5bddd0c
diff --git a/package/.cm/alias-a-lib-viennacl-trunk-android b/package/.cm/alias-a-lib-viennacl-trunk-android
@@ -0,0 +1 @@
+9c84a8bad0f6efff
diff --git a/package/.cm/alias-u-51e458694597d117 b/package/.cm/alias-u-51e458694597d117
diff --git a/package/.cm/alias-u-74e239b5cb03d3bf b/package/.cm/alias-u-74e239b5cb03d3bf
@@ -0,0 +1 @@
+lib-clblast-trunk-android
diff --git a/package/.cm/alias-u-9494ad8af5bddd0c b/package/.cm/alias-u-9494ad8af5bddd0c
@@ -0,0 +1 @@
+lib-viennacl-opencl-trunk-android
diff --git a/package/.cm/alias-u-9c84a8bad0f6efff b/package/.cm/alias-u-9c84a8bad0f6efff
@@ -0,0 +1 @@
+lib-viennacl-trunk-android
diff --git a/package/.cm/alias-u-9f45f78aa8e2dbb3 b/package/.cm/alias-u-9f45f78aa8e2dbb3
@@ -0,0 +1 @@
+lib-clblas-trunk-android
diff --git a/package/lib-boost-1.62.0-min-android/install.sh b/package/lib-boost-1.62.0-min-android/install.sh
@@ -55,8 +55,6 @@ cd ${INSTALL_DIR}
 
 rm -f ${PACKAGE_FILE1}
 
-rm -rf install
-
 rm -rf obj
 mkdir obj
 cd obj
@@ -67,7 +65,12 @@ cp -rf ${PACKAGE_DIR}/misc/* ${INSTALL_DIR}
 echo ""
 echo "Executing cmake ..."
 
-cmake -DCMAKE_TOOLCHAIN_FILE="${PACKAGE_DIR}/misc/android.toolchain.cmake" \
+CK_TOOLCHAIN=android.toolchain.cmake
+if [ "${CK_ENV_LIB_CRYSTAX_LIB}" != "" ] ; then
+  CK_TOOLCHAIN=toolchain.cmake
+fi
+
+cmake -DCMAKE_TOOLCHAIN_FILE="${PACKAGE_DIR}/misc/${CK_TOOLCHAIN}" \
       -DANDROID_NDK="${CK_ANDROID_NDK_ROOT_DIR}" \
       -DCMAKE_BUILD_TYPE=Release \
       -DANDROID_ABI="${CK_ANDROID_ABI}" \
@@ -94,6 +97,8 @@ fi
 echo ""
 echo "Installing package ..."
 
+rm -rf install
+
 make install/strip
 if [ "${?}" != "0" ] ; then
   echo "Error: installation failed!"