Fix linking caffe-time-opencl issue fails #97

dividiti · May 2, 2017 · 28990d0 · 28990d0
1 parent a991e68
commit 28990d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/program/caffe-time-opencl/.cm/meta.json b/program/caffe-time-opencl/.cm/meta.json
@@ -120,7 +120,7 @@
   "compiler_env": "CK_CXX", 
   "compiler_flags_as_env": "$<<CK_OPT_UNWIND>>$ $<<CK_ENV_LIB_CAFFE_CXXFLAGS>>$ $<<CK_COMPILER_FLAG_CPP11>>$",
   "data_name": "caffe-opencl-time", 
-  "extra_ld_vars": "$<<CK_ENV_LIB_HDF5_LFLAG>>$ $<<CK_ENV_LIB_HDF5_LFLAG_HL>>$ $<<CK_ENV_LIB_GLOG_LFLAG>>$ $<<CK_ENV_LIB_BOOST_LFLAG_THREAD>>$ $<<CK_ENV_LIB_BOOST_LFLAG_DATE_TIME>>$ $<<CK_ENV_LIB_BOOST_LFLAG_FILESYSTEM>>$ $<<CK_ENV_LIB_BOOST_LFLAG_SYSTEM>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_IMGPROC>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_HIGHGUI>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_CORE>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_IMGCODECS>>$ $<<CK_EXTRA_LIB_Z>>$ $<<CK_EXTRA_LIB_LOG>>$ $<<CK_EXTRA_LIB_M>>$  $<<CK_ENV_LIB_CAFFE_LFLAG_PROTO>>$ $<<CK_ENV_LIB_CAFFE_LINK_FLAGS>>$ $<<CK_ENV_LIB_STDCPP_STATIC>>$", 
+  "extra_ld_vars": "$<<CK_ENV_LIB_HDF5_LFLAG>>$ $<<CK_ENV_LIB_HDF5_LFLAG_HL>>$ $<<CK_ENV_LIB_GLOG_LFLAG>>$ $<<CK_ENV_LIB_BOOST_LFLAG_THREAD>>$ $<<CK_ENV_LIB_BOOST_LFLAG_DATE_TIME>>$ $<<CK_ENV_LIB_BOOST_LFLAG_FILESYSTEM>>$ $<<CK_ENV_LIB_BOOST_LFLAG_SYSTEM>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_IMGPROC>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_HIGHGUI>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_CORE>>$ $<<CK_ENV_LIB_OPENCV_LFLAG_IMGCODECS>>$ $<<CK_EXTRA_LIB_Z>>$ $<<CK_EXTRA_LIB_LOG>>$ $<<CK_EXTRA_LIB_M>>$  $<<CK_ENV_LIB_CAFFE_LFLAG_PROTO>>$ $<<CK_ENV_LIB_CAFFE_LINK_FLAGS>>$ $<<CK_ENV_LIB_STDCPP_STATIC>>$ -shared", 
   "main_language": "cpp", 
   "only_for_target_os_tags": [
     "windows", 

diff --git a/script/explore-dvdt-prof-libs-models/explore-dvdt-prof-libs-models-benchmarking.py b/script/explore-dvdt-prof-libs-models/explore-dvdt-prof-libs-models-benchmarking.py
@@ -67,6 +67,7 @@ def do(i,arg):
         'host_os':hos,
         'target_os':tos,
         'device_id':tdid,
+        'out':'con',
         'deps':{'lib-caffe':copy.deepcopy(depl)}
     }
     r=ck.access(ii)
@@ -84,6 +85,7 @@ def do(i,arg):
         'host_os':hos,
         'target_os':tos,
         'device_id':tdid,
+	'out':'con',
         'deps':{'caffemodel':copy.deepcopy(depm)}
     }
     r=ck.access(ii)
@@ -103,6 +105,8 @@ def do(i,arg):
         'module_uoa':'program',
         'data_uoa':program,
         'cmd_key':cmd_key,
+        "target_os":tos,
+        "device_id":tdid,
 
         'dvdt_prof':'yes',
 
@@ -125,10 +129,8 @@ def do(i,arg):
         'skip_file_print':'yes',
         'out':'con'
     }
- #   exit(1)
     r=ck.access(ii)
     if r['return']>0: return r
-    exit(1)
 
     fail=r.get('fail','')
     if fail=='yes':