Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sbalzarini Lab
S
Software
P
Parallel Computing
OpenFPM
openfpm_devices
Commits
9b31a3d6
Commit
9b31a3d6
authored
Feb 15, 2021
by
incardon
Browse files
Fixing cuda on CPU
parent
cf2dbc0e
Pipeline
#2803
failed with stages
in 6 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
9b31a3d6
...
...
@@ -18,6 +18,14 @@ add_executable(mem main.cpp memory/HeapMemory.cpp util/cudify/cudify_vars.cpp ut
add_library
(
ofpmmemory STATIC memory/HeapMemory.cpp util/cudify/cudify_vars.cpp memory/PtrMemory.cpp memory/mem_conf.cpp
${
CUDA_SOURCES
}
)
add_library
(
ofpmmemory_dl SHARED memory/HeapMemory.cpp util/cudify/cudify_vars.cpp memory/PtrMemory.cpp memory/mem_conf.cpp
${
CUDA_SOURCES
}
)
if
(
CUDA_FOUND AND NOT CUDA_ON_CPU
)
add_library
(
ofpmmemory_cuda_on_cpu STATIC memory/HeapMemory.cpp util/cudify/cudify_vars.cpp memory/PtrMemory.cpp memory/mem_conf.cpp
${
CUDA_SOURCES
}
)
add_library
(
ofpmmemory_dl_cuda_on_cpu SHARED memory/HeapMemory.cpp util/cudify/cudify_vars.cpp memory/PtrMemory.cpp memory/mem_conf.cpp
${
CUDA_SOURCES
}
)
target_compile_options
(
ofpmmemory_cuda_on_cpu PUBLIC -DCUDA_ON_CPU
)
target_compile_options
(
ofpmmemory_dl_cuda_on_cpu PUBLIC -DCUDA_ON_CPU
)
endif
()
if
(
CMAKE_COMPILER_IS_GNUCC
)
target_compile_options
(
mem PRIVATE
"-Wno-deprecated-declarations"
)
if
(
TEST_COVERAGE
)
...
...
@@ -64,6 +72,19 @@ 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 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 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 PUBLIC
${
ALPAKA_ROOT
}
/include
)
target_include_directories
(
ofpmmemory_dl_cuda_on_cpu PUBLIC
${
Boost_INCLUDE_DIRS
}
)
endif
()
target_link_libraries
(
mem
${
Boost_LIBRARIES_BCK
}
)
target_link_libraries
(
ofpmmemory
${
Boost_LIBRARIES_BCK
}
)
target_link_libraries
(
ofpmmemory_dl
${
Boost_LIBRARIES_BCK
}
)
...
...
@@ -72,7 +93,7 @@ if (TEST_COVERAGE)
target_link_libraries
(
mem -lgcov
)
endif
()
install
(
TARGETS ofpmmemory ofpmmemory_dl
install
(
TARGETS ofpmmemory ofpmmemory_dl
ofpmmemory_cuda_on_cpu ofpmmemory_dl_cuda_on_cpu
DESTINATION openfpm_devices/lib
)
install
(
FILES memory/ExtPreAlloc.hpp
...
...
src/util/cuda_util.hpp
View file @
9b31a3d6
...
...
@@ -36,6 +36,10 @@
#define CUDA_SAFE(cuda_call) \
cuda_call;
#ifdef __shared__
#undef __shared__
#endif
#define __shared__ static
#else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment