Merge branch 'add-cufft' into 'master'

Add cufft test See merge request correaa/boost-multi!1360
correaa · Feb 25, 2025 · 79b47c7 · 79b47c7
2 parents 1f7a078 + 5138752
commit 79b47c7
Show file tree

Hide file tree

Showing 11 changed files with 794 additions and 770 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -34,6 +34,7 @@ Checks: '*,
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -fuchsia-overloaded-operator,
+  -fuchsia-default-arguments-calls,
   -fuchsia-trailing-return,
   -hicpp-no-array-decay,
   -llvmlibc-*,
@@ -47,6 +48,7 @@ Checks: '*,
 #  -cppcoreguidelines-avoid-magic-numbers,                // all tests use magic numbers
 #  -cppcoreguidelines-pro-bounds-array-to-pointer-decay   // for Boost Lightweight test BOOST_TEST
 #  -cppcoreguidelines-macro-usage,                        // BLAS adaptors uses a lot of macros
+#  -fuchsia-default-arguments-calls,                      // this library uses STL functions, which use default arguments
 #  -fuchsia-overloaded-operator,                          // this library overloads operators (==, <, +, &)
 #  -hicpp-no-array-decay,                                 // for Boost Lightweight Test
 #  -llvmlibc-*,                                           // nonsense warnings, for llvm developers

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -131,7 +131,7 @@ if(MULTI_BUILD_TESTS)
     if(ENABLE_CUDA)
       add_subdirectory(include/boost/multi/adaptors/thrust)
       add_subdirectory(include/boost/multi/adaptors/cuda)
-    #  add_subdirectory(include/boost/multi/adaptors/cufft)
+      add_subdirectory(include/boost/multi/adaptors/cufft)
     endif()
     if(ENABLE_HIP)
     #  add_subdirectory(include/boost/multi/adaptors/hipfft)

diff --git a/include/boost/multi/adaptors/CMakeLists.txt b/include/boost/multi/adaptors/CMakeLists.txt
@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.10)
-
 find_package(MPI)
 
 if(DISABLE_MPI)
@@ -11,3 +10,6 @@ else()
     message(WARNING "MPI not found, MPI adaptor will not be tested.")
   endif()
 endif()
+
+# add_subdirectory(./cufft)
+
diff --git a/include/boost/multi/adaptors/cufft.hpp b/include/boost/multi/adaptors/cufft.hpp
diff --git a/include/boost/multi/adaptors/cufft/CMakeLists.txt b/include/boost/multi/adaptors/cufft/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*-indent-tabs-mode:nil;c-basic-offset:2;tab-width:4;autowrap:nil;-*-
 cmake_minimum_required(VERSION 3.11)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)

diff --git a/include/boost/multi/adaptors/cufft/test/CMakeLists.txt b/include/boost/multi/adaptors/cufft/test/CMakeLists.txt
@@ -26,11 +26,13 @@ if(NOT
    STREQUAL
    "PGI"
 )
-	find_package(Boost REQUIRED COMPONENTS unit_test_framework)
+	find_package(Boost CONFIG)
+	#find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 else()
-	find_package(Boost REQUIRED) # cmake cannot detect this component with pgi compiler
+	find_package(Boost CONFIG)
+	#find_package(Boost REQUIRED) # cmake cannot detect this component with pgi compiler
 endif()
-link_libraries("-lboost_unit_test_framework")
+#link_libraries("-lboost_unit_test_framework")
 
 if(ENABLE_CUDA OR DEFINED CXXCUDA)
 	enable_language(CUDA)