replaces loop for comparing vectors with generic macro

rapidsai · Jul 21, 2022 · 6c889f7 · 6c889f7
1 parent d42869a
commit 6c889f7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/cpp/include/cudf_test/cudf_gtest.hpp b/cpp/include/cudf_test/cudf_gtest.hpp
@@ -176,3 +176,12 @@ struct TypeList<Types<TYPES...>> {
   } catch (std::exception & e) {                                                              \
     FAIL() << "statement:" << #statement << std::endl << "reason: " << e.what() << std::endl; \
   }
+
+/**
+ * @brief test macro comparing for equality of \p lhs and and \p rhs for the first \p size elements.
+ */
+#define CUDF_TEST_EXPECT_VECTOR_EQUAL(lhs, rhs, size)          \
+  do {                                                         \
+    for (decltype(size) i = 0; i < size; i++)                  \
+      EXPECT_EQ(lhs[i], rhs[i]) << "Mismatch at index #" << i; \
+  } while (0)
diff --git a/cpp/src/io/fst/in_reg_array.cuh b/cpp/src/io/fst/in_reg_array.cuh
@@ -62,7 +62,9 @@ class MultiFragmentInRegArray {
   /**
    * @brief Returns the \p num_bits bits starting at \p bit_start
    */
-  CUDF_HOST_DEVICE [[nodiscard]] uint32_t bfe(const uint32_t& data, uint32_t bit_start, uint32_t num_bits) const
+  CUDF_HOST_DEVICE [[nodiscard]] uint32_t bfe(const uint32_t& data,
+                                              uint32_t bit_start,
+                                              uint32_t num_bits) const
   {
 #if CUB_PTX_ARCH > 0
     return cub::BFE(data, bit_start, num_bits);

diff --git a/cpp/tests/io/fst/fst_test.cu b/cpp/tests/io/fst/fst_test.cu
@@ -255,12 +255,8 @@ TEST_F(FstTest, GroundTruth)
 
   // Verify results
   ASSERT_EQ(output_gpu_size[0], output_cpu.size());
-  for (std::size_t i = 0; i < output_cpu.size(); i++) {
-    EXPECT_EQ(output_gpu[i], output_cpu[i]) << "Mismatch at index #" << i;
-  }
-  for (std::size_t i = 0; i < output_cpu.size(); i++) {
-    EXPECT_EQ(out_indexes_gpu[i], out_index_cpu[i]) << "Mismatch at index #" << i;
-  }
+  CUDF_TEST_EXPECT_VECTOR_EQUAL(output_gpu, output_cpu, output_cpu.size());
+  CUDF_TEST_EXPECT_VECTOR_EQUAL(out_indexes_gpu, out_index_cpu, output_cpu.size());
 }
 
 CUDF_TEST_PROGRAM_MAIN()