move include/common to include/finufft_common

iboB · DiamonDinoia · commit 1eefb31fc471 · 2025-10-16T10:55:59.000-04:00
diff --git a/include/common/common.h b/include/common/common.h
diff --git a/include/cufinufft.h b/include/cufinufft.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <common/defines.h>
+#include <finufft_common/defines.h>
 #include <cufinufft_opts.h>
 #include <finufft_errors.h>
 
diff --git a/include/cufinufft/defs.h b/include/cufinufft/defs.h
@@ -1,7 +1,7 @@
 #ifndef CUFINUFFT_DEFS_H
 #define CUFINUFFT_DEFS_H
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <limits>
 
 // FIXME: If cufft ever takes N > INT_MAX...
diff --git a/include/cufinufft/utils.h b/include/cufinufft/utils.h
@@ -12,7 +12,7 @@
 #include <type_traits>
 #include <utility> // for std::forward
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 
 #ifndef _USE_MATH_DEFINES
 #define _USE_MATH_DEFINES
@@ -137,7 +137,7 @@ template<typename T> auto arrayrange(int n, T *a, cudaStream_t stream) {
 
 // Writes out w = half-width and c = center of an interval enclosing all a[n]'s
 // Only chooses a nonzero center if this increases w by less than fraction
-// ARRAYWIDCEN_GROWFRAC defined in common/constants.h.
+// ARRAYWIDCEN_GROWFRAC defined in finufft_common/constants.h.
 // This prevents rephasings which don't grow nf by much. 6/8/17
 // If n==0, w and c are not finite.
 template<typename T> auto arraywidcen(int n, T *a, cudaStream_t stream) {
diff --git a/include/finufft/finufft_core.h b/include/finufft/finufft_core.h
@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "common/common.h"
+#include "finufft_common/common.h"
 #include "finufft_errors.h"
 
 // All indexing in library that potentially can exceed 2^31 uses 64-bit signed.
diff --git a/include/finufft/finufft_utils.hpp b/include/finufft/finufft_utils.hpp
@@ -5,7 +5,7 @@
 
 #include "finufft_core.h"
 #include <cmath>
-#include <common/common.h>
+#include <finufft_common/common.h>
 
 namespace finufft::utils {
 
@@ -28,7 +28,7 @@ FINUFFT_EXPORT FINUFFT_ALWAYS_INLINE void FINUFFT_CDECL arraywidcen(BIGINT n, co
                                                                     T *w, T *c)
 // Writes out w = half-width and c = center of an interval enclosing all a[n]'s
 // Only chooses a nonzero center if this increases w by less than fraction
-// ARRAYWIDCEN_GROWFRAC defined in common/constants.h.
+// ARRAYWIDCEN_GROWFRAC defined in finufft_common/constants.h.
 // This prevents rephasings which don't grow nf by much. 6/8/17
 // If n==0, w and c are not finite.
 {
diff --git a/include/finufft/test_defs.h b/include/finufft/test_defs.h
@@ -15,7 +15,7 @@
 #include <finufft.h>
 
 // convenient private finufft internals that tests need
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <finufft/finufft_core.h>
 #include <finufft/finufft_utils.hpp>
 #include <memory>
diff --git a/include/finufft_common/common.h b/include/finufft_common/common.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <finufft_common/constants.h>
+#include <finufft_common/defines.h>
+#include <finufft_common/utils.h>
diff --git a/include/finufft_common/constants.h b/include/finufft_common/constants.h
diff --git a/include/finufft_common/defines.h b/include/finufft_common/defines.h
diff --git a/include/finufft_common/utils.h b/include/finufft_common/utils.h
diff --git a/include/finufft_eitherprec.h b/include/finufft_eitherprec.h
@@ -36,7 +36,7 @@
 // the plan object pointed to... (doesn't need to be even defined here)
 #define FINUFFT_PLAN_S FINUFFTIFY(_plan_s)
 
-#include <common/defines.h>
+#include <finufft_common/defines.h>
 
 ////////////////////////////////////////////////////////////////////
 // PUBLIC METHOD INTERFACES. All are C-style even when used from C++...
diff --git a/iwyu.imp b/iwyu.imp
@@ -1,16 +1,16 @@
 [
-  { "include": [ "@<xsimd/.*>",      "private", "<xsimd/xsimd.hpp>",   "public" ] },
-  { "include": [ "@\"xsimd/.*\"",    "private", "<xsimd/xsimd.hpp>",   "public" ] },
+  { "include": [ "@<xsimd/.*>",            "private", "<xsimd/xsimd.hpp>",   "public" ] },
+  { "include": [ "@\"xsimd/.*\"",          "private", "<xsimd/xsimd.hpp>",   "public" ] },
 
-  { "include": [ "@<common/.*>",     "private", "\"common/common.h\"", "public" ] },
-  { "include": [ "@\"common/.*\"",   "private", "\"common/common.h\"", "public" ] },
+  { "include": [ "@<finufft_common/.*>",   "private", "\"finufft_common/common.h\"", "public" ] },
+  { "include": [ "@\"finufft_common/.*\"", "private", "\"finufft_common/common.h\"", "public" ] },
 
-  { "include": [ "@<thrust/(.*)>",   "private", "<thrust/\\1>",        "public" ] },
-  { "include": [ "@\"thrust/(.*)\"", "private", "<thrust/\\1>",        "public" ] },
+  { "include": [ "@<thrust/(.*)>",         "private", "<thrust/\\1>",        "public" ] },
+  { "include": [ "@\"thrust/(.*)\"",       "private", "<thrust/\\1>",        "public" ] },
 
-  { "include": [ "@<ducc/(.*)>",     "private", "<ducc/\\1>",          "public" ] },
-  { "include": [ "@\"ducc/(.*)\"",   "private", "<ducc/\\1>",          "public" ] },
+  { "include": [ "@<ducc/(.*)>",           "private", "<ducc/\\1>",          "public" ] },
+  { "include": [ "@\"ducc/(.*)\"",         "private", "<ducc/\\1>",          "public" ] },
 
-  { "include": [ "@<fftw3/.*>",      "private", "<fftw3.h>",           "public" ] },
-  { "include": [ "@\"fftw3/.*\"",    "private", "<fftw3.h>",           "public" ] }
+  { "include": [ "@<fftw3/.*>",            "private", "<fftw3.h>",           "public" ] },
+  { "include": [ "@\"fftw3/.*\"",          "private", "<fftw3.h>",           "public" ] }
 ]
diff --git a/makefile b/makefile
@@ -174,7 +174,7 @@ usage:
 	@echo "Also see docs/install.rst and docs/README"
 
 # collect headers for implicit depends (we don't separate public from private)
-HEADERS = $(wildcard include/*.h include/finufft/*.h include/common/*.h)
+HEADERS = $(wildcard include/*.h include/finufft/*.h include/finufft_common/*.h)
 
 # implicit rules for objects (note -o ensures writes to correct dir)
 %.o: %.cpp $(HEADERS)
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -1,5 +1,5 @@
 #include <cmath>
-#include <common/common.h>
+#include <finufft_common/common.h>
 
 #ifdef __CUDACC__
 #include <cufinufft/types.h>
diff --git a/test/cuda/cufinufft1d_test.cu b/test/cuda/cufinufft1d_test.cu
@@ -8,7 +8,7 @@
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <cufinufft.h>
 
 #include "../utils/dirft1d.hpp"
diff --git a/test/cuda/cufinufft1dspreadinterponly_test.cu b/test/cuda/cufinufft1dspreadinterponly_test.cu
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <random>
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <cufinufft.h>
 
 #include <cufinufft/contrib/helper_cuda.h>
diff --git a/test/cuda/cufinufft2d1nupts_test.cu b/test/cuda/cufinufft2d1nupts_test.cu
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <random>
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <cufinufft.h>
 
 #include <cufinufft/impl.h>
diff --git a/test/cuda/cufinufft2d_test.cu b/test/cuda/cufinufft2d_test.cu
@@ -6,7 +6,7 @@
 #include <limits>
 #include <random>
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <cufinufft.h>
 
 #include <cufinufft/impl.h>
diff --git a/test/cuda/cufinufft2dmany_test.cu b/test/cuda/cufinufft2dmany_test.cu
@@ -6,7 +6,7 @@
 #include <limits>
 #include <random>
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <cufinufft.h>
 
 #include <cufinufft/impl.h>
diff --git a/test/cuda/cufinufft3d_test.cu b/test/cuda/cufinufft3d_test.cu
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <random>
 
-#include <common/common.h>
+#include <finufft_common/common.h>
 #include <cufinufft.h>
 
 #include <cufinufft/impl.h>
