Rename: unuse under score in Transform functions

yasahi-hpc · Jul 6, 2024 · 714e563 · 714e563
1 parent 58ce0d7
commit 714e563
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 67 deletions.
diff --git a/fft/src/KokkosFFT_Cuda_transform.hpp b/fft/src/KokkosFFT_Cuda_transform.hpp
@@ -10,48 +10,48 @@
 namespace KokkosFFT {
 namespace Impl {
 template <typename... Args>
-inline void _exec(cufftHandle& plan, cufftReal* idata, cufftComplex* odata,
-                  int /*direction*/, Args...) {
+inline void exec_plan(cufftHandle& plan, cufftReal* idata, cufftComplex* odata,
+                      int /*direction*/, Args...) {
   cufftResult cufft_rt = cufftExecR2C(plan, idata, odata);
   if (cufft_rt != CUFFT_SUCCESS)
     throw std::runtime_error("cufftExecR2C failed");
 }
 
 template <typename... Args>
-inline void _exec(cufftHandle& plan, cufftDoubleReal* idata,
-                  cufftDoubleComplex* odata, int /*direction*/, Args...) {
+inline void exec_plan(cufftHandle& plan, cufftDoubleReal* idata,
+                      cufftDoubleComplex* odata, int /*direction*/, Args...) {
   cufftResult cufft_rt = cufftExecD2Z(plan, idata, odata);
   if (cufft_rt != CUFFT_SUCCESS)
     throw std::runtime_error("cufftExecD2Z failed");
 }
 
 template <typename... Args>
-inline void _exec(cufftHandle& plan, cufftComplex* idata, cufftReal* odata,
-                  int /*direction*/, Args...) {
+inline void exec_plan(cufftHandle& plan, cufftComplex* idata, cufftReal* odata,
+                      int /*direction*/, Args...) {
   cufftResult cufft_rt = cufftExecC2R(plan, idata, odata);
   if (cufft_rt != CUFFT_SUCCESS)
     throw std::runtime_error("cufftExecC2R failed");
 }
 
 template <typename... Args>
-inline void _exec(cufftHandle& plan, cufftDoubleComplex* idata,
-                  cufftDoubleReal* odata, int /*direction*/, Args...) {
+inline void exec_plan(cufftHandle& plan, cufftDoubleComplex* idata,
+                      cufftDoubleReal* odata, int /*direction*/, Args...) {
   cufftResult cufft_rt = cufftExecZ2D(plan, idata, odata);
   if (cufft_rt != CUFFT_SUCCESS)
     throw std::runtime_error("cufftExecZ2D failed");
 }
 
 template <typename... Args>
-inline void _exec(cufftHandle& plan, cufftComplex* idata, cufftComplex* odata,
-                  int direction, Args...) {
+inline void exec_plan(cufftHandle& plan, cufftComplex* idata,
+                      cufftComplex* odata, int direction, Args...) {
   cufftResult cufft_rt = cufftExecC2C(plan, idata, odata, direction);
   if (cufft_rt != CUFFT_SUCCESS)
     throw std::runtime_error("cufftExecC2C failed");
 }
 
 template <typename... Args>
-inline void _exec(cufftHandle& plan, cufftDoubleComplex* idata,
-                  cufftDoubleComplex* odata, int direction, Args...) {
+inline void exec_plan(cufftHandle& plan, cufftDoubleComplex* idata,
+                      cufftDoubleComplex* odata, int direction, Args...) {
   cufftResult cufft_rt = cufftExecZ2Z(plan, idata, odata, direction);
   if (cufft_rt != CUFFT_SUCCESS)
     throw std::runtime_error("cufftExecZ2Z failed");

diff --git a/fft/src/KokkosFFT_HIP_transform.hpp b/fft/src/KokkosFFT_HIP_transform.hpp
@@ -10,48 +10,48 @@
 namespace KokkosFFT {
 namespace Impl {
 template <typename... Args>
-inline void _exec(hipfftHandle& plan, hipfftReal* idata, hipfftComplex* odata,
-                  int /*direction*/, Args...) {
+inline void exec_plan(hipfftHandle& plan, hipfftReal* idata,
+                      hipfftComplex* odata, int /*direction*/, Args...) {
   hipfftResult hipfft_rt = hipfftExecR2C(plan, idata, odata);
   if (hipfft_rt != HIPFFT_SUCCESS)
     throw std::runtime_error("hipfftExecR2C failed");
 }
 
 template <typename... Args>
-inline void _exec(hipfftHandle& plan, hipfftDoubleReal* idata,
-                  hipfftDoubleComplex* odata, int /*direction*/, Args...) {
+inline void exec_plan(hipfftHandle& plan, hipfftDoubleReal* idata,
+                      hipfftDoubleComplex* odata, int /*direction*/, Args...) {
   hipfftResult hipfft_rt = hipfftExecD2Z(plan, idata, odata);
   if (hipfft_rt != HIPFFT_SUCCESS)
     throw std::runtime_error("hipfftExecD2Z failed");
 }
 
 template <typename... Args>
-inline void _exec(hipfftHandle& plan, hipfftComplex* idata, hipfftReal* odata,
-                  int /*direction*/, Args...) {
+inline void exec_plan(hipfftHandle& plan, hipfftComplex* idata,
+                      hipfftReal* odata, int /*direction*/, Args...) {
   hipfftResult hipfft_rt = hipfftExecC2R(plan, idata, odata);
   if (hipfft_rt != HIPFFT_SUCCESS)
     throw std::runtime_error("hipfftExecC2R failed");
 }
 
 template <typename... Args>
-inline void _exec(hipfftHandle& plan, hipfftDoubleComplex* idata,
-                  hipfftDoubleReal* odata, int /*direction*/, Args...) {
+inline void exec_plan(hipfftHandle& plan, hipfftDoubleComplex* idata,
+                      hipfftDoubleReal* odata, int /*direction*/, Args...) {
   hipfftResult hipfft_rt = hipfftExecZ2D(plan, idata, odata);
   if (hipfft_rt != HIPFFT_SUCCESS)
     throw std::runtime_error("hipfftExecZ2D failed");
 }
 
 template <typename... Args>
-inline void _exec(hipfftHandle& plan, hipfftComplex* idata,
-                  hipfftComplex* odata, int direction, Args...) {
+inline void exec_plan(hipfftHandle& plan, hipfftComplex* idata,
+                      hipfftComplex* odata, int direction, Args...) {
   hipfftResult hipfft_rt = hipfftExecC2C(plan, idata, odata, direction);
   if (hipfft_rt != HIPFFT_SUCCESS)
     throw std::runtime_error("hipfftExecC2C failed");
 }
 
 template <typename... Args>
-inline void _exec(hipfftHandle& plan, hipfftDoubleComplex* idata,
-                  hipfftDoubleComplex* odata, int direction, Args...) {
+inline void exec_plan(hipfftHandle& plan, hipfftDoubleComplex* idata,
+                      hipfftDoubleComplex* odata, int direction, Args...) {
   hipfftResult hipfft_rt = hipfftExecZ2Z(plan, idata, odata, direction);
   if (hipfft_rt != HIPFFT_SUCCESS)
     throw std::runtime_error("hipfftExecZ2Z failed");

diff --git a/fft/src/KokkosFFT_Host_transform.hpp b/fft/src/KokkosFFT_Host_transform.hpp
@@ -10,38 +10,38 @@
 namespace KokkosFFT {
 namespace Impl {
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, float* idata, fftwf_complex* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, float* idata, fftwf_complex* odata,
+               int /*direction*/, Args...) {
   fftwf_execute_dft_r2c(plan, idata, odata);
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, double* idata, fftw_complex* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, double* idata, fftw_complex* odata,
+               int /*direction*/, Args...) {
   fftw_execute_dft_r2c(plan, idata, odata);
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, fftwf_complex* idata, float* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, fftwf_complex* idata, float* odata,
+               int /*direction*/, Args...) {
   fftwf_execute_dft_c2r(plan, idata, odata);
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, fftw_complex* idata, double* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, fftw_complex* idata, double* odata,
+               int /*direction*/, Args...) {
   fftw_execute_dft_c2r(plan, idata, odata);
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, fftwf_complex* idata, fftwf_complex* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, fftwf_complex* idata, fftwf_complex* odata,
+               int /*direction*/, Args...) {
   fftwf_execute_dft(plan, idata, odata);
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType plan, fftw_complex* idata, fftw_complex* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType plan, fftw_complex* idata, fftw_complex* odata,
+               int /*direction*/, Args...) {
   fftw_execute_dft(plan, idata, odata);
 }
 }  // namespace Impl

diff --git a/fft/src/KokkosFFT_ROCM_transform.hpp b/fft/src/KokkosFFT_ROCM_transform.hpp
@@ -10,54 +10,54 @@
 
 namespace KokkosFFT {
 namespace Impl {
-inline void _exec(rocfft_plan& plan, float* idata, std::complex<float>* odata,
-                  int /*direction*/,
-                  const rocfft_execution_info& execution_info) {
+inline void exec_plan(rocfft_plan& plan, float* idata,
+                      std::complex<float>* odata, int /*direction*/,
+                      const rocfft_execution_info& execution_info) {
   rocfft_status status =
       rocfft_execute(plan, (void**)&idata, (void**)&odata, execution_info);
   if (status != rocfft_status_success)
     throw std::runtime_error("rocfft_execute for R2C failed");
 }
 
-inline void _exec(rocfft_plan& plan, double* idata, std::complex<double>* odata,
-                  int /*direction*/,
-                  const rocfft_execution_info& execution_info) {
+inline void exec_plan(rocfft_plan& plan, double* idata,
+                      std::complex<double>* odata, int /*direction*/,
+                      const rocfft_execution_info& execution_info) {
   rocfft_status status =
       rocfft_execute(plan, (void**)&idata, (void**)&odata, execution_info);
   if (status != rocfft_status_success)
     throw std::runtime_error("rocfft_execute for D2Z failed");
 }
 
-inline void _exec(rocfft_plan& plan, std::complex<float>* idata, float* odata,
-                  int /*direction*/,
-                  const rocfft_execution_info& execution_info) {
+inline void exec_plan(rocfft_plan& plan, std::complex<float>* idata,
+                      float* odata, int /*direction*/,
+                      const rocfft_execution_info& execution_info) {
   rocfft_status status =
       rocfft_execute(plan, (void**)&idata, (void**)&odata, execution_info);
   if (status != rocfft_status_success)
     throw std::runtime_error("rocfft_execute for C2R failed");
 }
 
-inline void _exec(rocfft_plan& plan, std::complex<double>* idata, double* odata,
-                  int /*direction*/,
-                  const rocfft_execution_info& execution_info) {
+inline void exec_plan(rocfft_plan& plan, std::complex<double>* idata,
+                      double* odata, int /*direction*/,
+                      const rocfft_execution_info& execution_info) {
   rocfft_status status =
       rocfft_execute(plan, (void**)&idata, (void**)&odata, execution_info);
   if (status != rocfft_status_success)
     throw std::runtime_error("rocfft_execute for Z2D failed");
 }
 
-inline void _exec(rocfft_plan& plan, std::complex<float>* idata,
-                  std::complex<float>* odata, int /*direction*/,
-                  const rocfft_execution_info& execution_info) {
+inline void exec_plan(rocfft_plan& plan, std::complex<float>* idata,
+                      std::complex<float>* odata, int /*direction*/,
+                      const rocfft_execution_info& execution_info) {
   rocfft_status status =
       rocfft_execute(plan, (void**)&idata, (void**)&odata, execution_info);
   if (status != rocfft_status_success)
     throw std::runtime_error("rocfft_execute for C2C failed");
 }
 
-inline void _exec(rocfft_plan& plan, std::complex<double>* idata,
-                  std::complex<double>* odata, int /*direction*/,
-                  const rocfft_execution_info& execution_info) {
+inline void exec_plan(rocfft_plan& plan, std::complex<double>* idata,
+                      std::complex<double>* odata, int /*direction*/,
+                      const rocfft_execution_info& execution_info) {
   rocfft_status status =
       rocfft_execute(plan, (void**)&idata, (void**)&odata, execution_info);
   if (status != rocfft_status_success)

diff --git a/fft/src/KokkosFFT_SYCL_transform.hpp b/fft/src/KokkosFFT_SYCL_transform.hpp
@@ -11,36 +11,36 @@
 namespace KokkosFFT {
 namespace Impl {
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, float* idata, std::complex<float>* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, float* idata, std::complex<float>* odata,
+               int /*direction*/, Args...) {
   oneapi::mkl::dft::compute_forward(plan, idata,
                                     reinterpret_cast<float*>(odata));
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, double* idata, std::complex<double>* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, double* idata, std::complex<double>* odata,
+               int /*direction*/, Args...) {
   oneapi::mkl::dft::compute_forward(plan, idata,
                                     reinterpret_cast<double*>(odata));
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, std::complex<float>* idata, float* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, std::complex<float>* idata, float* odata,
+               int /*direction*/, Args...) {
   oneapi::mkl::dft::compute_backward(plan, reinterpret_cast<float*>(idata),
                                      odata);
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, std::complex<double>* idata, double* odata,
-           int /*direction*/, Args...) {
+void exec_plan(PlanType& plan, std::complex<double>* idata, double* odata,
+               int /*direction*/, Args...) {
   oneapi::mkl::dft::compute_backward(plan, reinterpret_cast<double*>(idata),
                                      odata);
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, std::complex<float>* idata,
-           std::complex<float>* odata, int direction, Args...) {
+void exec_plan(PlanType& plan, std::complex<float>* idata,
+               std::complex<float>* odata, int direction, Args...) {
   if (direction == 1) {
     oneapi::mkl::dft::compute_forward(plan, idata, odata);
   } else {
@@ -49,8 +49,8 @@ void _exec(PlanType& plan, std::complex<float>* idata,
 }
 
 template <typename PlanType, typename... Args>
-void _exec(PlanType& plan, std::complex<double>* idata,
-           std::complex<double>* odata, int direction, Args...) {
+void exec_plan(PlanType& plan, std::complex<double>* idata,
+               std::complex<double>* odata, int direction, Args...) {
   if (direction == 1) {
     oneapi::mkl::dft::compute_forward(plan, idata, odata);
   } else {

diff --git a/fft/src/KokkosFFT_Transform.hpp b/fft/src/KokkosFFT_Transform.hpp
@@ -89,7 +89,7 @@ void exec_impl(
 
   auto const exec_space = plan.exec_space();
   auto const direction  = direction_type<ExecutionSpace>(plan.direction());
-  KokkosFFT::Impl::_exec(plan.plan(), idata, odata, direction, plan.info());
+  KokkosFFT::Impl::exec_plan(plan.plan(), idata, odata, direction, plan.info());
   KokkosFFT::Impl::normalize(exec_space, out, plan.direction(), norm,
                              plan.fft_size());
 }