Commit 7d268068 authored by i-bird's avatar i-bird
parents 6bccd704 979c0c5a
Pipeline #2648 failed with stages
in 10 minutes and 30 seconds
......@@ -16,7 +16,6 @@ centos_run:
- centos_build
script:
- ./openfpm_data/build/src/mem_map
- ./success.sh 2 centos openfpm_devices
mac_build:
stage: build
......@@ -35,8 +34,7 @@ mac_run:
dependencies:
- mac_build
script:
- ./openfpm_data/build/src/mem_map
- ./success.sh 2 mac openfpm_devices
- export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:/Users/jenkins/openfpm_dependencies/openfpm_data/BOOST/lib" && ./openfpm_data/build/src/mem_map
ubuntu_build:
stage: build
......@@ -56,5 +54,4 @@ ubuntu_run:
- ubuntu_build
script:
- ./openfpm_data/build/src/mem_map
- ./success.sh 2 ubuntu openfpm_devices
......@@ -13,38 +13,23 @@ set(SE_CLASS1 CACHE BOOL "Activate compilation with SE_CLASS1")
set(SE_CLASS3 CACHE BOOL "Activate compilation with SE_CLASS3")
set(ENABLE_GPU CACHE BOOL "Disable the GPU code independently that a cuda compiler is found")
set(TEST_PERFORMANCE CACHE BOOL "Enable test performance")
set(ALPAKA_ROOT CACHE PATH "Alpaka root path")
set(CUDA_ON_CPU CACHE BOOL "Make Cuda work on heap")
if (ENABLE_GPU)
set(CUDA_ON_CPU OFF)
enable_language(CUDA)
find_package(CUDA)
endif()
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CUDA_STANDARD 14)
if (ENABLE_GPU)
enable_language(CUDA)
find_package(CUDA)
if (CUDA_VERSION_MAJOR EQUAL 9 AND CUDA_VERSION_MINOR EQUAL 2)
message("CUDA is compatible 9.2")
set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=611 --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111" --expt-extended-lambda)
elseif ( CUDA_VERSION_MAJOR EQUAL 10 AND CUDA_VERSION_MINOR EQUAL 1 )
message("CUDA is compatible 10.1")
set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=2915 --diag_suppress=2914 --diag_suppress=2912 --diag_suppress=2913 --diag_suppress=111 --diag_suppress=186 --diag_suppress=611 --diag_suppress=1301 --diag_suppress=177 --diag_suppress=2928 --diag_suppress=2929 --diag_suppress=2930 --diag_suppress=2931" --expt-extended-lambda)
elseif ( CUDA_VERSION_MAJOR EQUAL 10 AND CUDA_VERSION_MINOR EQUAL 2 )
message("CUDA is compatible 10.2")
set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=2976 --diag_suppress=2977 --diag_suppress=2979 --diag_suppress=186" --expt-extended-lambda)
elseif ( CUDA_VERSION_MAJOR EQUAL 11 AND CUDA_VERSION_MINOR EQUAL 0 )
message("CUDA is compatible 11.0")
set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=3059 --diag_suppress=3058 --diag_suppress=3057 --diag_suppress=3056 --diag_suppress=611 --diag_suppress=186" --expt-extended-lambda)
elseif ( CUDA_VERSION_MAJOR EQUAL 11 AND CUDA_VERSION_MINOR EQUAL 1 )
message("CUDA is compatible 11.1")
set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=3124 --diag_suppress=3126 --diag_suppress=3125 --diag_suppress=3123 --diag_suppress=611 --diag_suppress=186 --diag_suppress=128" --expt-extended-lambda)
else()
message(FATAL_ERROR "CUDA is incompatible, version 9.2 10.1 10.2 and 11.0 is only supported")
endif()
endif()
set(Vc_DIR "${Vc_ROOT}/lib/cmake/Vc/")
message("Searching Vc in ${Vc_DIR}")
find_package(Boost 1.66.0 REQUIRED COMPONENTS unit_test_framework iostreams program_options system filesystem)
find_package(Boost 1.72.0 REQUIRED COMPONENTS unit_test_framework iostreams program_options system filesystem OPTIONAL_COMPONENTS fiber context)
find_package(LibHilbert REQUIRED)
find_package(Vc REQUIRED)
......@@ -59,23 +44,36 @@ if(SE_CLASS3)
set(DEFINE_SE_CLASS3 "#define SE_CLASS3")
endif()
if(CUDA_FOUND)
set(DEFINE_CUDA_GPU "#define CUDA_GPU")
endif()
if(TEST_PERFORMANCE)
set(DEFINE_PERFORMANCE_TEST "#define PERFORMANCE_TEST")
endif()
if (Boost_FOUND)
set(DEFINE_HAVE_BOOST "#define HAVE_BOOST")
set(DEFINE_HAVE_BOOST_IOSTREAMS "#define HAVE_BOOST_IOSTREAMS")
set(DEFINE_HAVE_BOOST_PROGRAM_OPTIONS "#define HAVE_BOOST_PROGRAM_OPTIONS")
set(DEFINE_HAVE_BOOST_UNIT_TEST_FRAMEWORK "#define HAVE_BOOST_UNIT_TEST_FRAMEWORK")
set(DEFINE_HAVE_BOOST "#define HAVE_BOOST")
set(DEFINE_HAVE_BOOST_IOSTREAMS "#define HAVE_BOOST_IOSTREAMS")
set(DEFINE_HAVE_BOOST_PROGRAM_OPTIONS "#define HAVE_BOOST_PROGRAM_OPTIONS")
set(DEFINE_HAVE_BOOST_UNIT_TEST_FRAMEWORK "#define HAVE_BOOST_UNIT_TEST_FRAMEWORK")
if (Boost_CONTEXT_FOUND)
set(DEFINE_HAVE_BOOST_CONTEXT "#define HAVE_BOOST_CONTEXT")
else()
#if context is not there CUDA_ON_CPU cannot be activated
set(CUDA_ON_CPU OFF)
endif()
if (Boost_FIBER_FOUND)
set(DEFINE_HAVE_BOOST_FIBER "#define HAVE_BOOST_FIBER")
endif()
else()
message( FATAL_ERROR "BOOST is required in order to install OpenFPM" )
endif()
if(ENABLE_GPU AND CUDA_FOUND)
set(DEFINE_CUDA_GPU "#define CUDA_GPU")
endif()
if(CUDA_ON_CPU)
set(DEFINE_CUDA_GPU "#define CUDA_GPU")
endif()
if(LIBHILBERT_FOUND)
set(DEFINE_HAVE_LIBHILBERT "#define HAVE_LIBHILBERT 1")
else()
......@@ -85,5 +83,9 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config/config_cmake.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config/config.h)
add_subdirectory (src)
add_subdirectory (../openfpm_devices/ openfpm_devices)
set(WARNING_SUPPRESSION_AND_OPTION_NVCC ${WARNING_SUPPRESSION_AND_OPTION_NVCC} PARENT_SCOPE)
set(WARNING_SUPPRESSION_AND_OPTION_NVCC_TEXT ${WARNING_SUPPRESSION_AND_OPTION_NVCC_TEXT} PARENT_SCOPE)
add_subdirectory (src)
#!groovy
parallel (
"nyu_VALGRIND" : {node ('nyu')
{
deleteDir()
int ntry = 5
while (ntry != 0)
{
try {
checkout scm
ntry = 0
}
catch (IOException e)
{
ntry--
sleep(10)
}
}
stage ('build_nyu_val')
{
sh "./build.sh $WORKSPACE $NODE_NAME VALGRIND $BRANCH_NAME"
}
stage ('run_nyu_val')
{
sh "cd openfpm_data && ./run.sh $WORKSPACE $NODE_NAME VALGRIND"
sh "cd openfpm_data && ./success.sh 1 nyu openfpm_data valgrind"
}
}
},
"nyu_NO" : {node ('nyu')
{
deleteDir()
int ntry = 5
while (ntry != 0)
{
try {
checkout scm
ntry = 0
}
catch (IOException e)
{
ntry--
sleep(10)
}
}
stage ('build_nyu_nor')
{
sh "./build.sh $WORKSPACE $NODE_NAME NO $BRANCH_NAME"
}
stage ('run_nyu_nor')
{
sh "cd openfpm_data && ./run.sh $WORKSPACE $NODE_NAME NO"
sh "cd openfpm_data && ./success.sh 2 nyu openfpm_data"
}
}
},
"nyu_SE" : {node ('nyu')
{
deleteDir()
int ntry = 5
while (ntry != 0)
{
try {
checkout scm
ntry = 0
}
catch (IOException e)
{
ntry--
sleep(10)
}
}
stage ('build_nyu_se')
{
sh "./build.sh $WORKSPACE $NODE_NAME SE $BRANCH_NAME"
}
stage ('run_nyu_se')
{
sh "cd openfpm_data && ./run.sh $WORKSPACE $NODE_NAME SE"
sh "cd openfpm_data && ./success.sh 1 nyu openfpm_data \"security enhancements\""
}
}
},
"sb15_VALGRIND" : {node ('sbalzarini-mac-15')
{
deleteDir()
env.PATH = "/usr/local/bin:${env.PATH}"
int ntry = 5
while (ntry != 0)
{
try {
checkout scm
ntry = 0
}
catch (IOException e)
{
ntry--
sleep(10)
}
}
stage ('build_sb15_val')
{
sh "echo $PATH && ./build.sh $WORKSPACE $NODE_NAME VALGRIND $BRANCH_NAME"
}
stage ('run_sb15_val')
{
sh "cd openfpm_data && ./run.sh $WORKSPACE $NODE_NAME VALGRIND"
sh "cd openfpm_data && ./success.sh 1 sbalzarini-mac-15 openfpm_data valgrind"
}
}
},
"sb15_NO" : {node ('sbalzarini-mac-15')
{
deleteDir()
env.PATH = "/usr/local/bin:${env.PATH}"
int ntry = 5
while (ntry != 0)
{
try {
checkout scm
ntry = 0
}
catch (IOException e)
{
ntry--
sleep(10)
}
}
stage ('build_sb15_nor')
{
sh "./build.sh $WORKSPACE $NODE_NAME NO $BRANCH_NAME"
}
stage ('run_sb15_nor')
{
sh "cd openfpm_data && ./run.sh $WORKSPACE $NODE_NAME NO"
sh "cd openfpm_data && ./success.sh 2 sbalzarini-mac-15 openfpm_data"
}
}
},
"sb15_SE" : {node ('sbalzarini-mac-15')
{
deleteDir()
env.PATH = "/usr/local/bin:${env.PATH}"
int ntry = 5
while (ntry != 0)
{
try {
checkout scm
ntry = 0
}
catch (IOException e)
{
ntry--
sleep(10)
}
}
stage ('build_sb15_se')
{
sh "./build.sh $WORKSPACE $NODE_NAME SE $BRANCH_NAME"
}
stage ('run_sb15_se')
{
sh "cd openfpm_data && ./run.sh $WORKSPACE $NODE_NAME SE"
sh "cd openfpm_data && ./success.sh 1 sbalzarini-mac-15 openfpm_data \"security enhancements\""
}
}
}
)
......@@ -7,6 +7,7 @@ hostname=$(hostname)
type_compile=$3
branch=$4
echo "Build on: $hostname with $type_compile branch: $branch"
if [ x"$hostname" == x"cifarm-centos-node.mpi-cbg.de" ]; then
......@@ -14,6 +15,11 @@ if [ x"$hostname" == x"cifarm-centos-node.mpi-cbg.de" ]; then
source /opt/rh/devtoolset-7/enable
fi
if [ x"$hostname" == x"cifarm-ubuntu-node" ]; then
echo "Ubuntu node"
export PATH="/opt/bin:$PATH"
fi
# Check if libHilbert is installed
if [ ! -d $HOME/openfpm_dependencies/openfpm_data/LIBHILBERT ]; then
......@@ -50,7 +56,7 @@ cd "$workspace/openfpm_data"
pre_command=""
sh ./autogen.sh
options="$options --disable-gpu "
options="$options --with-vcdevel=$HOME/openfpm_dependencies/openfpm_data/VCDEVEL --with-boost=$HOME/openfpm_dependencies/openfpm_data/BOOST --with-libhilbert=$HOME/openfpm_dependencies/openfpm_data/LIBHILBERT"
options="$options --with-vcdevel=$HOME/openfpm_dependencies/openfpm_data/VCDEVEL --with-boost=$HOME/openfpm_dependencies/openfpm_data/BOOST --with-libhilbert=$HOME/openfpm_dependencies/openfpm_data/LIBHILBERT --enable-cuda_on_cpu"
if [ x"$3" == x"SE" ]; then
options="$options --enable-se-class1 --enable-se-class2 --enable-se-class3 --with-action-on-error=throw --enable-test-coverage"
......@@ -68,7 +74,7 @@ if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$hostname failed to comfigure openfpm_data test $opt_comp \" }] }" https://hooks.slack.com/services/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
exit 1
fi
make
make VERBOSE=1
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$hostname failed to compile the openfpm_data test $opt_comp \" }] }" https://hooks.slack.com/services/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
......
#!/bin/sh
#!/bin/bash
# configure script
#
#
# Because we moved to cmake this script emulate the configure script from autotools
conf_options=
ld_lib_pathopt=
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
......@@ -99,12 +100,15 @@ enable_debug
with_metis
with_hdf5
with_libhilbert
enable_cuda_on_cpu
enable_scan_coverty
enable_test_performance
enable_test_coverage
with_parmetis
enable_se_class1
enable_se_class2
enable_se_class3
with_alpaka
with_action_on_error
with_boost
with_boost_libdir
......@@ -118,6 +122,7 @@ with_petsc
with_eigen
with_vcdevel
enable_gpu
enable_asan
'
rm -rf build
......@@ -125,6 +130,8 @@ if [ ! -d "build" ]; then
mkdir build
fi
echo "/usr/local" > install_dir
##### Go over all options
for ac_option
do
......@@ -220,6 +227,9 @@ do
se_class1)
conf_options="$conf_options -DSE_CLASS1=ON"
;;
se_class2)
conf_options="$conf_options -DSE_CLASS2=ON"
;;
se_class3)
conf_options="$conf_options -DSE_CLASS3=ON"
;;
......@@ -229,6 +239,9 @@ do
scan_coverty)
conf_options="$conf_options -DSCAN_COVERTY=ON"
;;
cuda_on_cpu)
conf_options="$conf_options -DCUDA_ON_CPU=ON"
;;
test_performance)
conf_options="$conf_options -DTEST_PERFORMANCE=ON"
;;
......@@ -240,6 +253,9 @@ do
fi
conf_options="$conf_options -DENABLE_GPU=ON"
;;
asan)
conf_options="$conf_options -DENABLE_ASAN=ON"
;;
*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
ac_unrecognized_sep=', '
;;
......@@ -465,12 +481,13 @@ do
;;
suitesparse)
conf_options="$conf_options -DSUITESPARSE_ROOT=$ac_optarg"
ld_lib_pathopt=$ac_optarg/lib
;;
eigen)
conf_options="$conf_options -DEIGEN3_ROOT=$ac_optarg"
;;
boost)
conf_options="$conf_options -DBOOST_ROOT=$ac_optarg"
conf_options="$conf_options -DBOOST_ROOT=$ac_optarg -DBoost_NO_BOOST_CMAKE=ON"
;;
action_on_error)
conf_options="$conf_options -DACTION_ON_ERROR=$ac_optarg"
......@@ -481,6 +498,9 @@ do
vcdevel)
conf_options="$conf_options -DVc_ROOT=$ac_optarg"
;;
alpaka)
conf_options="$conf_options -DALPAKA_ROOT=$ac_optarg"
;;
*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
ac_unrecognized_sep=', ';;
esac
......@@ -554,7 +574,7 @@ cd build
## remove enerything
echo "Calling cmake ../. $conf_options"
rm ../error_code
cmake ../. $conf_options
DYLD_LIBRARY_PATH=$ld_lib_pathopt cmake ../. $conf_options
if [ $? != 0 ]; then
#ok something went wrong the install script analyze the return code to potentially fix the problem automatically
# Read the error code and exit with that
......
This diff is collapsed.
......@@ -7,11 +7,26 @@ if [ -d "$1/BOOST" ]; then
exit 0
fi
wget http://ppmcore.mpi-cbg.de/upload/boost_1_68_0.tar.bz2
tar -xvf boost_1_68_0.tar.bz2
cd boost_1_68_0
wget http://ppmcore.mpi-cbg.de/upload/boost_1_72_0.tar.bz2
tar -xvf boost_1_72_0.tar.bz2
cd boost_1_72_0
if [ x"$4" != x"" ]; then
if [ -f $HOME/user-config.jam ]; then
mv $HOME/user-config.jam $HOME/user-config.jam_bck
fi
if [ x"$5" != x"" ]; then
echo "using gcc : $5.$6 : $4 ; " > $HOME/user-config.jam
else
echo "using gcc : : $4 ; " > $HOME/user-config.jam
fi
fi
./bootstrap.sh --with-toolset=$3
mkdir $1/BOOST
./b2 -j $2 install --prefix=$1/BOOST
rm -rf boost_1_68_0
rm -rf boost_1_72_0
if [ -f $HOME/user-config.jam_bck ]; then
mv $HOME/user-config.jam_bck $HOME/user-config.jam
fi
rm -rf boost_1_72_0.tar.bz2
......@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
add_definitions(-DSCAN_WITH_CUB)
if (TEST_PERFORMANCE)
set(CUDA_SOURCES SparseGridGpu/performance/SparseGridGpu_performance_heat_stencil_sparse.cu
SparseGridGpu/performance/SparseGridGpu_performance_insert_stencil.cu
......@@ -19,12 +20,12 @@ if (TEST_PERFORMANCE)
SparseGridGpu/performance/performancePlots.cpp)
endif ()
if (CUDA_FOUND)
if (CUDA_FOUND OR CUDA_ON_CPU)
set(CUDA_SOURCES ${CUDA_SOURCES}
Vector/map_vector_sparse_unit_tests.cu
Vector/vector_gpu_unit_tests.cu
Grid/cuda/cuda_grid_gpu_tests.cu
Vector/cuda/map_vector_cuda_funcs_tests.cu
../../openfpm_devices/src/memory/CudaMemory.cu
NN/CellList/CellList_gpu_test.cu util/cuda/scan_sort_cuda_unit_tests.cu
Grid/cuda/cuda_grid_unit_tests_func.cu
util/cuda/modern_gpu_tests.cu
......@@ -35,16 +36,20 @@ if (CUDA_FOUND)
util/test/zmorton_unit_tests.cpp
util/cuda/test/segreduce_block_cuda_tests.cu
SparseGridGpu/tests/BlockMapGpu_kernels_tests.cu
SparseGridGpu/tests/SparseGridGpu_tests.cu
SparseGridGpu/tests/utils/SparseGridGpu_testKernels.cuh)
else ()
set(CUDA_SOURCES)
SparseGridGpu/tests/SparseGridGpu_tests.cu)
endif ()
if (CUDA_ON_CPU)
add_definitions(-DCUDA_ON_CPU -D__NVCC__ -DCUDART_VERSION=11000)
set_source_files_properties(${CUDA_SOURCES} PROPERTIES LANGUAGE CXX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
add_definitions("-x c++")
endif()
endif()
add_executable(mem_map ${CUDA_SOURCES}
main.cpp
data_type/aggregate_unit_tests.cpp
Vector/map_vector_sparse_unit_tests.cpp
util/multi_array_openfpm/multi_array_ref_openfpm_unit_test.cpp
memory_ly/memory_conf_unit_tests.cpp
Space/tests/SpaceBox_unit_tests.cpp
......@@ -52,17 +57,16 @@ add_executable(mem_map ${CUDA_SOURCES}
SparseGrid/SparseGrid_unit_tests.cpp
SparseGrid/SparseGrid_chunk_copy_unit_tests.cpp
Grid/copy_grid_unit_test.cpp NN/Mem_type/Mem_type_unit_tests.cpp
../../openfpm_devices/src/memory/HeapMemory.cpp
../../openfpm_devices/src/memory/PtrMemory.cpp
SparseGridGpu/Geometry/tests/grid_smb_tests.cpp)
add_executable(isolation
../../openfpm_devices/src/memory/CudaMemory.cu
../../openfpm_devices/src/memory/HeapMemory.cpp
SparseGridGpu/tests/SparseGridGpu_tests.cu
isolation.cpp
)
add_dependencies(mem_map ofpmmemory)
add_dependencies(isolation ofpmmemory)
if (CMAKE_COMPILER_IS_GNUCC)
target_compile_options(mem_map PRIVATE "-Wno-deprecated-declarations")
target_compile_options(mem_map PRIVATE $<$<COMPILE_LANGUAGE:CXX>: -mavx>)
......@@ -114,6 +118,7 @@ target_include_directories(mem_map PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../open
target_include_directories(mem_map PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories(mem_map PUBLIC ${LIBHILBERT_INCLUDE_DIRS})
target_include_directories(mem_map PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories(mem_map PUBLIC ${ALPAKA_ROOT}/include)
target_include_directories(isolation PUBLIC ${CUDA_INCLUDE_DIRS})
target_include_directories(isolation PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
......@@ -121,15 +126,18 @@ target_include_directories(isolation PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../op
target_include_directories(isolation PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_include_directories(isolation PUBLIC ${LIBHILBERT_INCLUDE_DIRS})
target_include_directories(isolation PUBLIC ${Boost_INCLUDE_DIRS})
target_include_directories(isolation PUBLIC ${ALPAKA_ROOT}/include)
target_include_directories(mem_map PUBLIC ${Vc_INCLUDE_DIR})
target_link_libraries(mem_map ${Boost_LIBRARIES})
target_link_libraries(mem_map -L${LIBHILBERT_LIBRARY_DIRS} ${LIBHILBERT_LIBRARIES})
target_link_libraries(mem_map ofpmmemory)
target_link_libraries(mem_map ${Vc_LIBRARIES})
target_link_libraries(isolation ${Boost_LIBRARIES})
target_link_libraries(isolation -L${LIBHILBERT_LIBRARY_DIRS} ${LIBHILBERT_LIBRARIES})
target_link_libraries(mem_map ${Vc_LIBRARIES})
target_link_libraries(isolation ofpmmemory)
if (TEST_COVERAGE)
target_link_libraries(mem_map -lgcov)
......@@ -334,8 +342,8 @@ install(FILES Vector/cuda/map_vector_cuda_ker.cuh
Vector/cuda/map_vector_sparse_cuda_kernels.cuh
DESTINATION openfpm_data/include/Vector/cuda/)
install(DIRECTORY util/cuda/cub/
DESTINATION openfpm_data/include/util/cuda/cub)
install(DIRECTORY util/cuda/cub_old/
DESTINATION openfpm_data/include/util/cuda/cub_old)
install(FILES util/multi_array_openfpm/array_openfpm.hpp
util/multi_array_openfpm/multi_array_iterator_openfpm.hpp
......@@ -347,17 +355,13 @@ install(FILES util/multi_array_openfpm/array_openfpm.hpp
util/multi_array_openfpm/types.hpp
DESTINATION openfpm_data/include/util/multi_array_openfpm)