Commit e867ff34 authored by Markus Holzer's avatar Markus Holzer
Browse files

Merge branch '181-test-cuda-and-codegen-in-ci' into 'master'

Resolve "Test cuda and codegen in CI"

Closes #181

See merge request walberla/walberla!532
parents 701a892f a43f9181
Pipeline #38958 failed with stages
in 171 minutes and 33 seconds
This diff is collapsed.
...@@ -338,7 +338,7 @@ inline std::size_t hash_value( const Cell & cell ) ...@@ -338,7 +338,7 @@ inline std::size_t hash_value( const Cell & cell )
{ {
std::size_t seed; std::size_t seed;
if constexpr( sizeof(std::size_t) >= 8 ) if( sizeof(std::size_t) >= 8 )
{ {
seed = (static_cast<std::size_t>(cell.x()) << 42) + seed = (static_cast<std::size_t>(cell.x()) << 42) +
(static_cast<std::size_t>(cell.y()) << 21) + (static_cast<std::size_t>(cell.y()) << 21) +
......
...@@ -1561,12 +1561,12 @@ struct Vector2LexicographicalyLess ...@@ -1561,12 +1561,12 @@ struct Vector2LexicographicalyLess
// \param v The vector the hash is computed for. // \param v The vector the hash is computed for.
// \returns A hash for the entire Vector2. // \returns A hash for the entire Vector2.
*/ */
template< typename T, typename Enable = std::enable_if_t<std::is_integral_v<T>> > template< typename T, typename Enable = std::enable_if_t<std::is_integral<T>::value> >
std::size_t hash_value( const Vector2<T> & v ) std::size_t hash_value( const Vector2<T> & v )
{ {
std::size_t seed; std::size_t seed;
if constexpr( sizeof(std::size_t) >= 8 ) if( sizeof(std::size_t) >= 8 )
{ {
seed = (static_cast<std::size_t>(v[0]) << 42) + seed = (static_cast<std::size_t>(v[0]) << 42) +
(static_cast<std::size_t>(v[1]) << 21); (static_cast<std::size_t>(v[1]) << 21);
......
...@@ -1847,12 +1847,12 @@ struct Vector3LexicographicalyLess ...@@ -1847,12 +1847,12 @@ struct Vector3LexicographicalyLess
// \param v The vector the hash is computed for. // \param v The vector the hash is computed for.
// \returns A hash for the entire Vector3. // \returns A hash for the entire Vector3.
*/ */
template< typename T, typename Enable = std::enable_if_t<std::is_integral_v<T>> > template< typename T, typename Enable = std::enable_if_t<std::is_integral<T>::value> >
std::size_t hash_value( const Vector3<T> & v ) std::size_t hash_value( const Vector3<T> & v )
{ {
std::size_t seed; std::size_t seed;
if constexpr( sizeof(std::size_t) >= 8 ) if( sizeof(std::size_t) >= 8 )
{ {
seed = (static_cast<std::size_t>(v[0]) << 42) + seed = (static_cast<std::size_t>(v[0]) << 42) +
(static_cast<std::size_t>(v[1]) << 21) + (static_cast<std::size_t>(v[1]) << 21) +
......
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