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.

Sign up for GitHub

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

stdgpu: fix CUDA and HIP custom CMake modules #22851

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −4
Open

stdgpu: fix CUDA and HIP custom CMake modules #22851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617621f
stdgpu: fix CUDA and HIP custom CMake modules
valgur Feb 22, 2024
edd675b
stdgpu: bump llvm-openmp
valgur Feb 22, 2024
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: 2 additions & 1 deletion recipes/stdgpu/all/cmake/stdgpu-dependencies-cuda.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Mimics the behavior of stdgpu-dependencies.cmake exported by stdgpu for the CUDA backend

find_dependency(CUDAToolkit 11.0 REQUIRED)

# Using ${stdgpu_LIBRARIES} to allow the target to be renamed using the "cmake_target_name" CMakeDeps property
target_link_libraries(${stdgpu_LIBRARIES} INTERFACE CUDA::cudart)
set_property(TARGET ${stdgpu_LIBRARIES} PROPERTY INTERFACE_LINK_LIBRARIES CUDA::cudart APPEND)
set_property(TARGET ${stdgpu_LIBRARIES} PROPERTY INTERFACE_COMPILE_FEATURES cuda_std_17)
3 changes: 1 addition & 2 deletions recipes/stdgpu/all/cmake/stdgpu-dependencies-hip.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Mimics the behavior of stdgpu-dependencies.cmake exported by stdgpu for the HIP backend

find_dependency(thrust 1.9.9 REQUIRED)

find_dependency(hip 5.1 REQUIRED)

# Using ${stdgpu_LIBRARIES} to allow the target to be renamed using the "cmake_target_name" CMakeDeps property
target_link_libraries(${stdgpu_LIBRARIES} INTERFACE hip::host)
set_property(TARGET ${stdgpu_LIBRARIES} PROPERTY INTERFACE_LINK_LIBRARIES hip::host APPEND)
set_property(TARGET ${stdgpu_LIBRARIES} PROPERTY INTERFACE_COMPILE_FEATURES hip_std_17)
2 changes: 1 addition & 1 deletion recipes/stdgpu/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def requirements(self):
"Using Thrust from system instead of Conan.")
if self.options.backend == "openmp":
if self.options.openmp == "llvm":
self.requires("llvm-openmp/12.0.1", transitive_headers=True, transitive_libs=True)
self.requires("llvm-openmp/17.0.6", transitive_headers=True, transitive_libs=True)
else:
self.output.info("Using OpenMP backend with system OpenMP")

Expand Down
Loading