Merge pull request #3 from jnbntz/windows_fixes

Windows fixes for cmake copy commands and some additional nvrtc libs needed on windows builds
This commit is contained in:
Rob Armstrong 2024-12-20 13:25:33 -08:00 committed by GitHub
commit 9045dd3a1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 79 additions and 9 deletions

View File

@ -37,6 +37,12 @@ target_link_libraries(cuSolverDn_LinearSolver PRIVATE
# Copy data files to output directory
add_custom_command(TARGET cuSolverDn_LinearSolver POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
${CMAKE_CURRENT_SOURCE_DIR}/gr_900_900_crg.mtx
${CMAKE_CURRENT_BINARY_DIR}
)
add_custom_command(TARGET cuSolverDn_LinearSolver POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
${CMAKE_CURRENT_BINARY_DIR}
)

View File

@ -37,6 +37,13 @@ target_link_libraries(cuSolverRf PRIVATE
# Copy data files to output directory
add_custom_command(TARGET cuSolverRf POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
${CMAKE_CURRENT_BINARY_DIR}
)
# Copy data files to output directory
add_custom_command(TARGET cuSolverRf POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
${CMAKE_CURRENT_BINARY_DIR}
)

View File

@ -37,6 +37,13 @@ target_link_libraries(cuSolverSp_LinearSolver PRIVATE
# Copy data files to output directory
add_custom_command(TARGET cuSolverSp_LinearSolver POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
${CMAKE_CURRENT_BINARY_DIR}
)
# Copy data files to output directory
add_custom_command(TARGET cuSolverSp_LinearSolver POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
${CMAKE_CURRENT_BINARY_DIR}
)

View File

@ -37,6 +37,13 @@ target_link_libraries(cuSolverSp_LowlevelCholesky PRIVATE
# Copy data files to output directory
add_custom_command(TARGET cuSolverSp_LowlevelCholesky POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
${CMAKE_CURRENT_BINARY_DIR}
)
# Copy data files to output directory
add_custom_command(TARGET cuSolverSp_LowlevelCholesky POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
${CMAKE_CURRENT_BINARY_DIR}
)

View File

@ -37,6 +37,16 @@ target_link_libraries(cuSolverSp_LowlevelQR PRIVATE
# Copy data files to output directory
add_custom_command(TARGET cuSolverSp_LowlevelQR POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n32.mtx
${CMAKE_CURRENT_BINARY_DIR}
)
add_custom_command(TARGET cuSolverSp_LowlevelQR POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
${CMAKE_CURRENT_BINARY_DIR}
)
add_custom_command(TARGET cuSolverSp_LowlevelQR POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
${CMAKE_CURRENT_BINARY_DIR}
)

View File

@ -28,7 +28,15 @@ target_include_directories(jitLto PRIVATE
${CUDAToolkit_INCLUDE_DIRS}
)
target_link_libraries(jitLto PRIVATE
CUDA::cuda_driver
CUDA::nvrtc
)
target_link_libraries(jitLto PRIVATE
CUDA::cuda_driver
CUDA::nvrtc
)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_link_libraries(jitLto PRIVATE
${CUDAToolkit_LIBRARY_DIR}/libnvJitLink.so
)
endif()

View File

@ -18,6 +18,10 @@ include_directories(../../../Common)
# Add target for simpleCUFFT_2d_MGPU
add_executable(simpleCUFFT_2d_MGPU simpleCUFFT_2d_MGPU.cu)
if(MSVC)
add_compile_definitions(_USE_MATH_DEFINES)
endif()
target_compile_options(simpleCUFFT_2d_MGPU PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
target_compile_features(simpleCUFFT_2d_MGPU PRIVATE cxx_std_17 cuda_std_17)

View File

@ -26,6 +26,7 @@ set_target_properties(BlackScholes_nvrtc PROPERTIES CUDA_SEPARABLE_COMPILATION O
target_link_libraries(BlackScholes_nvrtc PRIVATE
CUDA::nvrtc
CUDA::cuda_driver
)
# Copy kernel to the output directory

View File

@ -26,6 +26,7 @@ set_target_properties(binomialOptions_nvrtc PROPERTIES CUDA_SEPARABLE_COMPILATIO
target_link_libraries(binomialOptions_nvrtc PRIVATE
CUDA::nvrtc
CUDA::cuda_driver
)
# Copy kernel to the output directory
@ -33,3 +34,21 @@ add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/binomialOptions_kernel.cu ${CMAKE_CURRENT_BINARY_DIR}
)
# Copy header to the output directory
add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/common_gpu_header.h ${CMAKE_CURRENT_BINARY_DIR}
)
# Copy header to the output directory
add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/binomialOptions_common.h ${CMAKE_CURRENT_BINARY_DIR}
)
# Copy header to the output directory
add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/realtype.h ${CMAKE_CURRENT_BINARY_DIR}
)

View File

@ -26,6 +26,7 @@ set_target_properties(quasirandomGenerator_nvrtc PROPERTIES CUDA_SEPARABLE_COMPI
target_link_libraries(quasirandomGenerator_nvrtc PRIVATE
CUDA::nvrtc
CUDA::cuda_driver
)
# Copy kernel to the output directory