Commit b7f6df97 authored by incardon's avatar incardon

Windows native conversion

parent ccfe5e8f
Pipeline #3006 failed with stages
in 3 minutes and 57 seconds
......@@ -169,7 +169,7 @@ endif ()
target_compile_features(mem_map PUBLIC cxx_std_11)
target_link_libraries(mem_map ${MPI_C_LIBRARIES})
target_link_libraries(mem_map m)
if (NOT APPLE)
if (NOT APPLE AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "Windows") )
target_link_libraries(mem_map rt)
endif ()
......
......@@ -194,7 +194,7 @@ public:
* \param sts pack-stat info
*
*/
template<typename tp, long unsigned int dim, typename vmpl>
template<typename tp, size_t dim, typename vmpl>
inline static void pack(ExtPreAlloc<Mem> & ext,
const openfpm::detail::multi_array::sub_array_openfpm<tp,dim,vmpl> & obj,
Pack_stat & sts)
......@@ -225,7 +225,7 @@ public:
* \param req requests vector
*
*/
template<typename tp, long unsigned int dim, typename vmpl>
template<typename tp, size_t dim, typename vmpl>
static void packRequest(const openfpm::detail::multi_array::sub_array_openfpm<tp,dim,vmpl> & obj,
size_t & req)
{
......
......@@ -10,7 +10,11 @@
#include "SpaceBox.hpp"
#ifdef WIN64
#define INVALID_GHOST 9223372036854775807LL
#else
#define INVALID_GHOST 9223372036854775807
#endif
/*! Ghost
*
......
......@@ -14,6 +14,7 @@ BOOST_AUTO_TEST_SUITE( timer_test )
BOOST_AUTO_TEST_CASE( timer_use )
{
#ifndef WIN64
//! [timer usage and behavior]
timer t;
......@@ -50,6 +51,7 @@ BOOST_AUTO_TEST_CASE( timer_use )
BOOST_REQUIRE_SMALL(t.getcputime(),10.0);
//! [timer usage and behavior]
#endif
}
BOOST_AUTO_TEST_SUITE_END()
......
......@@ -48,7 +48,7 @@ void calculate_optimal_device_grid(device_grid<dim> & dg,
// factors by 2 for the blocks
// Get the factors for x
std::vector<unsigned long int> x;
std::vector<size_t> x;
openfpm::math::getFactorization(sz[0],x);
dg.threads.x = 1;
......@@ -90,7 +90,7 @@ void calculate_optimal_device_grid(device_grid<dim> & dg,
// Get the factors for y
std::vector<unsigned long int> y;
std::vector<size_t> y;
size_t jy = 0;
dg.threads.y = 1;
......@@ -131,7 +131,7 @@ void calculate_optimal_device_grid(device_grid<dim> & dg,
}
// Get the factors for z
std::vector<unsigned long int> z;
std::vector<size_t> z;
size_t jz = 0;
dg.threads.z = 1;
......@@ -191,7 +191,7 @@ void calculate_optimal_device_grid(device_grid<dim> & dg,
for (size_t k = jz ; k < z.size() ; k++)
{dg.grids.z *= z[k];}
std::vector<unsigned long int> * ptr_xyz[3];
std::vector<size_t> * ptr_xyz[3];
ptr_xyz[0] = &x;
ptr_xyz[1] = &y;
ptr_xyz[2] = &z;
......
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