Permalink
Browse files

updated LibFlatArray

  • Loading branch information...
gentryx committed Jul 27, 2017
1 parent 14af9ad commit ba45a35aa1efd409063055b54a253f5a65944985
@@ -5,7 +5,6 @@
* file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
*/
#ifdef _MSC_BUILD
# define _USE_MATH_DEFINES
#endif
@@ -45,7 +45,11 @@ class load_functor
static_cast<long>(i->origin[0]),
static_cast<long>(i->origin[1]),
static_cast<long>(i->origin[2]));
accessor.load(source, i->length(), offset, count);
accessor.load(
source,
static_cast<std::size_t>(i->length()),
offset,
count);
offset += i->length();
}
@@ -25,7 +25,7 @@ class save_functor
const ITERATOR& start,
const ITERATOR& end,
char *target,
long count) :
std::size_t count) :
start(start),
end(end),
target(target),
@@ -42,7 +42,11 @@ class save_functor
static_cast<long>(i->origin[0]),
static_cast<long>(i->origin[1]),
static_cast<long>(i->origin[2]));
accessor.save(target, i->length(), offset, static_cast<std::size_t>(count));
accessor.save(
target,
static_cast<std::size_t>(i->length()),
offset,
count);
offset += i->length();
}
@@ -52,7 +56,7 @@ class save_functor
ITERATOR start;
ITERATOR end;
char *target;
long count;
std::size_t count;
};
#ifdef LIBFLATARRAY_WITH_CUDA
@@ -87,7 +87,7 @@ class short_vec<float, 32> : public short_vec_base<float, 32>
#endif
inline
short_vec!(const sqrt_reference<float, 32>& other);
short_vec(const sqrt_reference<float, 32>& other);
inline
bool any() const
@@ -309,7 +309,7 @@ class soa_grid
iter,
iter + 1,
const_cast<char_staging_buffer_type&>(raw_staging_buffer).data(),
static_cast<long>(count)));
count));
raw_staging_buffer.save(target);
}
@@ -1159,7 +1159,7 @@ ADD_TEST(TestImplementationStrategyFloat)
// 4x:
#ifdef __SSE__
# define EXPECTED_TYPE short_vec_strategy::sse
#elif __ARM_NEON__
#elif defined __ARM_NEON__
# define EXPECTED_TYPE short_vec_strategy::neon
#else
# define EXPECTED_TYPE short_vec_strategy::scalar
@@ -1098,7 +1098,7 @@ ADD_TEST(TestImplementationStrategyFloat)
// 4x:
#ifdef __SSE__
# define EXPECTED_TYPE short_vec_strategy::sse
#elif __ARM_NEON__
#elif defined __ARM_NEON__
# define EXPECTED_TYPE short_vec_strategy::neon
#else
# define EXPECTED_TYPE short_vec_strategy::scalar

0 comments on commit ba45a35

Please sign in to comment.