Merge pull request #401 from JamesMcClung/pr/vpic-cleanup

Remove VPIC

Author: JamesMcClung

CMakeLists.txt

@@ -1,10 +1,10 @@
 
-cmake_minimum_required (VERSION 3.21)
+cmake_minimum_required(VERSION 3.21)
 
 foreach(policy
-    CMP0074 # CMake 3.12
-    CMP0104 # CMAKE_CUDA_ARCHITECTURES
-    )
+  CMP0074 # CMake 3.12
+  CMP0104 # CMAKE_CUDA_ARCHITECTURES
+)
   if(POLICY ${policy})
     cmake_policy(SET ${policy} NEW)
   endif()
@@ -27,7 +27,6 @@ endfunction()
 
 set(PSC_GPU "host" CACHE STRING "Build with GPU supoort (host/cuda/hip)")
 set_property(CACHE PSC_GPU PROPERTY STRINGS "host;cuda;hip")
-option(USE_VPIC "Interface with VPIC" OFF)
 option(USE_GTEST_DISCOVER_TESTS "Run tests to discover contained googletest cases" OFF)
 psc_option(ADIOS2 "Build with adios2 support" AUTO)
 option(PSC_USE_NVTX "Build with NVTX support" OFF)
@@ -37,8 +36,8 @@ option(PSC_USE_PERFETTO "Turn on perfetto-based tracing" OFF)
 
 option(USE_CUDA "Build CUDA components" OFF)
 
-if (USE_CUDA)
-  set(PSC_GPU "cuda" CACHE STRING  "Build with GPU supoort (none/cuda/hip)")
+if(USE_CUDA)
+  set(PSC_GPU "cuda" CACHE STRING "Build with GPU supoort (none/cuda/hip)")
 endif()
 
 if(PSC_GPU STREQUAL "cuda")
@@ -56,6 +55,7 @@ elseif(PSC_GPU STREQUAL "hip")
 else()
   set(USE_CUDA OFF)
 endif()
+
 set(GTENSOR_DEVICE "${PSC_GPU}" CACHE STRING "")
 
 CPMAddPackage(
@@ -65,14 +65,14 @@ CPMAddPackage(
   VERSION 0.0.0
 )
 
-if (BUILD_TESTING)
+if(BUILD_TESTING)
   CPMAddPackage(
     NAME GTest
     GITHUB_REPOSITORY google/googletest
     VERSION 1.14.0
     OPTIONS
-        "INSTALL_GTEST OFF"
-        "gtest_force_shared_crt ON"
+    "INSTALL_GTEST OFF"
+    "gtest_force_shared_crt ON"
   )
   include(GoogleTest)
 endif()
@@ -86,23 +86,24 @@ if(PSC_USE_ADIOS2 STREQUAL AUTO)
 elseif(PSC_USE_ADIOS2)
   find_package(ADIOS2 CONFIG REQUIRED)
 endif()
+
 if(ADIOS2_FOUND)
   set(PSC_HAVE_ADIOS2 1)
 endif()
 
 # NVTX
-if (PSC_USE_NVTX)
+if(PSC_USE_NVTX)
   find_package(CUDAToolkit REQUIRED)
   set(PSC_HAVE_NVTX 1)
 endif()
 
 # RMM
-if (PSC_USE_RMM)
+if(PSC_USE_RMM)
   find_package(rmm 0.18.0 CONFIG REQUIRED)
   set(PSC_HAVE_RMM 1)
 endif()
 
-if (PSC_USE_PERFETTO)
+if(PSC_USE_PERFETTO)
   CPMAddPackage("gh:google/perfetto@24.2")
   find_package(Threads REQUIRED)
   add_library(perfetto STATIC ${perfetto_SOURCE_DIR}/sdk/perfetto.cc)
@@ -113,6 +114,7 @@ endif()
 
 function(GenerateHeaderConfig)
   set(PSC_CONFIG_DEFINES)
+
   foreach(OPT IN LISTS ARGN)
     string(APPEND PSC_CONFIG_DEFINES "
 /* CMake Option: PSC_USE_${OPT}=${PSC_USE_${OPT}} */
@@ -130,11 +132,12 @@ function(GenerateHeaderConfig)
   )
 endfunction()
 
-# FIXME, unify USE_CUDA, USE_VPIC options / autodetect
+# FIXME, unify USE_CUDA options / autodetect
 # FIXME, mv helpers into separate file
 GenerateHeaderConfig(ADIOS2 NVTX RMM)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src/include)
