Refactor math operations unit tests (#986)

* rename `mathOps` to `math` unit test to match folder name like other tests * merge `sincos` test target into `math` test * move headers into src folder to remove relative includes
alpaka-group · Apr 27, 2020 · ade549f · ade549f
1 parent 4a3d1c2
commit ade549f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 39 deletions.
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -26,8 +26,7 @@ add_subdirectory("core/")
 add_subdirectory("event/")
 add_subdirectory("idx/")
 add_subdirectory("kernel/")
-add_subdirectory("math/mathOps/")
-add_subdirectory("math/sincos/")
+add_subdirectory("math/")
 add_subdirectory("mem/buf/")
 add_subdirectory("mem/view/")
 add_subdirectory("mem/p2p/")

diff --git a/test/unit/math/mathOps/CMakeLists.txt → test/unit/math/CMakeLists.txt b/test/unit/math/mathOps/CMakeLists.txt → test/unit/math/CMakeLists.txt
@@ -8,13 +8,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-set(_TARGET_NAME "mathOps")
-
+set(_TARGET_NAME "math")
 
 append_recursive_files_add_to_src_group("src/" "src/" "cpp" _FILES_SOURCE)
+append_recursive_files_add_to_src_group("src/" "src/" "hpp" _FILES_HEADER)
 
-
-message(STATUS "Disabling fast math options for math operation tests only.")
 if(ALPAKA_ACC_GPU_CUDA_ENABLE)
     list(REMOVE_ITEM
             CUDA_NVCC_FLAGS "--ftz=true" "--prec-div=false" "--prec-sqrt=false" "--fmad=true" "--use_fast_math" "-use_fast_math")
@@ -25,10 +23,10 @@ if(ALPAKA_ACC_GPU_HIP_ENABLE)
             HIP_NVCC_FLAGS "--ftz=true" "--prec-div=false" "--prec-sqrt=false" "--fmad=true" "--use_fast_math" "-use_fast_math")
 endif()
 
-
 alpaka_add_executable(
     ${_TARGET_NAME}
-    ${_FILES_SOURCE})
+    ${_FILES_SOURCE}
+    ${_FILES_HEADER})
 target_include_directories(
     ${_TARGET_NAME}
     PRIVATE ${Boost_INCLUDE_DIRS})

diff --git a/test/unit/math/sincos/CMakeLists.txt b/test/unit/math/sincos/CMakeLists.txt
diff --git a/test/unit/math/mathOps/include/Buffer.hpp → test/unit/math/src/Buffer.hpp b/test/unit/math/mathOps/include/Buffer.hpp → test/unit/math/src/Buffer.hpp
@@ -10,7 +10,9 @@
 #pragma once
 
 #include "Defines.hpp"
+
 #include <alpaka/test/acc/TestAccs.hpp>
+
 #include <ostream>
 
 namespace alpaka {

diff --git a/test/unit/math/mathOps/include/DataGen.hpp → test/unit/math/src/DataGen.hpp b/test/unit/math/mathOps/include/DataGen.hpp → test/unit/math/src/DataGen.hpp
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "Defines.hpp"
+
 #include <random>
 #include <limits>
 #include <cassert>

diff --git a/test/unit/math/mathOps/include/Defines.hpp → test/unit/math/src/Defines.hpp b/test/unit/math/mathOps/include/Defines.hpp → test/unit/math/src/Defines.hpp
@@ -14,7 +14,6 @@
 #include <iomanip>
 #include <limits>
 
-
 namespace alpaka {
 namespace test {
 namespace unit {

diff --git a/test/unit/math/mathOps/include/Functor.hpp → test/unit/math/src/Functor.hpp b/test/unit/math/mathOps/include/Functor.hpp → test/unit/math/src/Functor.hpp
@@ -10,7 +10,9 @@
 #pragma once
 
 #include "Defines.hpp"
+
 #include <alpaka/alpaka.hpp>
+
 #include <type_traits>
 
 namespace alpaka {

diff --git a/test/unit/math/mathOps/src/mathOps.cpp → test/unit/math/src/math.cpp b/test/unit/math/mathOps/src/mathOps.cpp → test/unit/math/src/math.cpp
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../include/Defines.hpp"
-#include "../include/Buffer.hpp"
-#include "../include/Functor.hpp"
-#include "../include/DataGen.hpp"
+#include "Defines.hpp"
+#include "Buffer.hpp"
+#include "Functor.hpp"
+#include "DataGen.hpp"
 
 #include <alpaka/test/acc/TestAccs.hpp>
 #include <alpaka/test/queue/Queue.hpp>
@@ -28,7 +28,6 @@ struct TestKernel
              typename TResults,
              typename TFunctor,
              typename TArgs>
-
     ALPAKA_FN_ACC auto operator()(
         TAcc const & acc,
         TResults const & results,

diff --git a/test/unit/math/sincos/src/sincos.cpp → test/unit/math/src/sincos.cpp b/test/unit/math/sincos/src/sincos.cpp → test/unit/math/src/sincos.cpp
@@ -31,7 +31,6 @@ almost_equal(TAcc const & acc, FP x, FP y, int ulp)
         || alpaka::math::abs(acc, x-y) < std::numeric_limits<FP>::min();
 }
 
-
 class SinCosTestKernel
 {
 public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ almost_equal(TAcc const & acc, FP x, FP y, int ulp) @@
             || alpaka::math::abs(acc, x-y) < std::numeric_limits<FP>::min();
     }
     class SinCosTestKernel
     {
     public:
@@ Expand Down @@