added --env.CK_VIENNACL_DEBUG=ON flag to turn on debugging of ViennaCL

dividiti · Feb 1, 2017 · f951852 · f951852
1 parent 05bf094
commit f951852
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,5 @@
+2017.02.01 - added --env.CK_VIENNACL_DEBUG=ON flag to turn on debugging of ViennaCL
+
 2017.01.20 - unifying compilation of Caffe OpenCL for Android on Windows and Linux
 
 2017.01.19 - cleaned up various packages 

diff --git a/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.android/install.bat b/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.android/install.bat
@@ -36,6 +36,10 @@ if "%CK_CPU_ARM_VFPV3%" == "ON" (
   set EXTRA_FLAGS=%EXTRA_FLAGS% -mfpu=vfpv3
 )
 
+if "%CK_VIENNACL_DEBUG%" == "ON" (
+  set EXTRA_FLAGS=%EXTRA_FLAGS% -DVIENNACL_DEBUG_ALL
+)
+
 set CK_CC_FLAGS_FOR_CMAKE=%CK_CC_FLAGS_FOR_CMAKE% %EXTRA_FLAGS% -I%CK_ENV_LIB_OPENCV_INCLUDE%
 set CK_CXX_FLAGS_FOR_CMAKE=%CK_CXX_FLAGS_FOR_CMAKE% %EXTRA_FLAGS% -I%CK_ENV_LIB_OPENCV_INCLUDE%
 

diff --git a/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.android/install.sh b/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.android/install.sh
@@ -33,6 +33,10 @@ if [ "${CK_CPU_ARM_VFPV3}" == "ON" ] ; then
   EXTRA_FLAGS="$EXTRA_FLAGS -mfpu=vfpv3"
 fi
 
+if [ "${CK_VIENNACL_DEBUG}" == "ON" ] ; then
+  EXTRA_FLAGS="$EXTRA_FLAGS -DVIENNACL_DEBUG_ALL"
+fi
+
 export CLBlast_DIR=${CK_ENV_LIB_CLBLAST}
 
 cd ${INSTALL_DIR}/obj

diff --git a/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.linux/install.sh b/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.linux/install.sh
@@ -25,6 +25,10 @@ fi
 # Check extra stuff
 EXTRA_FLAGS=""
 
+if [ "${CK_VIENNACL_DEBUG}" == "ON" ] ; then
+  EXTRA_FLAGS="$EXTRA_FLAGS -DVIENNACL_DEBUG_ALL"
+fi
+
 export CLBlast_DIR=${CK_ENV_LIB_CLBLAST}
 
 cd ${INSTALL_DIR}/obj

diff --git a/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.win/install.bat b/package/lib-caffe-bvlc-opencl-clblast-universal/scripts.win/install.bat
@@ -15,7 +15,16 @@ rem INSTALL_DIR
 echo **************************************************************
 echo Preparing vars for Caffe ...
 
-set CK_CXX_FLAGS_FOR_CMAKE=
+set EXTRA_FLAGS=
+
+if "%CK_VIENNACL_DEBUG%" == "ON" (
+  set EXTRA_FLAGS=%EXTRA_FLAGS% -DVIENNACL_DEBUG_ALL
+)
+
+set CK_CC_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+set CK_CXX_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+
+rem set CK_CXX_FLAGS_FOR_CMAKE=
 set CK_CXX_FLAGS_ANDROID_TYPICAL=
 
 set VIENNACL_HOME=%CK_ENV_LIB_VIENNACL%

diff --git a/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.android/install.bat b/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.android/install.bat
@@ -36,6 +36,10 @@ if "%CK_CPU_ARM_VFPV3%" == "ON" (
   set EXTRA_FLAGS=%EXTRA_FLAGS% -mfpu=vfpv3
 )
 
+if "%CK_VIENNACL_DEBUG%" == "ON" (
+  set EXTRA_FLAGS=%EXTRA_FLAGS% -DVIENNACL_DEBUG_ALL
+)
+
 set CK_CC_FLAGS_FOR_CMAKE=%CK_CC_FLAGS_FOR_CMAKE% %EXTRA_FLAGS% -I%CK_ENV_LIB_OPENCV_INCLUDE%
 set CK_CXX_FLAGS_FOR_CMAKE=%CK_CXX_FLAGS_FOR_CMAKE% %EXTRA_FLAGS% -I%CK_ENV_LIB_OPENCV_INCLUDE%
 

diff --git a/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.android/install.sh b/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.android/install.sh
@@ -33,6 +33,10 @@ if [ "${CK_CPU_ARM_VFPV3}" == "ON" ] ; then
   EXTRA_FLAGS="$EXTRA_FLAGS -mfpu=vfpv3"
 fi
 
+if [ "${CK_VIENNACL_DEBUG}" == "ON" ] ; then
+  EXTRA_FLAGS="$EXTRA_FLAGS -DVIENNACL_DEBUG_ALL"
+fi
+
 export CLBlast_DIR=${CK_ENV_LIB_CLBLAST}
 
 cd ${INSTALL_DIR}/obj

