Audit header files for using-directives.

This removes using-directives for std and raptor namespaces in header files. Many functions are also moved into the raptor namespace.
raptor-library · Dec 4, 2023 · b25f3b2 · b25f3b2
1 parent 496c096
commit b25f3b2
Show file tree

Hide file tree

Showing 101 changed files with 374 additions and 299 deletions.
diff --git a/examples/benchmark_amg.cpp b/examples/benchmark_amg.cpp
@@ -10,6 +10,8 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
+
 int main(int argc, char* argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/benchmark_matmult.cpp b/examples/benchmark_matmult.cpp
@@ -20,7 +20,7 @@
 #include "external/mfem_wrapper.hpp"
 #endif
 
-// using namespace raptor;
+using namespace raptor;
 int main(int argc, char *argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/benchmark_matops.cpp b/examples/benchmark_matops.cpp
@@ -22,6 +22,8 @@
   #include "external/mfem_wrapper.hpp"
 #endif
 
+using namespace raptor;
+
 #define eager_cutoff 1000
 #define short_cutoff 62
 

diff --git a/examples/benchmark_nek5000.cpp b/examples/benchmark_nek5000.cpp
@@ -8,9 +8,11 @@
 
 #include "clear_cache.hpp"
 
-#include "core/types.hpp"
-#include "multilevel/par_multilevel.hpp"
-#include "external/hypre_wrapper.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/multilevel/par_multilevel.hpp"
+#include "raptor/external/hypre_wrapper.hpp"
+
+using namespace raptor;
 
 int main(int argc, char *argv[])
 {

diff --git a/examples/benchmark_par_spmv.cpp b/examples/benchmark_par_spmv.cpp
@@ -11,10 +11,10 @@
 #include "raptor/raptor.hpp"
 
 #ifdef USING_MFEM
-#include "external/mfem_wrapper.hpp"
+#include "raptor/external/mfem_wrapper.hpp"
 #endif
 
-//using namespace raptor;
+using namespace raptor;
 int main(int argc, char *argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/benchmark_pcg.cpp b/examples/benchmark_pcg.cpp
@@ -10,6 +10,7 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
 int main(int argc, char* argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/benchmark_reader.cpp b/examples/benchmark_reader.cpp
@@ -9,6 +9,7 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
 int main(int argc, char* argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/benchmark_rss.cpp b/examples/benchmark_rss.cpp
@@ -8,23 +8,23 @@
 
 #include "clear_cache.hpp"
 
-#include "core/par_matrix.hpp"
-#include "core/par_vector.hpp"
-#include "core/types.hpp"
-#include "gallery/par_stencil.hpp"
-#include "gallery/laplacian27pt.hpp"
-#include "gallery/diffusion.hpp"
-#include "gallery/par_matrix_IO.hpp"
-#include "ruge_stuben/par_ruge_stuben_solver.hpp"
-#include "external/hypre_wrapper.hpp"
-#include "krylov/par_cg.hpp"
+#include "raptor/core/par_matrix.hpp"
+#include "raptor/core/par_vector.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/gallery/par_stencil.hpp"
+#include "raptor/gallery/laplacian27pt.hpp"
+#include "raptor/gallery/diffusion.hpp"
+#include "raptor/gallery/par_matrix_IO.hpp"
+#include "raptor/ruge_stuben/par_ruge_stuben_solver.hpp"
+#include "raptor/external/hypre_wrapper.hpp"
+#include "raptor/krylov/par_cg.hpp"
 
 #ifdef USING_MFEM
-  #include "external/mfem_wrapper.hpp"
+  #include "raptorexternal/mfem_wrapper.hpp"
 #endif
 
-//using namespace raptor;
-//
+using namespace raptor;
+
 
 void form_hypre_weights(std::vector<double>& weights, int n_rows)
 {

diff --git a/examples/benchmark_setup.cpp b/examples/benchmark_setup.cpp
@@ -8,18 +8,19 @@
 
 #include "clear_cache.hpp"
 
-#include "core/par_matrix.hpp"
-#include "core/par_vector.hpp"
-#include "core/types.hpp"
-#include "gallery/par_stencil.hpp"
-#include "gallery/laplacian27pt.hpp"
-#include "gallery/diffusion.hpp"
-#include "gallery/par_matrix_IO.hpp"
-#include "ruge_stuben/par_ruge_stuben_solver.hpp"
+#include "raptor/core/par_matrix.hpp"
+#include "raptor/core/par_vector.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/gallery/par_stencil.hpp"
+#include "raptor/gallery/laplacian27pt.hpp"
+#include "raptor/gallery/diffusion.hpp"
+#include "raptor/gallery/par_matrix_IO.hpp"
+#include "raptor/ruge_stuben/par_ruge_stuben_solver.hpp"
 
 #define eager_cutoff 8000
 #define short_cutoff 496
 
+using namespace raptor;
 int main(int argc, char *argv[])
 {
 

diff --git a/examples/benchmark_setup_sweeps.cpp b/examples/benchmark_setup_sweeps.cpp
@@ -9,6 +9,7 @@
 #include "clear_cache.hpp"
 
 #include "raptor/raptor.hpp"
+using namespace raptor;
 
 int main(int argc, char* argv[])
 {

diff --git a/examples/benchmark_solve.cpp b/examples/benchmark_solve.cpp
@@ -8,18 +8,20 @@
 
 #include "clear_cache.hpp"
 
-#include "core/par_matrix.hpp"
-#include "core/par_vector.hpp"
-#include "core/types.hpp"
-#include "gallery/par_stencil.hpp"
-#include "gallery/laplacian27pt.hpp"
-#include "gallery/diffusion.hpp"
-#include "gallery/par_matrix_IO.hpp"
-#include "ruge_stuben/par_ruge_stuben_solver.hpp"
+#include "raptor/core/par_matrix.hpp"
+#include "raptor/core/par_vector.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/gallery/par_stencil.hpp"
+#include "raptor/gallery/laplacian27pt.hpp"
+#include "raptor/gallery/diffusion.hpp"
+#include "raptor/gallery/par_matrix_IO.hpp"
+#include "raptor/ruge_stuben/par_ruge_stuben_solver.hpp"
 
 #define eager_cutoff 8000
 #define short_cutoff 496
 
+using namespace raptor;
+
 int main(int argc, char *argv[])
 {
 

diff --git a/examples/benchmark_spgemm_overlap.cpp b/examples/benchmark_spgemm_overlap.cpp
@@ -10,6 +10,8 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
+
 int main(int argc, char* argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/benchmark_spmv.cpp b/examples/benchmark_spmv.cpp
@@ -7,15 +7,15 @@
 #include "clear_cache.hpp"
 #include <ctime>
 
-#include "core/matrix.hpp"
-#include "core/vector.hpp"
-#include "core/types.hpp"
-#include "gallery/stencil.hpp"
-#include "gallery/laplacian27pt.hpp"
-#include "gallery/diffusion.hpp"
-#include "gallery/matrix_IO.hpp"
-
-//using namespace raptor;
+#include "raptor/core/matrix.hpp"
+#include "raptor/core/vector.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/gallery/stencil.hpp"
+#include "raptor/gallery/laplacian27pt.hpp"
+#include "raptor/gallery/diffusion.hpp"
+#include "raptor/gallery/matrix_IO.hpp"
+
+using namespace raptor;
 
 double wtime()
 {

diff --git a/examples/benchmark_spmv_overlap.cpp b/examples/benchmark_spmv_overlap.cpp
@@ -10,6 +10,8 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
+
 int main(int argc, char* argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/benchmark_tap_amg.cpp b/examples/benchmark_tap_amg.cpp
@@ -10,6 +10,8 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
+
 void form_hypre_weights(double** weight_ptr, int n_rows)
 {
     int rank;

diff --git a/examples/benchmark_tap_spgemm.cpp b/examples/benchmark_tap_spgemm.cpp
@@ -8,23 +8,25 @@
 
 #include "clear_cache.hpp"
 
-#include "core/par_matrix.hpp"
-#include "core/par_vector.hpp"
-#include "core/types.hpp"
-#include "gallery/par_stencil.hpp"
-#include "gallery/laplacian27pt.hpp"
-#include "gallery/diffusion.hpp"
-#include "gallery/par_matrix_IO.hpp"
-#include "multilevel/par_multilevel.hpp"
-#include "ruge_stuben/par_ruge_stuben_solver.hpp"
+#include "raptor/core/par_matrix.hpp"
+#include "raptor/core/par_vector.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/gallery/par_stencil.hpp"
+#include "raptor/gallery/laplacian27pt.hpp"
+#include "raptor/gallery/diffusion.hpp"
+#include "raptor/gallery/par_matrix_IO.hpp"
+#include "raptor/multilevel/par_multilevel.hpp"
+#include "raptor/ruge_stuben/par_ruge_stuben_solver.hpp"
 
 #ifdef USING_MFEM
-#include "external/mfem_wrapper.hpp"
+#include "raptor/external/mfem_wrapper.hpp"
 #endif
 
 #define eager_cutoff 1000
 #define short_cutoff 62
 
+using namespace raptor;
+
 void print_times(double time, double time_comm, const char* name)
 {
     int rank;

diff --git a/examples/benchmark_tap_spmv.cpp b/examples/benchmark_tap_spmv.cpp
@@ -8,24 +8,25 @@
 
 #include "clear_cache.hpp"
 
-#include "core/par_matrix.hpp"
-#include "core/par_vector.hpp"
-#include "core/types.hpp"
-#include "gallery/par_stencil.hpp"
-#include "gallery/laplacian27pt.hpp"
-#include "gallery/diffusion.hpp"
-#include "gallery/par_matrix_IO.hpp"
-#include "multilevel/par_multilevel.hpp"
-#include "ruge_stuben/par_ruge_stuben_solver.hpp"
+#include "raptor/core/par_matrix.hpp"
+#include "raptor/core/par_vector.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/gallery/par_stencil.hpp"
+#include "raptor/gallery/laplacian27pt.hpp"
+#include "raptor/gallery/diffusion.hpp"
+#include "raptor/gallery/par_matrix_IO.hpp"
+#include "raptor/multilevel/par_multilevel.hpp"
+#include "raptor/ruge_stuben/par_ruge_stuben_solver.hpp"
 
 #ifdef USING_MFEM
-  #include "external/mfem_wrapper.hpp"
+  #include "raptor/external/mfem_wrapper.hpp"
 #endif
 
 
 #define eager_cutoff 1000
 #define short_cutoff 62
 
+using namespace raptor;
 
 int main(int argc, char *argv[])
 {

diff --git a/examples/clear_cache.hpp b/examples/clear_cache.hpp
@@ -7,7 +7,7 @@
 #include <time.h>
 #include <math.h>
 #include <vector>
-#include "core/types.hpp"
+#include "raptor/core/types.hpp"
 
 using namespace raptor;
 

diff --git a/examples/coo_example.cpp b/examples/coo_example.cpp
@@ -9,6 +9,8 @@
 // Include raptor
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
+
 // This example creates a random ParCSRMatrix
 // All values are added into COO format and then converted.
 // The example then performs a SpMV on this matrix

diff --git a/examples/csr_example.cpp b/examples/csr_example.cpp
@@ -9,6 +9,7 @@
 // Include raptor
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
 // This example creates a random ParCSRMatrix
 // All values are added directly into ParCSR format.
 // The example then performs a SpMV on this matrix

diff --git a/examples/example.cpp b/examples/example.cpp
@@ -9,6 +9,8 @@
 // Include raptor
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
+
 // This is a basic use case.
 int main(int argc, char *argv[])
 {

diff --git a/examples/matop_example.cpp b/examples/matop_example.cpp
@@ -9,6 +9,8 @@
 // Include raptor
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
+
 // This is a basic use case.
 int main(int argc, char *argv[])
 {

diff --git a/examples/model_tap_steps.cpp b/examples/model_tap_steps.cpp
@@ -9,7 +9,7 @@
 #include "clear_cache.hpp"
 
 #include "raptor/raptor.hpp"
-
+using namespace raptor;
 
 void time_AP(ParCSRMatrix* A, ParCSRMatrix* P, int n_tests, bool tap, const char* name)
 {

diff --git a/examples/profile_amg.cpp b/examples/profile_amg.cpp
@@ -10,6 +10,7 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
 int main(int argc, char* argv[])
 {
     MPI_Init(&argc, &argv);

diff --git a/examples/profile_rss.cpp b/examples/profile_rss.cpp
@@ -8,18 +8,18 @@
 
 #include "clear_cache.hpp"
 
-#include "core/par_matrix.hpp"
-#include "core/par_vector.hpp"
-#include "core/types.hpp"
-#include "gallery/par_stencil.hpp"
-#include "gallery/laplacian27pt.hpp"
-#include "gallery/diffusion.hpp"
-#include "gallery/par_matrix_IO.hpp"
-#include "multilevel/par_multilevel.hpp"
-#include "ruge_stuben/par_ruge_stuben_solver.hpp"
+#include "raptor/core/par_matrix.hpp"
+#include "raptor/core/par_vector.hpp"
+#include "raptor/core/types.hpp"
+#include "raptor/gallery/par_stencil.hpp"
+#include "raptor/gallery/laplacian27pt.hpp"
+#include "raptor/gallery/diffusion.hpp"
+#include "raptor/gallery/par_matrix_IO.hpp"
+#include "raptor/multilevel/par_multilevel.hpp"
+#include "raptor/ruge_stuben/par_ruge_stuben_solver.hpp"
 
 #ifdef USING_MFEM
-#include "external/mfem_wrapper.hpp"
+#include "raptor/external/mfem_wrapper.hpp"
 #endif
 
 using namespace raptor;

diff --git a/examples/profile_tap_amg.cpp b/examples/profile_tap_amg.cpp
@@ -10,6 +10,7 @@
 
 #include "raptor/raptor.hpp"
 
+using namespace raptor;
 
 int main(int argc, char* argv[])
 {