From 559a57ec436f28ebdc29b2d27d5d075604fd1239 Mon Sep 17 00:00:00 2001 From: Gines Hidalgo Date: Sun, 27 Oct 2019 17:25:28 -0400 Subject: [PATCH] Added Volta to our custom Caffe --- CMakeLists.txt | 4 ++-- doc/installation.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1915c609..c5dd4274 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -718,7 +718,7 @@ if (UNIX OR APPLE) set(CAFFE_CPU_ONLY OFF) if (${GPU_MODE} MATCHES "CUDA") # 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") if (USE_MKL) #execute_process(COMMAND git checkout intel WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe) @@ -754,7 +754,7 @@ if (UNIX OR APPLE) ) else (USE_MKL) # 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) set(CAFFE_CPU_ONLY ON) set(USE_CUDNN OFF) diff --git a/doc/installation.md b/doc/installation.md index da7dd7c8..ace02def 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -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`. 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 -- GitLab