Merge pull request #231 from NervanaSystems/drwebb/cudnn_hello_world

cuDNN cmake boilerplate and helloworld gtest

CMakeLists.txt

@@ -95,6 +95,24 @@ if (NOT DEFINED NGRAPH_CPU_ENABLE)
     SET(NGRAPH_CPU_ENABLE TRUE)
 endif()
 
+#-----------------------------------------------------------------------------------------------
+# GPU support
+#-----------------------------------------------------------------------------------------------
+# Setup CUDA and cuDNN if NGRAPH_GPU_ENABLE=TRUE
+if(NGRAPH_GPU_ENABLE)
+  find_package(CUDA 8 REQUIRED)
+  find_package(CUDNN 5 QUIET REQUIRED)
+  include_directories(${CUDA_INCLUDE_DIRS} ${CUDNN_INCLUDE_DIR} ${LLVM_INCLUDE_DIR})
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
+        NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0 AND
+        CUDA_HOST_COMPILER STREQUAL CMAKE_C_COMPILER)
+      message(FATAL_ERROR
+        "CUDA 8.0 is not compatible with GCC version >= 6.\n"
+        "Please select a correct compiler version\n"
+        )
+    endif()
+endif()
+
 #-----------------------------------------------------------------------------------------------
 # External projects install directory
 #-----------------------------------------------------------------------------------------------

cmake/Modules/FindCUDNN.cmake

+# Copyright 2017 Nervana Systems Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+#
+
+# - Try to find cuDNN
+#
+# The following variables are optionally searched for defaults
+#  CUDNN_ROOT_DIR:            Base directory where all cuDNN components are found
+#
+# The following are set after configuration is done:
+#  CUDNN_FOUND
+#  CUDNN_INCLUDE_DIRS
+#  CUDNN_LIBRARIES
+#  CUDNN_LIBRARY_DIRS
+
+include(FindPackageHandleStandardArgs)
+
+set(CUDNN_ROOT_DIR "" CACHE PATH "Folder contains NVIDIA cuDNN")
+
+find_path(CUDNN_INCLUDE_DIR cudnn.h
+    HINTS ${CUDNN_ROOT_DIR} ${CUDA_TOOLKIT_ROOT_DIR}
+    PATH_SUFFIXES cuda/include include)
+
+find_library(CUDNN_LIBRARY cudnn
+    HINTS ${CUDNN_ROOT_DIR} ${CUDA_TOOLKIT_ROOT_DIR}
+    PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64)
+
+find_package_handle_standard_args(
+    CUDNN DEFAULT_MSG CUDNN_INCLUDE_DIR CUDNN_LIBRARY)
+
+if(CUDNN_FOUND)
+	# get cuDNN version
+  file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS)
+	string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)"
+				 CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}")
+	string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1"
+				 CUDNN_VERSION_MAJOR "${CUDNN_VERSION_MAJOR}")
+	string(REGEX MATCH "define CUDNN_MINOR * +([0-9]+)"
+				 CUDNN_VERSION_MINOR "${CUDNN_HEADER_CONTENTS}")
+	string(REGEX REPLACE "define CUDNN_MINOR * +([0-9]+)" "\\1"
+				 CUDNN_VERSION_MINOR "${CUDNN_VERSION_MINOR}")
+	string(REGEX MATCH "define CUDNN_PATCHLEVEL * +([0-9]+)"
+				 CUDNN_VERSION_PATCH "${CUDNN_HEADER_CONTENTS}")
+	string(REGEX REPLACE "define CUDNN_PATCHLEVEL * +([0-9]+)" "\\1"
+				 CUDNN_VERSION_PATCH "${CUDNN_VERSION_PATCH}")
+  # Assemble cuDNN version
+  if(NOT CUDNN_VERSION_MAJOR)
+    set(CUDNN_VERSION "?")
+  else()
+    set(CUDNN_VERSION "${CUDNN_VERSION_MAJOR}.${CUDNN_VERSION_MINOR}.${CUDNN_VERSION_PATCH}")
+  endif()
+
+  set(CUDNN_INCLUDE_DIRS ${CUDNN_INCLUDE_DIR})
+  set(CUDNN_LIBRARIES ${CUDNN_LIBRARY})
+  message(STATUS "Found cuDNN: v${CUDNN_VERSION}  (include: ${CUDNN_INCLUDE_DIR}, library: ${CUDNN_LIBRARY})")
+  mark_as_advanced(CUDNN_ROOT_DIR CUDNN_LIBRARY CUDNN_INCLUDE_DIR)
+endif()