diff --git a/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.linux/install.sh b/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.linux/install.sh
@@ -25,6 +25,10 @@ fi
 # Check extra stuff
 EXTRA_FLAGS=""
 
+if [ "${CK_VIENNACL_DEBUG}" == "ON" ] ; then
+  EXTRA_FLAGS="$EXTRA_FLAGS -DVIENNACL_DEBUG_ALL"
+fi
+
 export CLBlast_DIR=${CK_ENV_LIB_CLBLAST}
 
 cd ${INSTALL_DIR}/obj

diff --git a/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.win/install.bat b/package/lib-caffe-bvlc-opencl-libdnn-clblast-universal/scripts.win/install.bat
@@ -15,7 +15,16 @@ rem INSTALL_DIR
 echo **************************************************************
 echo Preparing vars for Caffe ...
 
-set CK_CXX_FLAGS_FOR_CMAKE=
+set EXTRA_FLAGS=
+
+if "%CK_VIENNACL_DEBUG%" == "ON" (
+  set EXTRA_FLAGS=%EXTRA_FLAGS% -DVIENNACL_DEBUG_ALL
+)
+
+set CK_CC_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+set CK_CXX_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+
+rem set CK_CXX_FLAGS_FOR_CMAKE=
 set CK_CXX_FLAGS_ANDROID_TYPICAL=
 
 set VIENNACL_HOME=%CK_ENV_LIB_VIENNACL%

diff --git a/package/lib-caffe-bvlc-opencl-libdnn-viennacl-universal/scripts.linux/install.sh b/package/lib-caffe-bvlc-opencl-libdnn-viennacl-universal/scripts.linux/install.sh
@@ -25,6 +25,10 @@ fi
 # Check extra stuff
 EXTRA_FLAGS=""
 
+if [ "${CK_VIENNACL_DEBUG}" == "ON" ] ; then
+  EXTRA_FLAGS="$EXTRA_FLAGS -DVIENNACL_DEBUG_ALL"
+fi
+
 export CLBlast_DIR=${CK_ENV_LIB_CLBLAST}
 
 cd ${INSTALL_DIR}/obj

diff --git a/package/lib-caffe-bvlc-opencl-libdnn-viennacl-universal/scripts.win/install.bat b/package/lib-caffe-bvlc-opencl-libdnn-viennacl-universal/scripts.win/install.bat
@@ -15,7 +15,16 @@ rem INSTALL_DIR
 echo **************************************************************
 echo Preparing vars for Caffe ...
 
-set CK_CXX_FLAGS_FOR_CMAKE=
+set EXTRA_FLAGS=
+
+if "%CK_VIENNACL_DEBUG%" == "ON" (
+  set EXTRA_FLAGS=%EXTRA_FLAGS% -DVIENNACL_DEBUG_ALL
+)
+
+set CK_CC_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+set CK_CXX_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+
+rem set CK_CXX_FLAGS_FOR_CMAKE=
 set CK_CXX_FLAGS_ANDROID_TYPICAL=
 
 set VIENNACL_HOME=%CK_ENV_LIB_VIENNACL%

diff --git a/package/lib-caffe-bvlc-opencl-viennacl-universal/scripts.linux/install.sh b/package/lib-caffe-bvlc-opencl-viennacl-universal/scripts.linux/install.sh
@@ -25,6 +25,10 @@ fi
 # Check extra stuff
 EXTRA_FLAGS=""
 
+if [ "${CK_VIENNACL_DEBUG}" == "ON" ] ; then
+  EXTRA_FLAGS="$EXTRA_FLAGS -DVIENNACL_DEBUG_ALL"
+fi
+
 export CLBlast_DIR=${CK_ENV_LIB_CLBLAST}
 
 cd ${INSTALL_DIR}/obj

diff --git a/package/lib-caffe-bvlc-opencl-viennacl-universal/scripts.win/install.bat b/package/lib-caffe-bvlc-opencl-viennacl-universal/scripts.win/install.bat
@@ -15,7 +15,16 @@ rem INSTALL_DIR
 echo **************************************************************
 echo Preparing vars for Caffe ...
 
-set CK_CXX_FLAGS_FOR_CMAKE=
+set EXTRA_FLAGS=
+
+if "%CK_VIENNACL_DEBUG%" == "ON" (
+  set EXTRA_FLAGS=%EXTRA_FLAGS% -DVIENNACL_DEBUG_ALL
+)
+
+set CK_CC_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+set CK_CXX_FLAGS_FOR_CMAKE=%EXTRA_FLAGS%
+
+rem set CK_CXX_FLAGS_FOR_CMAKE=
 set CK_CXX_FLAGS_ANDROID_TYPICAL=
 
 set VIENNACL_HOME=%CK_ENV_LIB_VIENNACL%