Removed HCC workaround and rebased

alpaka-group · Apr 8, 2020 · 5937221 · 5937221
1 parent a015a71
commit 5937221
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/test/unit/math/mathOps/include/Functor.hpp b/test/unit/math/mathOps/include/Functor.hpp
@@ -13,16 +13,6 @@
 #include <alpaka/alpaka.hpp>
 #include <type_traits>
 
-// HCC requires no host-device flags, to match AMP context.
-// TODO: This can be removed when hip-clang will replace HCC
-#if BOOST_COMP_HCC
-#define ALPAKA_FN_ACC_NO_HCC
-#define ALPAKA_FN_HOST_NO_HCC
-#else
-#define ALPAKA_FN_ACC_NO_HCC ALPAKA_FN_ACC
-#define ALPAKA_FN_HOST_NO_HCC ALPAKA_FN_HOST
-#endif
-
 namespace alpaka {
 namespace test {
 namespace unit {
@@ -51,7 +41,7 @@ namespace math {
              typename std::enable_if<                                           \
                  !std::is_same<TAcc, std::nullptr_t>::value,                    \
                  int>::type = 0>                                                \
-    ALPAKA_FN_ACC_NO_HCC                                                        \
+    ALPAKA_FN_ACC                                                               \
     auto execute(                                                               \
         TAcc const & acc,                                                       \
         TArgs const & ... args ) const                                          \
@@ -68,7 +58,7 @@ namespace math {
              typename std::enable_if<                                           \
                  std::is_same< TAcc, std::nullptr_t>::value,                    \
                  int>::type = 0>                                                \
-    ALPAKA_FN_HOST_NO_HCC                                                       \
+    ALPAKA_FN_HOST                                                              \
     auto execute(                                                               \
         TAcc const & acc,                                                       \
         TArgs const &... args ) const                                           \

diff --git a/test/unit/math/mathOps/src/mathOps.cpp b/test/unit/math/mathOps/src/mathOps.cpp
@@ -232,12 +232,13 @@ TEST_CASE("mathOps", "[math] [operator]")
     std::cout << "using seed: " << seed << "\n\n";
     std::cout << "testing:\n "
         << std::tuple_size<TestAccs>::value
-        << " - TestKernels!\n"
+        << " - accelerators !\n"
         << std::tuple_size<alpaka::test::unit::math::UnaryFunctors>::value
         << " - unary math operators\n"
         << std::tuple_size<alpaka::test::unit::math::BinaryFunctors>::value
         << " - binary math operators\n"
-        << "testing with two data types\n\n";
+        << "testing with two data types\n"
+        << "total 2 * accelerators * (unary + binary) * capacity\n\n";
 
 
     alpaka::meta::forEachType< TestAccs >(