From 000b4cf1919660c6b05c09c84fa004ef9a091aba Mon Sep 17 00:00:00 2001 From: hscodesolution <32012735+hscodesolution@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:40:11 +0530 Subject: [PATCH 1/3] Update find_blas.cmake find_blas.cmake is unable to find out blas, lapack and intel mkl library because intel's oneAPI has changed its installation directory structure. --- dlib/cmake_utils/find_blas.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlib/cmake_utils/find_blas.cmake b/dlib/cmake_utils/find_blas.cmake index 9a56d7c22e..bdd98cde56 100644 --- a/dlib/cmake_utils/find_blas.cmake +++ b/dlib/cmake_utils/find_blas.cmake @@ -316,10 +316,13 @@ elseif(WIN32 AND NOT MINGW) "C:/Program Files/Intel/Composer XE/mkl/lib/intel64" "C:/Program Files/Intel/Composer XE/tbb/lib/intel64/vc14" "C:/Program Files/Intel/Composer XE/compiler/lib/intel64" + "C:/Program Files (x86)/Intel/oneAPI/mkl/*/lib" + "C:/Program Files (x86)/Intel/oneAPI/compiler/*/lib" "C:/Program Files (x86)/Intel/oneAPI/mkl/*/lib/intel64" "C:/Program Files (x86)/Intel/oneAPI/compiler/*/windows/compiler/lib/intel64_win" ) set (mkl_redist_path + "C:/Program Files (x86)/Intel/oneAPI/compiler/*/bin" "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/redist/intel64/compiler" "C:/Program Files (x86)/Intel/oneAPI/compiler/*/windows/redist/intel64_win/compiler" ) From c9045adedcba61f44b1465416a3fcb7d6d5995a4 Mon Sep 17 00:00:00 2001 From: hscodesolution <32012735+hscodesolution@users.noreply.github.com> Date: Sun, 19 Jan 2025 13:47:46 +0530 Subject: [PATCH 2/3] Update find_cudnn.txt cudnn installer provided by nvidia is by default installing cudnn to suggested path. Adding it will help cmake to find cudnn easily on windows OS. --- dlib/cmake_utils/test_for_cudnn/find_cudnn.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt b/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt index d5a5c7d570..806b4dabff 100644 --- a/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt +++ b/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt @@ -4,13 +4,13 @@ message(STATUS "Looking for cuDNN install...") # libraries and also a few other places as well. find_path(cudnn_include cudnn.h HINTS ${CUDA_INCLUDE_DIRS} ENV CUDNN_INCLUDE_DIR ENV CUDNN_HOME - PATHS /usr/local /usr/local/cuda ENV CPATH + PATHS /usr/local /usr/local/cuda "C:/Program Files/NVIDIA/CUDNN/*/include/*" ENV CPATH PATH_SUFFIXES include ) get_filename_component(cudnn_hint_path "${CUDA_CUBLAS_LIBRARIES}" PATH) find_library(cudnn cudnn HINTS ${cudnn_hint_path} ENV CUDNN_LIBRARY_DIR ENV CUDNN_HOME - PATHS /usr/local /usr/local/cuda ENV LD_LIBRARY_PATH + PATHS /usr/local /usr/local/cuda "C:/Program Files/NVIDIA/CUDNN/*/lib/*" ENV LD_LIBRARY_PATH PATH_SUFFIXES lib64 lib x64 ) mark_as_advanced(cudnn cudnn_include) From 2db310c82677c655e0a4fb237055b9e7fb33f804 Mon Sep 17 00:00:00 2001 From: hscodesolution <32012735+hscodesolution@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:03:04 +0530 Subject: [PATCH 3/3] Update find_cudnn.txt cudnn installer provided by nvidia is by default installing cudnn to suggested path. Adding it will help cmake to find cudnn easily on windows OS. --- dlib/cmake_utils/test_for_cudnn/find_cudnn.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt b/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt index 806b4dabff..b38d5f26da 100644 --- a/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt +++ b/dlib/cmake_utils/test_for_cudnn/find_cudnn.txt @@ -4,13 +4,13 @@ message(STATUS "Looking for cuDNN install...") # libraries and also a few other places as well. find_path(cudnn_include cudnn.h HINTS ${CUDA_INCLUDE_DIRS} ENV CUDNN_INCLUDE_DIR ENV CUDNN_HOME - PATHS /usr/local /usr/local/cuda "C:/Program Files/NVIDIA/CUDNN/*/include/*" ENV CPATH + PATHS /usr/local /usr/local/cuda "C:/Program Files/NVIDIA/CUDNN/*/include/${CUDA_VERSION}" "C:/Program Files/NVIDIA/CUDNN/*/include/*" ENV CPATH PATH_SUFFIXES include ) get_filename_component(cudnn_hint_path "${CUDA_CUBLAS_LIBRARIES}" PATH) find_library(cudnn cudnn HINTS ${cudnn_hint_path} ENV CUDNN_LIBRARY_DIR ENV CUDNN_HOME - PATHS /usr/local /usr/local/cuda "C:/Program Files/NVIDIA/CUDNN/*/lib/*" ENV LD_LIBRARY_PATH + PATHS /usr/local /usr/local/cuda "C:/Program Files/NVIDIA/CUDNN/*/lib/${CUDA_VERSION}" "C:/Program Files/NVIDIA/CUDNN/*/lib/*" ENV LD_LIBRARY_PATH PATH_SUFFIXES lib64 lib x64 ) mark_as_advanced(cudnn cudnn_include)