[pytorch][tensorexpr] Make gtest-style macros in tests match actual gtest signatures (#44861)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/44861

We were redefining things like ASSERT_EQ to take a _VA_ARGS_ parameter, so compiling these files with gtest (instead of pytorch's custom python-based cpp test infra) fails.

Test Plan: buck build //caffe2/test/cpp/tensorexpr

Reviewed By: asuhan

Differential Revision: D23711293

fbshipit-source-id: 8af14fa7c1f1e8169d14bb64515771f7bc3089e5

test/cpp/tensorexpr/padded_buffer.h

@@ -169,20 +169,8 @@ class PaddedBuffer : public PaddedBufferBase {
   // Verify the watermarks in the paddings are intact.
   void ValidateWatermark() const {
     for (int i = 0; i < kPaddingSize; i++) {
-      ASSERT_EQ(
-          data_[i],
-          kPaddingValue,
-          "left-side watermark broken: index: ",
-          i,
-          ", name: ",
-          name());
-      ASSERT_EQ(
-          data_[i + total_size_ + kPaddingSize],
-          kPaddingValue,
-          "right-side watermark broken: index: ",
-          i,
-          ", name: ",
-          name());
+      ASSERT_EQ(data_[i], kPaddingValue);
+      ASSERT_EQ(data_[i + total_size_ + kPaddingSize], kPaddingValue);
     }
   }
 
@@ -191,13 +179,7 @@ class PaddedBuffer : public PaddedBufferBase {
     DCHECK(backup_data_.size() == data_.size())
         << "Please make sure you have call Backup() before calling CheckBackup()";
     for (int i = 0; i < total_size_; i++) {
-      ASSERT_EQ(
-          data_[i + kPaddingSize],
-          backup_data_[i + kPaddingSize],
-          "mismatch against backup, index: ",
-          i,
-          ", name: ",
-          name());
+      ASSERT_EQ(data_[i + kPaddingSize], backup_data_[i + kPaddingSize]);
     }
   }
 
@@ -233,8 +215,7 @@ void ExpectAllEqual(const PaddedBuffer<T>& f1, const PaddedBuffer<T>& f2) {
   f1.ValidateWatermark();
   f2.ValidateWatermark();
   for (int i = 0; i < total_size; i++) {
-    ASSERT_EQ(
-        v1[kPaddingSize + i], v2[kPaddingSize + i], CompareErrorMsg(f1, f2, i));
+    ASSERT_EQ(v1[kPaddingSize + i], v2[kPaddingSize + i]);
   }
 }
 
@@ -251,11 +232,7 @@ void ExpectAllNear(
   f1.ValidateWatermark();
   f2.ValidateWatermark();
   for (int i = 0; i < total_size; i++) {
-    ASSERT_NEAR(
-        v1[kPaddingSize + i],
-        v2[kPaddingSize + i],
-        abs_error,
-        CompareErrorMsg(f1, f2, i));
+    ASSERT_NEAR(v1[kPaddingSize + i], v2[kPaddingSize + i], abs_error);
   }
 }
 

test/cpp/tensorexpr/test_aten.cpp

@@ -35,8 +35,8 @@ void testATen_cast_Float() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), static_cast<float>(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), static_cast<float>(i));
   }
 }
 
@@ -63,8 +63,8 @@ void testATennegInt() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), -static_cast<float>(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), -static_cast<float>(i));
   }
 }
 
@@ -91,8 +91,8 @@ void testATennegFloat() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), -i, "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), -i);
   }
 }
 
@@ -126,10 +126,10 @@ void testATenaddInt() {
   ir_eval(a_v, b_v, c_v, d_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), 3 * i + 2, "index: ", i);
-    ASSERT_EQ(d_v(i), a_v(i) + b_v(i) * c_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), 3 * i + 2);
+    ASSERT_EQ(d_v(i), a_v(i) + b_v(i) * c_v(i));
   }
 }
 
@@ -163,10 +163,10 @@ void testATenaddFloat() {
   ir_eval(a_v, b_v, c_v, d_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), 3 * i + 2, "index: ", i);
-    ASSERT_EQ(d_v(i), a_v(i) + b_v(i) * c_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), 3 * i + 2);
+    ASSERT_EQ(d_v(i), a_v(i) + b_v(i) * c_v(i));
   }
 }
 
@@ -200,10 +200,10 @@ void testATensubInt() {
   ir_eval(a_v, b_v, c_v, d_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), 3 * i + 2, "index: ", i);
-    ASSERT_EQ(d_v(i), a_v(i) - b_v(i) * c_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), 3 * i + 2);
+    ASSERT_EQ(d_v(i), a_v(i) - b_v(i) * c_v(i));
   }
 }
 
@@ -237,10 +237,10 @@ void testATensubFloat() {
   ir_eval(a_v, b_v, c_v, d_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), 3 * i + 2, "index: ", i);
