Fail when NVML not found, look also for stubs (#618)

CMakeLists.txt

@@ -1,6 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 PROJECT(h2o4gpu)
 INCLUDE(cmake/Utils.cmake)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 SET_DEFAULT_CONFIGURATION_RELEASE()
 
@@ -91,6 +92,7 @@ SET_TARGET_PROPERTIES(${SWIG_MODULE_ch2o4gpu_cpu_REAL_NAME} PROPERTIES
 
 if(USE_CUDA)
         FIND_PACKAGE(CUDA 8.0 REQUIRED)
+        FIND_PACKAGE(NVML REQUIRED)
 
         #============= BUILD GPU LIBRARY
         ADD_DEFINITIONS(
@@ -137,7 +139,7 @@ if(USE_CUDA)
                 ${CUDA_cusparse_LIBRARY}
                 ${BLAS_LIBRARIES}
                 ${NVTX_LIBRARY}
-                ${NVML_LIB})
+                ${NVML_LIBRARY})
         TARGET_INCLUDE_DIRECTORIES (gpuh2o4gpu PUBLIC
                 src/gpu/include
                 )

Makefile

@@ -121,7 +121,7 @@ update_submodule:
 cpp:
 	mkdir -p build && \
 	cd build && \
-	cmake -DDEV_BUILD=${DEV_BUILD} -DNVML_LIB=$(NVML_LIB) ../ && \
+	cmake -DDEV_BUILD=${DEV_BUILD} ../ && \
 	make -j && \
 	cp _ch2o4gpu_*pu.so ../src/interface_c/ && \
 	cp ch2o4gpu_*pu.py ../src/interface_py/h2o4gpu/libs;

cmake/FindNVML.cmake

@@ -0,0 +1,145 @@
+#
+# This file is part of the GROMACS molecular simulation package.
+#
+# Copyright (c) 2014,2015,2017, by the GROMACS development team, led by
+# Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+# and including many others, as listed in the AUTHORS file in the
+# top-level source directory and at http://www.gromacs.org.
+#
+# GROMACS is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1
+# of the License, or (at your option) any later version.
+#
+# GROMACS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with GROMACS; if not, see
+# http://www.gnu.org/licenses, or write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+#
+# If you want to redistribute modifications to GROMACS, please
+# consider that scientific software is very special. Version
+# control is crucial - bugs must be traceable. We will be happy to
+# consider code for inclusion in the official distribution, but
+# derived work must not be called official GROMACS. Details are found
+# in the README & COPYING files - if they are missing, get the
+# official version at http://www.gromacs.org.
+#
+# To help us fund GROMACS development, we humbly ask that you cite
+# the research papers on the package. Check out http://www.gromacs.org.
+
+#.rst:
+# FindNVML
+# --------
+#
+# Find the NVIDIA Management Library (NVML) includes and library. NVML documentation
+# is available at: http://docs.nvidia.com/deploy/nvml-api/index.html
+#
+# Starting with CUDA 8 NVML is part of the CUDA Toolkit. Prior to CUDA 8 NVML was part
+# of the GPU Deployment Kit (GDK) and GPU_DEPLOYMENT_KIT_ROOT_DIR can be specified
+# if the GPU Deployment Kit is not installed in a default location.
+#
+# FindNVML defines the following variables:
+#
+#   NVML_INCLUDE_DIR, where to find nvml.h, etc.
+#   NVML_LIBRARY, the libraries needed to use NVML.
+#   NVML_FOUND, If false, do not try to use NVML.
+#
+
+#   Jiri Kraus, NVIDIA Corp (nvidia.com - jkraus)
+#
+#   Copyright (c) 2008 - 2014,2017 NVIDIA Corporation.  All rights reserved.
+#
+#   This code is licensed under the MIT License.  See the FindNVML.cmake script
+#   for the text of the license.
+
+# The MIT License
+#
+# License for the specific language governing rights and limitations under
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+###############################################################################
+
+if( CMAKE_SYSTEM_NAME STREQUAL "Windows"  )
+    set(NVML_NAMES nvml)
+    if(${CUDA_VERSION_STRING} VERSION_LESS "8.0")
+        set( NVML_LIB_PATHS "C:/Program Files/NVIDIA Corporation/GDK/nvml/lib" )
+        if(GPU_DEPLOYMENT_KIT_ROOT_DIR)
+            list(APPEND NVML_LIB_PATHS "${GPU_DEPLOYMENT_KIT_ROOT_DIR}/nvml/lib")
+        endif()
+
+        set( NVML_INC_PATHS "C:/Program Files/NVIDIA Corporation/GDK/nvml/include" )
+        if(GPU_DEPLOYMENT_KIT_ROOT_DIR)
+            list(APPEND NVML_INC_PATHS "${GPU_DEPLOYMENT_KIT_ROOT_DIR}/nvml/include")
+        endif()
+    else()
+        set( NVML_LIB_PATHS "${CUDA_TOOLKIT_ROOT_DIR}/lib/x64" )
+        set( NVML_INC_PATHS ${CUDA_INCLUDE_DIRS} )
+    endif()
+else()
+    set(NVML_NAMES nvidia-ml)
+
+    set( NVML_LIB_PATHS /usr/lib64;/lib64;/usr/lib;/lib )
+    if(${CUDA_VERSION_STRING} VERSION_LESS "8.0")
+        # The Linux installer for the GPU Deployment Kit adds a "usr"
+        # suffix to a custom path if one is used, so a user could
+        # reasonably set GPU_DEPLOYMENT_KIT_ROOT_DIR to the value they
+        # passed to the installer, or the root where they later found the
+        # kit to be installed. Below, we cater for both possibilities.
+        if(GPU_DEPLOYMENT_KIT_ROOT_DIR)
+            list(APPEND NVML_LIB_PATHS
+                    "${GPU_DEPLOYMENT_KIT_ROOT_DIR}/src/gdk/nvml/lib"
+                    "${GPU_DEPLOYMENT_KIT_ROOT_DIR}/usr/src/gdk/nvml/lib"
+                    )
+        endif()
+    else()
+        list(APPEND NVML_LIB_PATHS
+                "${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs"
+                "${CUDA_TOOLKIT_ROOT_DIR}/targets/${CMAKE_SYSTEM_PROCESSOR}-linux/lib64/stubs/"
+                "${CUDA_TOOLKIT_ROOT_DIR}/targets/${CMAKE_SYSTEM_PROCESSOR}-linux/lib/stubs/"
+                )
+    endif()
+
+    if(${CUDA_VERSION_STRING} VERSION_LESS "8.0")
+        set( NVML_INC_PATHS /usr/include/nvidia/gdk/ /usr/include )
+        if(GPU_DEPLOYMENT_KIT_ROOT_DIR)
+            list(APPEND NVML_INC_PATHS
+                    "${GPU_DEPLOYMENT_KIT_ROOT_DIR}/include/nvidia/gdk"
+                    "${GPU_DEPLOYMENT_KIT_ROOT_DIR}/usr/include/nvidia/gdk"
+                    )
+        endif()
+    else()
+        set( NVML_INC_PATHS ${CUDA_INCLUDE_DIRS} )
+    endif()
+endif()
+
+find_library(NVML_LIBRARY NAMES ${NVML_NAMES} PATHS ${NVML_LIB_PATHS} )
+
+find_path(NVML_INCLUDE_DIR nvml.h PATHS ${NVML_INC_PATHS})
+
+# handle the QUIETLY and REQUIRED arguments and set NVML_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(NVML DEFAULT_MSG NVML_LIBRARY NVML_INCLUDE_DIR)
+
+mark_as_advanced(NVML_LIBRARY NVML_INCLUDE_DIR)

make/config.mk

@@ -38,8 +38,3 @@ XGBOOST_VERSION = 0.6
 #
 INSTALL_R = 1
 R_VERSION = 3.1.0
-
-#
-# Find NVML library
-NVML_LIB := $(shell find /lib/ /usr/|grep libnvidia-ml.so.1|head -1)
-$(warning Compiling with NVML_LIB=$(NVML_LIB))