fixes for complex add and sub and fixes for their unit tests (#339)

* fixes for complex add and sub and fixes for their unit tests * missed host tests
NVIDIA · Dec 1, 2022 · a134ff9 · a134ff9
1 parent f2c6edd
commit a134ff9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/include/matx/operators/scalar_ops.h b/include/matx/operators/scalar_ops.h
@@ -307,24 +307,22 @@ template <typename T1, typename T2> struct AddF {
       if constexpr (is_complex_half_v<T1>) {
         return (T1){v1.real() + static_cast<typename T1::value_type>(
                                     static_cast<float>(v2)),
-                    v1.imag() + static_cast<typename T1::value_type>(
-                                    static_cast<float>(v2))};
+                    v1.imag() };
       }
       else {
         return (T1){v1.real() + static_cast<typename T1::value_type>(v2),
-                    v1.imag() + static_cast<typename T1::value_type>(v2)};
+                    v1.imag() };
       }
     }
     else if constexpr (is_complex_v<T2> && std::is_arithmetic_v<T1>) {
       if constexpr (is_complex_half_v<T2>) {
         return (T2){v2.real() + static_cast<typename T2::value_type>(
                                     static_cast<float>(v1)),
-                    v2.imag() + static_cast<typename T2::value_type>(
-                                    static_cast<float>(v1))};
+                    v2.imag() };
       }
       else {
         return (T2){v2.real() + static_cast<typename T2::value_type>(v1),
-                    v2.imag() + static_cast<typename T2::value_type>(v1)};
+                    v2.imag() };
       }
     }
     else {
@@ -347,24 +345,22 @@ template <typename T1, typename T2> struct SubF {
       if constexpr (is_complex_half_v<T1>) {
         return (T1){v1.real() - static_cast<typename T1::value_type>(
                                     static_cast<float>(v2)),
-                    v1.imag() - static_cast<typename T1::value_type>(
-                                    static_cast<float>(v2))};
+                    v1.imag() };
       }
       else {
         return (T1){v1.real() - static_cast<typename T1::value_type>(v2),
-                    v1.imag() - static_cast<typename T1::value_type>(v2)};
+                    v1.imag() };
       }
     }
     else if constexpr (is_complex_v<T2> && std::is_arithmetic_v<T1>) {
       if constexpr (is_complex_half_v<T2>) {
         return (T2){v2.real() - static_cast<typename T2::value_type>(
                                     static_cast<float>(v1)),
-                    v2.imag() - static_cast<typename T2::value_type>(
-                                    static_cast<float>(v1))};
+                    v2.imag() };
       }
       else {
         return (T2){v2.real() - static_cast<typename T2::value_type>(v1),
-                    v2.imag() - static_cast<typename T2::value_type>(v1)};
+                    v2.imag() };
       }
     }
     else {

diff --git a/test/00_host/OperatorTests.cc b/test/00_host/OperatorTests.cc
@@ -1466,7 +1466,7 @@ TYPED_TEST(HostOperatorTestsComplex, ComplexTypeCompatibility)
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).real()),
               static_cast<detail::value_promote_t<TypeParam>>(i + i));
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).imag()),
-              static_cast<detail::value_promote_t<TypeParam>>(i + i));
+              static_cast<detail::value_promote_t<TypeParam>>(i));
   }
 
   // Subtract scalar
@@ -1482,7 +1482,7 @@ TYPED_TEST(HostOperatorTestsComplex, ComplexTypeCompatibility)
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).real()),
               static_cast<detail::value_promote_t<TypeParam>>(-1));
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).imag()),
-              static_cast<detail::value_promote_t<TypeParam>>(-1));
+              static_cast<detail::value_promote_t<TypeParam>>(i));
   }
 
   MATX_EXIT_HANDLER();

diff --git a/test/00_operators/OperatorTests.cu b/test/00_operators/OperatorTests.cu
@@ -1620,6 +1620,7 @@ TYPED_TEST(OperatorTestsComplex, ComplexTypeCompatibility)
     dview(i) = {static_cast<detail::value_promote_t<TypeParam>>(i),
                 static_cast<detail::value_promote_t<TypeParam>>(i)};
   }
+
 
   (dview = dview + fview).run();
   cudaDeviceSynchronize();
@@ -1628,7 +1629,7 @@ TYPED_TEST(OperatorTestsComplex, ComplexTypeCompatibility)
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).real()),
               static_cast<detail::value_promote_t<TypeParam>>(i + i));
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).imag()),
-              static_cast<detail::value_promote_t<TypeParam>>(i + i));
+              static_cast<detail::value_promote_t<TypeParam>>(i));
   }
 
   // Subtract scalar
@@ -1645,7 +1646,7 @@ TYPED_TEST(OperatorTestsComplex, ComplexTypeCompatibility)
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).real()),
               static_cast<detail::value_promote_t<TypeParam>>(-1));
     ASSERT_EQ(static_cast<detail::value_promote_t<TypeParam>>(dview(i).imag()),
-              static_cast<detail::value_promote_t<TypeParam>>(-1));
+              static_cast<detail::value_promote_t<TypeParam>>(i));
   }
 
   MATX_EXIT_HANDLER();