Skip to content

Commit

Permalink
Fix include guards
Browse files Browse the repository at this point in the history
  • Loading branch information
G-071 committed Oct 5, 2023
1 parent 9958a54 commit 9516f32
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -219,19 +219,22 @@ if(CPPUDDLE_WITH_BUFFER_RECYCLING)
else()
message(WARNING " Slow Build: Buffer recycling is deactivated. This should only be used for performance tests!")
target_compile_definitions(buffer_manager INTERFACE "CPPUDDLE_DEACTIVATE_BUFFER_RECYCLING")
target_compile_definitions(stream_manager INTERFACE "CPPUDDLE_DEACTIVATE_BUFFER_RECYCLING")
endif()

if(CPPUDDLE_WITH_AGGRESSIVE_CONTENT_RECYCLING)
message(INFO " Using default behaviour for aggressive content reusage (only relevant for aggressive allocators)!")
else()
target_compile_definitions(buffer_manager INTERFACE "CPPUDDLE_DEACTIVATE_AGGRESSIVE_ALLOCATORS")
message(WARNING " Slow Build: Aggressive allocators (and thus content recycling) is disabled. This should only be used for performance tests!")
target_compile_definitions(buffer_manager INTERFACE "CPPUDDLE_DEACTIVATE_AGGRESSIVE_ALLOCATORS")
target_compile_definitions(stream_manager INTERFACE "CPPUDDLE_DEACTIVATE_AGGRESSIVE_ALLOCATORS")
endif()

if(CPPUDDLE_WITH_EXECUTOR_RECYCLING)
message(INFO " Using default executor recycling behaviour!")
else()
message(WARNING " Slow Build: executor recycling is deactivated. This should only be used for performance tests!")
target_compile_definitions(buffer_manager INTERFACE "CPPUDDLE_DEACTIVATE_EXECUTOR_RECYCLING")
target_compile_definitions(stream_manager INTERFACE "CPPUDDLE_DEACTIVATE_EXECUTOR_RECYCLING")
endif()

Expand Down
8 changes: 8 additions & 0 deletions include/stream_manager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@
#include <type_traits>

#include "../include/detail/config.hpp"

// Need to cuda/hip definitions for default params when NOT
// drawing from an executor pool
#if defined(CPPUDDLE_DEACTIVATE_EXECUTOR_RECYCLING)
#include <hpx/config.hpp>
#if defined(HPX_HAVE_CUDA) || defined(HPX_HAVE_HIP)
#include <hpx/async_cuda/cuda_executor.hpp>
#endif
#endif

// Redefintion required for non-recycling executors
// Without it, default constructing the executors (independent) would not work
Expand Down

0 comments on commit 9516f32

Please sign in to comment.