review update

Co-authored-by: Thomas Grützmacher <[email protected]>
ginkgo-project · May 4, 2020 · 0aa89d6 · 0aa89d6
1 parent a51b281
commit 0aa89d6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/cuda/components/precision_conversion.cu b/cuda/components/precision_conversion.cu
@@ -43,10 +43,10 @@ namespace cuda {
 namespace components {
 
 
-#include "common/components/precision_conversion.hpp.inc"
+constexpr int default_block_size = 512;
 
 
-constexpr int default_block_size = 512;
+#include "common/components/precision_conversion.hpp.inc"
 
 
 template <typename SourceType, typename TargetType>

diff --git a/cuda/test/components/precision_conversion.cu b/cuda/test/components/precision_conversion.cu
@@ -73,9 +73,9 @@ protected:
  }
  dvals = vals;
  dcvals = cvals;
- gko::uint64 rawdouble = 0x4218888000889111ULL;
- gko::uint32 rawfloat = 0x50c44400ULL;
- gko::uint64 rawrounded = 0x4218888000000000ULL;
+ gko::uint64 rawdouble{0x4218888000889111ULL};
+ gko::uint32 rawfloat{0x50c44400UL};
+ gko::uint64 rawrounded{0x4218888000000000ULL};
  std::memcpy(vals2.get_data(), &rawdouble, sizeof(double));
  std::memcpy(expected_float.get_data(), &rawfloat, sizeof(float));
  std::memcpy(expected_double.get_data(), &rawrounded, sizeof(double));

diff --git a/hip/components/precision_conversion.hip.cpp b/hip/components/precision_conversion.hip.cpp
@@ -43,10 +43,10 @@ namespace hip {
 namespace components {
 
 
-#include "common/components/precision_conversion.hpp.inc"
+constexpr int default_block_size = 512;
 
 
-constexpr int default_block_size = 512;
+#include "common/components/precision_conversion.hpp.inc"
 
 
 template <typename SourceType, typename TargetType>

diff --git a/hip/test/components/precision_conversion.hip.cpp b/hip/test/components/precision_conversion.hip.cpp
@@ -73,9 +73,9 @@ class PrecisionConversion : public ::testing::Test {
  }
  dvals = vals;
  dcvals = cvals;
- gko::uint64 rawdouble = 0x4218888000889111ULL;
- gko::uint32 rawfloat = 0x50c44400ULL;
- gko::uint64 rawrounded = 0x4218888000000000ULL;
+ gko::uint64 rawdouble{0x4218888000889111ULL};
+ gko::uint32 rawfloat{0x50c44400UL};
+ gko::uint64 rawrounded{0x4218888000000000ULL};
  std::memcpy(vals2.get_data(), &rawdouble, sizeof(double));
  std::memcpy(expected_float.get_data(), &rawfloat, sizeof(float));
  std::memcpy(expected_double.get_data(), &rawrounded, sizeof(double));

diff --git a/omp/test/components/precision_conversion.cpp b/omp/test/components/precision_conversion.cpp
@@ -73,9 +73,9 @@ class PrecisionConversion : public ::testing::Test {
  }
  dvals = vals;
  dcvals = cvals;
- gko::uint64 rawdouble = 0x4218888000889111ULL;
- gko::uint32 rawfloat = 0x50c44400ULL;
- gko::uint64 rawrounded = 0x4218888000000000ULL;
+ gko::uint64 rawdouble{0x4218888000889111ULL};
+ gko::uint32 rawfloat{0x50c44400UL};
+ gko::uint64 rawrounded{0x4218888000000000ULL};
  std::memcpy(vals2.get_data(), &rawdouble, sizeof(double));
  std::memcpy(expected_float.get_data(), &rawfloat, sizeof(float));
  std::memcpy(expected_double.get_data(), &rawrounded, sizeof(double));

diff --git a/reference/test/components/precision_conversion.cpp b/reference/test/components/precision_conversion.cpp
@@ -67,9 +67,9 @@ class PrecisionConversion : public ::testing::Test {
  vals.get_data()[i] = dist(rand);
  cvals.get_data()[i] = {dist(rand), dist(rand)};
  }
- gko::uint64 rawdouble = 0x4218888000889111ULL;
- gko::uint32 rawfloat = 0x50c44400ULL;
- gko::uint64 rawrounded = 0x4218888000000000ULL;
+ gko::uint64 rawdouble{0x4218888000889111ULL};
+ gko::uint32 rawfloat{0x50c44400UL};
+ gko::uint64 rawrounded{0x4218888000000000ULL};
  std::memcpy(vals2.get_data(), &rawdouble, sizeof(double));
  std::memcpy(expected_float.get_data(), &rawfloat, sizeof(float));
  std::memcpy(expected_double.get_data(), &rawrounded, sizeof(double));