-    ASSERT_EQ(d_v(i), a_v(i) - b_v(i) * c_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), 3 * i + 2);
+    ASSERT_EQ(d_v(i), a_v(i) - b_v(i) * c_v(i));
   }
 }
 
@@ -275,10 +275,10 @@ void testATenlerp() {
   ir_eval(a_v, b_v, c_v, d_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), 3 * i + 2, "index: ", i);
-    ASSERT_EQ(d_v(i), a_v(i) + c_v(i) * (b_v(i) - a_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), 3 * i + 2);
+    ASSERT_EQ(d_v(i), a_v(i) + c_v(i) * (b_v(i) - a_v(i)));
   }
 }
 
@@ -317,11 +317,11 @@ void testATenaddcmulInt() {
   ir_eval(a_v, b_v, c_v, d_v, e_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), 3 * i + 2, "index: ", i);
-    ASSERT_EQ(d_v(i), 5 * i + 3, "index: ", i);
-    ASSERT_EQ(e_v(i), a_v(i) + b_v(i) * c_v(i) * d_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), 3 * i + 2);
+    ASSERT_EQ(d_v(i), 5 * i + 3);
+    ASSERT_EQ(e_v(i), a_v(i) + b_v(i) * c_v(i) * d_v(i));
   }
 }
 
@@ -360,11 +360,11 @@ void testATenaddcmulFloat() {
   ir_eval(a_v, b_v, c_v, d_v, e_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), 3 * i + 2, "index: ", i);
-    ASSERT_EQ(d_v(i), 5 * i + 3, "index: ", i);
-    ASSERT_FLOAT_EQ(e_v(i), a_v(i) + b_v(i) * c_v(i) * d_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), 3 * i + 2);
+    ASSERT_EQ(d_v(i), 5 * i + 3);
+    ASSERT_FLOAT_EQ(e_v(i), a_v(i) + b_v(i) * c_v(i) * d_v(i));
   }
 }
 
@@ -394,9 +394,9 @@ void testATenmulInt() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), a_v(i) * b_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), a_v(i) * b_v(i));
   }
 }
 
@@ -426,9 +426,9 @@ void testATenmulFloat() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), a_v(i) * b_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), a_v(i) * b_v(i));
   }
 }
 
@@ -458,9 +458,9 @@ void testATendivInt() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(b_v(i), i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), a_v(i) / b_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), 2 * i + 1);
+    ASSERT_EQ(b_v(i), i + 1);
+    ASSERT_EQ(c_v(i), a_v(i) / b_v(i));
   }
 }
 
@@ -490,9 +490,9 @@ void testATendivFloat() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(b_v(i), i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), a_v(i) / b_v(i), "index: ", i);
+    ASSERT_EQ(a_v(i), 2 * i + 1);
+    ASSERT_EQ(b_v(i), i + 1);
+    ASSERT_EQ(c_v(i), a_v(i) / b_v(i));
   }
 }
 
@@ -523,9 +523,9 @@ void testATenmaxInt() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), std::max(a_v(i), b_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), std::max(a_v(i), b_v(i)));
   }
 }
 
@@ -556,9 +556,9 @@ void testATenmaxFloat() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), std::fmax(a_v(i), b_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), std::fmax(a_v(i), b_v(i)));
   }
 }
 
@@ -589,9 +589,9 @@ void testATenminInt() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), std::min(a_v(i), b_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), std::min(a_v(i), b_v(i)));
   }
 }
 
@@ -622,9 +622,9 @@ void testATenminFloat() {
   ir_eval(a_v, b_v, c_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 2 * i + 1, "index: ", i);
-    ASSERT_EQ(c_v(i), std::fmin(a_v(i), b_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 2 * i + 1);
+    ASSERT_EQ(c_v(i), std::fmin(a_v(i), b_v(i)));
   }
 }
 
@@ -650,8 +650,8 @@ void __ubsan_ignore_float_divide_by_zero__ testATenreciprocal() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i, "index: ", i);
-    ASSERT_EQ(b_v(i), 1.0f / i, "index: ", i);
+    ASSERT_EQ(a_v(i), i);
+    ASSERT_EQ(b_v(i), 1.0f / i);
   }
 }
 
@@ -677,8 +677,8 @@ void testATenreluInt() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i - 64, "index: ", i);
-    ASSERT_EQ(b_v(i), std::max(a_v(i), 0), "index: ", i);
+    ASSERT_EQ(a_v(i), i - 64);
+    ASSERT_EQ(b_v(i), std::max(a_v(i), 0));
   }
 }
 
@@ -708,8 +708,8 @@ void testATenreluFloat() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i - 64, "index: ", i);
-    ASSERT_EQ(b_v(i), std::fmax(a_v(i), 0), "index: ", i);
+    ASSERT_EQ(a_v(i), i - 64);
+    ASSERT_EQ(b_v(i), std::fmax(a_v(i), 0));
   }
 }
 