+
 # FIXME, this seems too ugly to find mrc_config.h
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src/libmrc/include)
 

README.md

@@ -28,7 +28,6 @@ $ cat > cmake.sh <<EOF
 cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DUSE_CUDA=OFF \
-    -DUSE_VPIC=OFF \
     ..
 EOF
 $ . cmake.sh # run cmake (hope for the best)

src/include/PscConfig.h.in

@@ -21,7 +21,6 @@
  */
 
 #cmakedefine USE_CUDA
-#cmakedefine USE_VPIC
 
 /* Everything past this line is programatically generated */
 

src/include/checkpoint.hxx

@@ -23,7 +23,7 @@ void write_checkpoint(const Grid_t& grid, Mparticles& mprts,
 
   prof_start(pr);
   mpi_printf(grid.comm(), "**** Writing checkpoint...\n");
-#if defined(PSC_HAVE_ADIOS2) && !defined(VPIC)
+#if defined(PSC_HAVE_ADIOS2)
   prof_start(pr_A);
   MPI_Barrier(grid.comm()); // not really necessary
   prof_stop(pr_A);

src/include/grid/domain.hxx

@@ -2,7 +2,7 @@
 
 #include <mrc_common.h>
 #include <iostream>
-#include "../libpsc/vpic/psc_vpic_bits.h"
+#include "../libpsc/bits.hxx"
 
 namespace psc
 {

src/include/input_params.hxx

@@ -8,7 +8,7 @@
 
 #include <mpi.h>
 
-#include "../libpsc/vpic/psc_vpic_bits.h"
+#include "../libpsc/bits.hxx"
 
 namespace
 {

src/include/mfields_hydro.hxx

@@ -7,7 +7,6 @@
 #include <particles.hxx>
 #include <setup_particles.hxx>
 
-#include "../libpsc/vpic/fields_item_vpic.hxx"
 #include "gauss_corrector_base.hxx"
 #include "diagnostic_base.hxx"
 #include "injector_base.hxx"
@@ -636,53 +635,3 @@ void setupParticles(SetupParticles& setup_particles, Mparticles& mprts,
   mpi_printf(MPI_COMM_WORLD, "**** Setting up particles...\n");
   setup_particles.setupParticles(mprts, init_np);
 }
-
-// ======================================================================
-// VPIC-like stuff
-
-// ----------------------------------------------------------------------
-// define_periodic_grid
-
-void define_periodic_grid(const double xl[3], const double xh[3],
-                          const int gdims[3], const int np[3])
-{}
-
-// ----------------------------------------------------------------------
-// set_domain_field_bc
-
-void set_domain_field_bc(Int3 bnd, int bc) {}
-
-// ----------------------------------------------------------------------
-// set_domain_particle_bc
-
-void set_domain_particle_bc(Int3 bnd, int bc) {}
-
-void grid_setup_communication() {}
-
-// ----------------------------------------------------------------------
-// vpic_define_grid
-
-void vpic_define_grid(const Grid_t& grid) {}
-
-// ----------------------------------------------------------------------
-// vpic_define_material
-
-static void vpic_define_material(MaterialList& material_list, const char* name,
-                                 double eps, double mu = 1., double sigma = 0.,
-                                 double zeta = 0.)
-{}
-
-// ----------------------------------------------------------------------
-// vpic_define_fields
-
-void vpic_define_fields(const Grid_t& grid) {}
-
-// ----------------------------------------------------------------------
-// vpic_create_diagnotics
-
-void vpic_create_diagnostics(int interval) {}
-
-// ----------------------------------------------------------------------
-// vpic_setup_diagnostics
-
-void vpic_setup_perform_diagnostics() {}

src/include/psc.hxx

@@ -64,7 +64,6 @@ extern struct diagsrv_srv_ops ds_srv_ops;
 extern struct diagsrv_srv_ops ds_srv_cache_ops;
 
 extern struct mrc_io_ops mrc_io_ascii_ops;
-extern struct mrc_io_ops mrc_io_vpic_ops;
 extern struct mrc_io_ops mrc_io_xdmf_ops;
 extern struct mrc_io_ops mrc_io_xdmf_serial_ops;
 extern struct mrc_io_ops mrc_io_xdmf_to_one_ops;