Skip to content

Commit

Permalink
Added required fixes as diff files
Browse files Browse the repository at this point in the history
  • Loading branch information
G-071 committed Feb 12, 2020
1 parent 32a8b96 commit 25939bc
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
11 changes: 11 additions & 0 deletions external_dependencies/cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/cmake/HPX_SetupCUDA.cmake b/cmake/HPX_SetupCUDA.cmake
index 1c881f9e68..8e9a538bd7 100644
--- a/cmake/HPX_SetupCUDA.cmake
+++ b/cmake/HPX_SetupCUDA.cmake
@@ -62,5 +62,5 @@ if(HPX_WITH_CUDA AND NOT TARGET hpx::cuda)
target_link_libraries(hpx::cuda INTERFACE cudart)
endif()

- target_link_libraries(hpx_base_libraries INTERFACE hpx::cuda)
+ #target_link_libraries(hpx_base_libraries INTERFACE hpx::cuda)
endif()
15 changes: 15 additions & 0 deletions external_dependencies/deep_copy.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/include/hpx/kokkos/deep_copy.hpp b/include/hpx/kokkos/deep_copy.hpp
index 35fa0bc..5ccf191 100644
--- a/include/hpx/kokkos/deep_copy.hpp
+++ b/include/hpx/kokkos/deep_copy.hpp
@@ -14,9 +14,7 @@
namespace hpx {
namespace kokkos {
// TODO: Do we need more overloads here?
-template <typename ExecutionSpace, typename... Args,
- typename Enable = typename std::enable_if<
- Kokkos::is_execution_space<ExecutionSpace>::value>::type>
+template <typename ExecutionSpace, typename... Args>
hpx::future<void> deep_copy_async(ExecutionSpace &&space, Args &&... args) {
deep_copy(space, std::forward<Args>(args)...);
return detail::get_future<ExecutionSpace>::call(

0 comments on commit 25939bc

Please sign in to comment.