@@ -735,8 +735,8 @@ void testATenlogFloat() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i + 10, "index: ", i);
-    ASSERT_EQ(b_v(i), std::log(a_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i + 10);
+    ASSERT_EQ(b_v(i), std::log(a_v(i)));
   }
 }
 
@@ -762,8 +762,8 @@ void testATenlog10Float() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i + 10, "index: ", i);
-    ASSERT_EQ(b_v(i), std::log10(a_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i + 10);
+    ASSERT_EQ(b_v(i), std::log10(a_v(i)));
   }
 }
 
@@ -789,8 +789,8 @@ void testATenlog2Float() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i + 10, "index: ", i);
-    ASSERT_EQ(b_v(i), std::log2(a_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i + 10);
+    ASSERT_EQ(b_v(i), std::log2(a_v(i)));
   }
 }
 
@@ -816,8 +816,8 @@ void testATenexpFloat() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i / 10.0f, "index: ", i);
-    ASSERT_EQ(b_v(i), std::exp(a_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i / 10.0f);
+    ASSERT_EQ(b_v(i), std::exp(a_v(i)));
   }
 }
 
@@ -843,8 +843,8 @@ void testATenerfFloat() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i / 10.0f, "index: ", i);
-    ASSERT_EQ(b_v(i), std::erf(a_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i / 10.0f);
+    ASSERT_EQ(b_v(i), std::erf(a_v(i)));
   }
 }
 
@@ -870,8 +870,8 @@ void testATencosFloat() {
   ir_eval(a_v, b_v);
 
   for (int i = 0; i < kTotalSize; ++i) {
-    ASSERT_EQ(a_v(i), i / 10.0f, "index: ", i);
-    ASSERT_EQ(b_v(i), std::cos(a_v(i)), "index: ", i);
+    ASSERT_EQ(a_v(i), i / 10.0f);
+    ASSERT_EQ(b_v(i), std::cos(a_v(i)));
   }
 }
 

test/cpp/tensorexpr/test_base.h

@@ -53,8 +53,7 @@ void ExpectAllNear(
     const std::string& name = "") {
   ASSERT_EQ(v1.size(), v2.size());
   for (size_t i = 0; i < v1.size(); i++) {
-    ASSERT_NEAR(
-        v1[i], v2[i], threshold, "element index: ", i, ", name: ", name);
+    ASSERT_NEAR(v1[i], v2[i], threshold);
   }
 }
 
@@ -65,7 +64,7 @@ void ExpectAllNear(
     V threshold,
     const std::string& name = "") {
   for (size_t i = 0; i < vec.size(); i++) {
-    ASSERT_NEAR(vec[i], val, threshold, "element index: ", i, ", name: ", name);
+    ASSERT_NEAR(vec[i], val, threshold);
   }
 }
 
@@ -80,7 +79,7 @@ template <typename T>
 static void assertAllEqual(const std::vector<T>& v1, const std::vector<T>& v2) {
   ASSERT_EQ(v1.size(), v2.size());
   for (int i = 0; i < v1.size(); i++) {
-    ASSERT_EQ(v1[i], v2[i], "element index: ", i);
+    ASSERT_EQ(v1[i], v2[i]);
   }
 }
 } // namespace tensorexpr

test/cpp/tensorexpr/test_cuda.cpp

@@ -367,7 +367,7 @@ void testCudaTestRand01() {
     sum1 += v;
     sum2 += v * v;
     sum3 += v * v * v;
-    ASSERT_TRUE(v >= 0 && v < 1, "invalid value: ", i, ", ", v);
+    ASSERT_TRUE(v >= 0 && v < 1);
   }
   sum1 /= N;
   sum2 /= N;

test/cpp/tensorexpr/test_expr.cpp

@@ -419,7 +419,7 @@ void testExprUnaryMath01() {
     ExprHandle v = test_config.func(ExprHandle(input_v));
     float v_ref = test_config.ref_func(input_v);
     SimpleIRExprEval eval(v);
-    ASSERT_NEAR(eval.value<float>(), v_ref, 1e-6, "fail: ", v);
+    ASSERT_NEAR(eval.value<float>(), v_ref, 1e-6);
   }
 }
 
@@ -443,7 +443,7 @@ void testExprBinaryMath01() {
     ExprHandle v_expr = test_config.func(ExprHandle(v1), ExprHandle(v2));
     float v_ref = test_config.ref_func(v1, v2);
     SimpleIRExprEval eval(v_expr);
-    ASSERT_NEAR(eval.value<float>(), v_ref, 1e-6, "fail: ", v_expr);
+    ASSERT_NEAR(eval.value<float>(), v_ref, 1e-6);
   }
 }