Commit f27fe8c1 authored by incardon's avatar incardon

Fixing installation and GPU with SE_CLASS1 compilation

parent 0d706b96
......@@ -95,6 +95,8 @@ install(FILES NN/CellList/CellListNNIteratorRadius.hpp
NN/CellList/ParticleItCRS_Cells.hpp
NN/CellList/ParticleIt_Cells.hpp
NN/CellList/CellDecomposer.hpp
NN/CellList/CellNNIteratorRuntime.hpp
NN/CellList/CellNNIteratorRuntimeM.hpp
DESTINATION openfpm_data/include/NN/CellList )
install(FILES NN/CellList/cuda/CellList_cpu_ker.cuh
......@@ -144,6 +146,7 @@ install(FILES util/check_no_pointers.hpp
util/tokernel_transformation.hpp
util/SimpleRNG.hpp
util/math_util_complex.hpp
util/mul_array_extents.hpp
DESTINATION openfpm_data/include/util )
install(FILES util/copy_compare/compare_fusion_vector.hpp
......
......@@ -226,13 +226,12 @@ namespace openfpm
* \param obj object (encapsulated)
*
*/
__device__ void set(int id, const typename grid_cpu<1,T_,CudaMemory,layout_type>::container & obj)
__device__ void set(int id, const container & obj)
{
//! copy the element
base.set(id,obj);
}
/*! \brief Get the pointer for the property p
*
* \tparam property p
......
......@@ -602,12 +602,6 @@ namespace openfpm
{
#ifdef SE_CLASS2
check_valid(this,8);
#endif
#ifdef SE_CLASS1
if (v.size() != opart.size())
std::cerr << __FILE__ << ":" << __LINE__ << " error merge_prp: v.size()=" << v.size() << " must be the same as o_part.size()" << opart.size() << std::endl;
#endif
merge_prp_device_impl<std::is_same<Memory,CudaMemory>::value,T,Memory,layout,layout_base,grow_p>
......
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