Commit 2682239e authored by incardon's avatar incardon

Eliminating autotools and making it work with gitlab

parent bebea3e1
Pipeline #700 failed with stages
in 4 seconds
This diff is collapsed.
This diff is collapsed.
...@@ -14,6 +14,14 @@ ...@@ -14,6 +14,14 @@
#if defined(CUDA_GPU) && defined(__NVCC__) #if defined(CUDA_GPU) && defined(__NVCC__)
#include "util/cuda/moderngpu/context.hxx" #include "util/cuda/moderngpu/context.hxx"
#include "util/cuda/moderngpu/kernel_mergesort.hxx" #include "util/cuda/moderngpu/kernel_mergesort.hxx"
#else
//! unused stub to make the code compile
namespace mgpu
{
typedef int standard_context_t;
}
#endif #endif
/*! \brief Check this is a gpu or cpu type cell-list /*! \brief Check this is a gpu or cpu type cell-list
......
...@@ -804,6 +804,7 @@ BOOST_AUTO_TEST_CASE ( vector_prealloc_ext ) ...@@ -804,6 +804,7 @@ BOOST_AUTO_TEST_CASE ( vector_prealloc_ext )
/* coverity[leaked_storage] */ /* coverity[leaked_storage] */
} }
#ifdef CUDA_GPU
BOOST_AUTO_TEST_CASE ( test_gpu_iterator ) BOOST_AUTO_TEST_CASE ( test_gpu_iterator )
{ {
...@@ -838,6 +839,8 @@ BOOST_AUTO_TEST_CASE ( test_gpu_iterator ) ...@@ -838,6 +839,8 @@ BOOST_AUTO_TEST_CASE ( test_gpu_iterator )
} }
} }
#endif
BOOST_AUTO_TEST_CASE( vector_cuda_to_kernel_recursive ) BOOST_AUTO_TEST_CASE( vector_cuda_to_kernel_recursive )
{ {
typedef openfpm::vector_gpu<aggregate<int,long int>> test1_type; typedef openfpm::vector_gpu<aggregate<int,long int>> test1_type;
......
...@@ -62,6 +62,13 @@ ...@@ -62,6 +62,13 @@
} }
#endif #endif
#else
#ifndef __host__
#define __host__
#define __device__
#endif
#endif #endif
......
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