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.

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

find blas and cudnn update for windows OS #3047

Merged
merged 3 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions dlib/cmake_utils/find_blas.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions dlib/cmake_utils/test_for_cudnn/find_cudnn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/${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 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)
Expand Down
Loading