Commit ff844fab authored by incardon's avatar incardon
Browse files

Fixing OpenFPMConfig.cmake

parent 9ea5dfcc
Pipeline #2883 passed with stages
in 28 seconds
......@@ -63,24 +63,24 @@ if (CUDA_FOUND)
target_include_directories (mem PUBLIC ${CUDA_INCLUDE_DIRS})
endif()
target_include_directories (ofpmmemory PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory PUBLIC ${ALPAKA_ROOT}/include)
target_include_directories (ofpmmemory PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories (ofpmmemory_dl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory_dl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory_dl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory_dl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory_dl PUBLIC ${ALPAKA_ROOT}/include)
target_include_directories (ofpmmemory_dl PUBLIC ${Boost_INCLUDE_DIRS})
if (CUDA_FOUND AND NOT CUDA_ON_CPU)
target_include_directories (ofpmmemory_cuda_on_cpu PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory_cuda_on_cpu PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory_cuda_on_cpu PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory_cuda_on_cpu PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory_cuda_on_cpu PUBLIC ${ALPAKA_ROOT}/include)
target_include_directories (ofpmmemory_cuda_on_cpu PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories (ofpmmemory_dl_cuda_on_cpu PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory_dl_cuda_on_cpu PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory_dl_cuda_on_cpu PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories (ofpmmemory_dl_cuda_on_cpu PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories (ofpmmemory_dl_cuda_on_cpu PUBLIC ${ALPAKA_ROOT}/include)
target_include_directories (ofpmmemory_dl_cuda_on_cpu PUBLIC ${Boost_INCLUDE_DIRS})
endif()
......
......@@ -8,7 +8,7 @@
#ifndef HEAP_MEMORY_HPP
#define HEAP_MEMORY_HPP
#include "config.h"
#include "config/config.h"
#include "memory.hpp"
#include <cstddef>
#include <cstdint>
......
......@@ -339,7 +339,7 @@ static void exe_kernel(lambda_f f, ite_type & ite)
for (int i = old_size ; i < mem_stack.size() ; i++)
{
mem_stack[i] = new char [8192];
mem_stack[i] = new char [CUDIFY_BOOST_CONTEXT_STACK_SIZE];
}
}
......@@ -449,7 +449,6 @@ static void exe_kernel_no_sync(lambda_f f, ite_type & ite)
[&](boost::context::fiber && main) -> void {\
\
\
main_fib = main;
\
cuda_call(__VA_ARGS__);\
},ite);\
......@@ -481,11 +480,9 @@ static void exe_kernel_no_sync(lambda_f f, ite_type & ite)
[&] (boost::context::fiber && main) -> void {\
\
\
main_fib = std::move(main);\
\
cuda_call(__VA_ARGS__);\
\
return std::move(main_fib);\
\
});\
CHECK_SE_CLASS1_POST(#cuda_call,__VA_ARGS__)\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment