Commit cd4173f1 authored by incardon's avatar incardon

Fixing HDF5 file test, multiple test can run in parallel so we have to use different names

parent 7c6a490d
......@@ -45,6 +45,11 @@ if(ENABLE_GPU)
if (CUDA_VERSION_MAJOR EQUAL 9 AND CUDA_VERSION_MINOR EQUAL 2)
message("CUDA is compatible")
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")
set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=2915 --diag_suppress=2912 --diag_suppress=2913 --diag_suppress=111 --diag_suppress=186 --diag_suppress=611 " --expt-extended-lambda)
else()
message(FATAL_ERROR "CUDA is incompatible, version 9.2 is only supported")
endif()
......
openfpm_data @ 33a5ec1e
Subproject commit da7bebf0e5101b3e0e85e42695d755d843f7c418
Subproject commit 33a5ec1ebc3fc47dd5def0a60f7c352ba810d247
openfpm_numerics @ 4fb09911
Subproject commit 2a8361592734205b286e792282784816ff989114
Subproject commit 4fb09911107d7a63df11e3be426a940242158307
......@@ -27,7 +27,7 @@ add_test(NAME pdata_4_proc COMMAND mpirun -np 4 ./pdata)
###########################
if (CUDA_FOUND)
target_compile_options(pdata PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: -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>)
target_compile_options(pdata PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC}>)
target_include_directories (pdata PUBLIC ${MPI_C_INCLUDE_DIRS})
if (TEST_COVERAGE)
target_compile_options(pdata PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage">)
......
......@@ -351,7 +351,6 @@ public:
*/
const DistParMetisDistribution<dim, T> & operator=(const DistParMetisDistribution<dim, T> & dist)
{
v_cl = dist.v_cl;
gr = dist.gr;
domain = dist.domain;
g = dist.g;
......@@ -372,7 +371,6 @@ public:
*/
const DistParMetisDistribution<dim, T> & operator=(DistParMetisDistribution<dim, T> && dist)
{
v_cl = dist.v_cl;
gr = dist.gr;
domain = dist.domain;
g.swap(dist.g);
......
......@@ -649,7 +649,6 @@ public:
const ParMetisDistribution<dim,T> & operator=(ParMetisDistribution<dim,T> && dist)
{
is_distributed = dist.is_distributed;
v_cl = dist.v_cl;
gr = dist.gr;
domain = dist.domain;
gp.swap(dist.gp);
......
......@@ -82,11 +82,11 @@ BOOST_AUTO_TEST_CASE( vector_dist_hdf5_save_test )
}
// Save the vector
vd.save("vector_dist.h5");
vd.save("vector_dist" + std::to_string(create_vcluster().size()) + ".h5");
vector_dist<dim,float, aggregate<float[dim]> > vd2(0,box,bc,ghost);
vd2.load("vector_dist.h5");
vd2.load("vector_dist" + std::to_string(create_vcluster().size()) + ".h5");
// Check that vd and vd2 match
......
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