Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added cudnn_frontend api in caffe to support CUDA11+cuDNN8 #2184

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added cudnn_frontend api in caffe to support CUDA11+cuDNN8 #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[submodule "3rdparty/caffe"]
path = 3rdparty/caffe
url = https://github.com/CMU-Perceptual-Computing-Lab/caffe.git
path = 3rdparty/caffe
url = https://github.com/cheneeheng/caffe.git
[submodule "3rdparty/pybind11"]
path = 3rdparty/pybind11
url = https://github.com/pybind/pybind11.git
[submodule "3rdparty/cudnn-frontend"]
path = 3rdparty/cudnn-frontend
url = https://github.com/NVIDIA/cudnn-frontend.git
2 changes: 1 addition & 1 deletion 3rdparty/caffe
Open in desktop
Submodule caffe updated 14 files
+7 −0 CMakeLists.txt
+102 −66 cmake/Cuda.cmake
+1 −1 cmake/Misc.cmake
+1 −0 cmake/Summary.cmake
+34 −37 docker/gpu/Dockerfile
+47 −0 docker/gpu/Dockerfile1
+24 −2 include/caffe/layers/cudnn_conv_layer.hpp
+91 −0 include/caffe/layers/cudnn_v8_utils.hpp
+4 −0 include/caffe/util/cudnn.hpp
+145 −7 src/caffe/layers/cudnn_conv_layer.cpp
+60 −0 src/caffe/layers/cudnn_conv_layer.cu
+194 −194 src/caffe/layers/cudnn_deconv_layer.cpp
+332 −0 src/caffe/layers/cudnn_v8_utils.cpp
+1 −1 src/caffe/util/math_functions.cu
1 change: 1 addition & 0 deletions 3rdparty/cudnn-frontend
Open in desktop
Submodule cudnn-frontend added at 8f488b
26 changes: 24 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ endif (${GPU_MODE} MATCHES "CUDA")
# Suboptions for acceleration library
if (${GPU_MODE} MATCHES "CUDA")
option(USE_CUDNN "Build OpenPose with cuDNN library support." ON)
option(USE_CUDNN_FRONTEND "Build OpenPose with cuDNN front end API (v8)." OFF)
endif (${GPU_MODE} MATCHES "CUDA")

# Suboptions for OpenPose 3D Reconstruction module and demo
Expand Down Expand Up @@ -721,11 +722,23 @@ if (UNIX OR APPLE)
message(STATUS "Caffe has already been downloaded.")
endif (CAFFE_DIR_VALID_LENGTH EQUAL 0)

if (USE_CUDNN_FRONTEND)
file(GLOB CUDNN_FRONTEND_DIR_VALID ${CMAKE_SOURCE_DIR}/3rdparty/cudnn-frontend/*)
list(LENGTH CUDNN_FRONTEND_DIR_VALID CUDNN_FRONTEND_DIR_VALID_LENGTH)
if (CUDNN_FRONTEND_DIR_VALID_LENGTH EQUAL 0)
execute_process(COMMAND git submodule update --init ${CMAKE_SOURCE_DIR}/3rdparty/cudnn-frontend)
else (CUDNN_FRONTEND_DIR_VALID_LENGTH EQUAL 0)
message(STATUS "cudnn-frontend has already been downloaded.")
endif (CUDNN_FRONTEND_DIR_VALID_LENGTH EQUAL 0)
set(CUDNN8_FRONTEND_INCLUDE "${CMAKE_SOURCE_DIR}/3rdparty/cudnn-frontend/include")
set(CUDNN8_FRONTEND_SAMPLES "${CMAKE_SOURCE_DIR}/3rdparty/cudnn-frontend/samples")
endif (USE_CUDNN_FRONTEND)

# Build Process
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 1807aad 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 1807aad 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)
Expand Down Expand Up @@ -765,9 +778,11 @@ if (UNIX OR APPLE)
endif (USE_MKL)
set(CAFFE_CPU_ONLY ON)
set(USE_CUDNN OFF)
set(USE_CUDNN_FRONTEND OFF)
elseif (${GPU_MODE} MATCHES "OPENCL")
execute_process(COMMAND git checkout fe2a1102 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
set(USE_CUDNN OFF)
set(USE_CUDNN_FRONTEND OFF)
endif (${GPU_MODE} MATCHES "CUDA")

# Build Caffe
Expand All @@ -787,6 +802,9 @@ if (UNIX OR APPLE)
-DMKLDNN_INSTALL_DIR:PATH=<INSTALL_DIR>
-DUSE_MKL2017_AS_DEFAULT_ENGINE=${CAFFE_CPU_ONLY}
-DUSE_CUDNN=${USE_CUDNN}
-DUSE_CUDNN_FRONTEND=${USE_CUDNN_FRONTEND}
-DCUDNN8_FRONTEND_INCLUDE=${CUDNN8_FRONTEND_INCLUDE}
-DCUDNN8_FRONTEND_SAMPLES=${CUDNN8_FRONTEND_SAMPLES}
-DCUDA_ARCH_NAME=${CUDA_ARCH}
-DCUDA_ARCH_BIN=${CUDA_ARCH_BIN}
-DCUDA_ARCH_PTX=${CUDA_ARCH_PTX}
Expand All @@ -806,6 +824,9 @@ if (UNIX OR APPLE)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-DUSE_CUDNN=${USE_CUDNN}
-DUSE_CUDNN_FRONTEND=${USE_CUDNN_FRONTEND}
-DCUDNN8_FRONTEND_INCLUDE=${CUDNN8_FRONTEND_INCLUDE}
-DCUDNN8_FRONTEND_SAMPLES=${CUDNN8_FRONTEND_SAMPLES}
-DCUDA_ARCH_NAME=${CUDA_ARCH}
-DCUDA_ARCH_BIN=${CUDA_ARCH_BIN}
-DCUDA_ARCH_PTX=${CUDA_ARCH_PTX}
Expand Down Expand Up @@ -906,6 +927,7 @@ if (WIN32)
include_directories(${WINDOWS_INCLUDE_DIRS})
endif (WIN32)

include_directories("3rdparty/cudnn-frontend/include")

### COLLECT ALL 3RD-PARTY LIBRARIES TO BE LINKED AGAINST
if (UNIX OR APPLE)
Expand Down