Add missing cuBLAS dependency (#19)

dividiti · Feb 16, 2017 · 08b8fb4 · 08b8fb4
1 parent 296adaf
commit 08b8fb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/package/dnn-proxy-caffe-cuda/.cm/meta.json b/package/dnn-proxy-caffe-cuda/.cm/meta.json
@@ -16,6 +16,12 @@
       "sort": 8,
       "tags": "lib,blas,openblas"
     },
+    "lib-cublas": {
+      "local": "yes",
+      "name": "cuBLAS library",
+      "sort": 8,
+      "tags": "lib,cuda,cuda-blas,cublas"
+    },
     "lib-boost": {
       "force_add_static_lib_path": "yes",
       "local": "yes",

diff --git a/package/dnn-proxy-caffe-cuda/ck-make.sh b/package/dnn-proxy-caffe-cuda/ck-make.sh
@@ -17,8 +17,8 @@ export CK_INCLUDE_FILE=dnn_proxy.h
 export LIB_NAME=libdnnproxy
 
 export CK_INC_BOOST="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_BOOST_INCLUDE}"
-export CK_INC_BLAS="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_OPENBLAS_INCLUDE}"
-export CK_INC_CAFFE="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_CAFFE_INCLUDE}"
+export CK_INC_BLAS="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_CUBLAS_INCLUDE} ${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_OPENBLAS_INCLUDE}"
+export CK_INC_CAFFE="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_CAFFE_INCLUDE} ${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_CAFFE_EXTRA_INCLUDE}"
 export CK_INC_GFLAGS="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_GFLAGS_INCLUDE}"
 export CK_INC_GLOG="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_GLOG_INCLUDE}"
 export CK_INC_OPENCV="${CK_FLAG_PREFIX_INCLUDE}${CK_ENV_LIB_OPENCV_INCLUDE}"
@@ -27,7 +27,7 @@ export CK_INC_LOCAL="${CK_FLAG_PREFIX_INCLUDE} ."
 export CK_COMPILER_FLAGS_MISC="${CK_INC_BOOST} ${CK_INC_BLAS} ${CK_INC_CAFFE} ${CK_INC_GFLAGS} ${CK_INC_GLOG} ${CK_INC_OPENCV} ${CK_INC_PROTOBUF} ${CK_INC_LOCAL} ${CK_COMPILER_FLAGS_MISC}"
 
 export CK_LIB_BOOST="${CK_FLAG_PREFIX_LIB_DIR}${CK_ENV_LIB_BOOST_LIB} ${CK_ENV_LIB_BOOST_LFLAG_SYSTEM}"
-export CK_LIB_BLAS="${CK_FLAG_PREFIX_LIB_DIR}${CK_ENV_LIB_OPENBLAS_LIB} -lopenblas"
+export CK_LIB_BLAS="${CK_FLAG_PREFIX_LIB_DIR}${CK_ENV_LIB_CUBLAS_LIB} -lcublas ${CK_FLAG_PREFIX_LIB_DIR}${CK_ENV_LIB_OPENBLAS_LIB} -lopenblas"
 export CK_LIB_CAFFE="${CK_FLAG_PREFIX_LIB_DIR}${CK_ENV_LIB_CAFFE_LIB} -lcaffe"
 export CK_LIB_GFLAGS="${CK_FLAG_PREFIX_LIB_DIR}${CK_ENV_LIB_GFLAGS_LIB} ${CK_ENV_LIB_GFLAGS_LFLAG}"
 export CK_LIB_GLOG="${CK_FLAG_PREFIX_LIB_DIR}${CK_ENV_LIB_GLOG_LIB} ${CK_ENV_LIB_GLOG_LFLAG}"