提交 559a57ec 编写于 作者: G Gines Hidalgo

Added Volta to our custom Caffe

上级 c0017b6a
...@@ -718,7 +718,7 @@ if (UNIX OR APPLE) ...@@ -718,7 +718,7 @@ if (UNIX OR APPLE)
set(CAFFE_CPU_ONLY OFF) set(CAFFE_CPU_ONLY OFF)
if (${GPU_MODE} MATCHES "CUDA") if (${GPU_MODE} MATCHES "CUDA")
# execute_process(COMMAND git checkout master WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe) # execute_process(COMMAND git checkout master WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
execute_process(COMMAND git checkout b5ede48 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe) execute_process(COMMAND git checkout c95002f WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
elseif (${GPU_MODE} MATCHES "CPU_ONLY") elseif (${GPU_MODE} MATCHES "CPU_ONLY")
if (USE_MKL) if (USE_MKL)
#execute_process(COMMAND git checkout intel WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe) #execute_process(COMMAND git checkout intel WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
...@@ -754,7 +754,7 @@ if (UNIX OR APPLE) ...@@ -754,7 +754,7 @@ if (UNIX OR APPLE)
) )
else (USE_MKL) else (USE_MKL)
# execute_process(COMMAND git checkout master WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe) # execute_process(COMMAND git checkout master WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
execute_process(COMMAND git checkout b5ede48 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe) execute_process(COMMAND git checkout c95002f WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
endif (USE_MKL) endif (USE_MKL)
set(CAFFE_CPU_ONLY ON) set(CAFFE_CPU_ONLY ON)
set(USE_CUDNN OFF) set(USE_CUDNN OFF)
......
...@@ -395,6 +395,8 @@ To use a NVIDIA's NVCaffe docker image instead of the standard Caffe, set the fo ...@@ -395,6 +395,8 @@ To use a NVIDIA's NVCaffe docker image instead of the standard Caffe, set the fo
2. Set the `BUILD_CAFFE` variable to `OFF`. 2. Set the `BUILD_CAFFE` variable to `OFF`.
3. Set the correct `Caffe_INCLUDE_DIRS` and `Caffe_LIBS` paths following [Custom Caffe](#custom-caffe). 3. Set the correct `Caffe_INCLUDE_DIRS` and `Caffe_LIBS` paths following [Custom Caffe](#custom-caffe).
In addition, [peter-uhrig.de/openpose-with-nvcaffe-in-a-singularity-container-with-support-for-multiple-architectures/](http://peter-uhrig.de/openpose-with-nvcaffe-in-a-singularity-container-with-support-for-multiple-architectures/) contains a detailed step-by-step guide to install a portable container with NVCaffe and support for multiple NVidia cards as well as CPU.
#### Custom OpenCV #### Custom OpenCV
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册