cmake/external_llvm.cmake

@@ -13,7 +13,7 @@
 
 include(ExternalProject)
 
-if(NGRAPH_CPU_ENABLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND
+if((NGRAPH_CPU_ENABLE OR USE_CUDA) AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND
                          (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows"))
     message(STATUS "Fetching LLVM from llvm.org")
     set(LLVM_RELEASE_URL http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu16.04.tar.xz)

src/ngraph/CMakeLists.txt

@@ -163,7 +163,7 @@ message(STATUS "LIBRARY_OUTPUT_DIRECTORY set to: ${COMMON_LIBRARY_OUTPUT_DIRECTO
 
 target_include_directories(ngraph PUBLIC "${NGRAPH_INCLUDE_PATH}")
 
-if(NGRAPH_CPU_ENABLE AND LLVM_LINK_LIBS)
+if((NGRAPH_CPU_ENABLE OR NGRAPH_GPU_ENABLE) AND LLVM_LINK_LIBS)
     target_link_libraries(ngraph PRIVATE ${LLVM_LINK_LIBS})
 endif()
 
@@ -177,6 +177,10 @@ if(NGRAPH_CPU_ENABLE AND MKLDNN_LIB_DIR)
     target_link_libraries(ngraph PRIVATE mkldnn)
 endif()
 
+if(NGRAPH_GPU_ENABLE AND CUDA_LIBRARIES)
+    target_link_libraries(ngraph PRIVATE ${CUDA_LIBRARIES} ${CUDNN_LIBRARIES})
+endif()
+
 
 #-----------------------------------------------------------------------------------------------
 # Installation logic...
@@ -228,7 +232,7 @@ endif()
 
 add_dependencies(ngraph eigen)
 
-if(NGRAPH_CPU_ENABLE AND LLVM_INCLUDE_DIR)
+if((NGRAPH_CPU_ENABLE OR NGRAPH_GPU_ENABLE) AND LLVM_INCLUDE_DIR)
     add_dependencies(ngraph ext_llvm)
 endif()
 

test/CMakeLists.txt

@@ -66,6 +66,14 @@ if(NGRAPH_CPU_ENABLE AND LLVM_INCLUDE_DIR)
     set(BACKEND_NAMES ${BACKEND_NAMES} "CPU")
 endif()
 
+if(NGRAPH_GPU_ENABLE)
+    set(SRC
+        main.cpp
+        cudnn.cpp)
+    # Disabled for testing
+    # set(BACKEND_NAMES ${BACKEND_NAMES} "GPU")
+endif()
+
 foreach(BACKEND_NAME ${BACKEND_NAMES})
     configure_file(backend_test.in.cpp backend_test_${BACKEND_NAME}.cpp)
     set(SRC ${SRC} ${CMAKE_CURRENT_BINARY_DIR}/backend_test_${BACKEND_NAME}.cpp)
@@ -87,6 +95,10 @@ if(LLVM_INCLUDE_DIR)
     add_dependencies(unit-test ext_llvm)
 endif()
 
+if(CUDA_INCLUDE_DIRS)
+  target_link_libraries(unit-test ${CUDA_LIBRARIES} ${CUDNN_LIBRARIES})
+endif()
+
 target_link_libraries(unit-test ngraph libgtest pthread)
 target_link_libraries(unit-test ${CMAKE_DL_LIBS})
 

test/cudnn.cpp

+// ----------------------------------------------------------------------------
+// Copyright 2017 Nervana Systems Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// ----------------------------------------------------------------------------
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include <gtest/gtest.h>
+
+#include <cuda.h>
+#include <cudnn.h>
+
+TEST(cudnn, loadTest)
+{
+    auto cudnn_version = cudnnGetVersion();
+    EXPECT_FLOAT_EQ(cudnn_version, CUDNN_VERSION);
+}