Revert "Add initialization and finalization in examples"

This reverts commit 19bd963.
yasahi-hpc · Jan 14, 2025 · 2b59d12 · 2b59d12
1 parent 19bd963
commit 2b59d12
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 22 deletions.
diff --git a/examples/01_1DFFT/01_1DFFT.cpp b/examples/01_1DFFT/01_1DFFT.cpp
@@ -13,7 +13,6 @@ using View1D = Kokkos::View<T*, execution_space>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -45,7 +44,6 @@ int main(int argc, char* argv[]) {
     KokkosFFT::irfft(exec, xc2r, xc2r_hat);
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/examples/02_2DFFT/02_2DFFT.cpp b/examples/02_2DFFT/02_2DFFT.cpp
@@ -13,7 +13,6 @@ using View2D = Kokkos::View<T**, execution_space>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128, n1 = 128;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -45,7 +44,6 @@ int main(int argc, char* argv[]) {
     KokkosFFT::irfft2(exec, xc2r, xc2r_hat);
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/examples/03_NDFFT/03_NDFFT.cpp b/examples/03_NDFFT/03_NDFFT.cpp
@@ -15,7 +15,6 @@ using axis_type = KokkosFFT::axis_type<DIM>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128, n1 = 128, n2 = 16;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -47,7 +46,6 @@ int main(int argc, char* argv[]) {
     KokkosFFT::irfftn(exec, xc2r, xc2r_hat, axis_type<3>{-3, -2, -1});
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/examples/04_batchedFFT/04_batchedFFT.cpp b/examples/04_batchedFFT/04_batchedFFT.cpp
@@ -13,7 +13,6 @@ using View3D = Kokkos::View<T***, execution_space>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128, n1 = 128, n2 = 16;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -49,7 +48,6 @@ int main(int argc, char* argv[]) {
                      /*axis=*/-1);
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/examples/05_1DFFT_HOST_DEVICE/05_1DFFT_HOST_DEVICE.cpp b/examples/05_1DFFT_HOST_DEVICE/05_1DFFT_HOST_DEVICE.cpp
@@ -16,7 +16,6 @@ using HostView1D = Kokkos::View<T*, host_execution_space>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -80,7 +79,6 @@ int main(int argc, char* argv[]) {
     host_exec.fence();
 #endif
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/examples/06_1DFFT_reuse_plans/06_1DFFT_reuse_plans.cpp b/examples/06_1DFFT_reuse_plans/06_1DFFT_reuse_plans.cpp
@@ -13,7 +13,6 @@ using View1D = Kokkos::View<T*, execution_space>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -55,7 +54,6 @@ int main(int argc, char* argv[]) {
     irfft_plan.execute(xc2r, xc2r_hat);
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/examples/07_unmanaged_views/07_unmanaged_views.cpp b/examples/07_unmanaged_views/07_unmanaged_views.cpp
@@ -25,7 +25,6 @@ using shape_type = KokkosFFT::shape_type<DIM>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128, n1 = 128, n2 = 16;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -64,7 +63,6 @@ int main(int argc, char* argv[]) {
                      KokkosFFT::Normalization::backward, shape);
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/examples/08_inplace_FFT/08_inplace_FFT.cpp b/examples/08_inplace_FFT/08_inplace_FFT.cpp
@@ -14,7 +14,6 @@ using RightView2D = Kokkos::View<T **, Kokkos::LayoutRight, execution_space>;
 
 int main(int argc, char *argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
     const int n0 = 128, n1 = 128;
     const Kokkos::complex<double> z(1.0, 1.0);
@@ -70,7 +69,6 @@ int main(int argc, char *argv[]) {
 
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/install_test/as_library/hello.cpp b/install_test/as_library/hello.cpp
@@ -13,9 +13,8 @@ using View1D = Kokkos::View<T*, execution_space>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
-    const int n0 = 128;
+    constexpr int n0 = 128;
     const Kokkos::complex<double> z(1.0, 1.0);
 
     // 1D C2C FFT (Forward and Backward)
@@ -45,7 +44,6 @@ int main(int argc, char* argv[]) {
     KokkosFFT::irfft(exec, xc2r, xc2r_hat);
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;

diff --git a/install_test/as_subdirectory/hello.cpp b/install_test/as_subdirectory/hello.cpp
@@ -13,9 +13,8 @@ using View2D = Kokkos::View<T**, execution_space>;
 
 int main(int argc, char* argv[]) {
   Kokkos::initialize(argc, argv);
-  KokkosFFT::initialize();
   {
-    const int n0 = 128, n1 = 128;
+    constexpr int n0 = 128, n1 = 128;
     const Kokkos::complex<double> z(1.0, 1.0);
 
     // 2D C2C FFT (Forward and Backward)
@@ -45,7 +44,6 @@ int main(int argc, char* argv[]) {
     KokkosFFT::irfft2(exec, xc2r, xc2r_hat);
     exec.fence();
   }
-  KokkosFFT::finalize();
   Kokkos::finalize();
 
   return 0;