Replace nvshmem

CMakeLists.txt

@@ -129,8 +129,6 @@ if (CUDAToolkit_FOUND)
   set(CMAKE_CUDA_ARCHITECTURES ${_cuda_arch_list})
 endif()
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nvshmem.cmake)
-
 message(STATUS "${Blue}${PROJECT_NAME}-4. Setting up project libraries ...${ColorReset}")
 configure_file(${CMAKE_SOURCE_DIR}/configure.h.in configure.h @ONLY)
 add_subdirectory(src)

docs/api/hydro.rst

@@ -94,18 +94,6 @@ HydroOptions
       :return: Disable flux x3 flag
       :rtype: bool
 
-   .. method:: fused_recon_riemann() -> bool
-               fused_recon_riemann(value: bool) -> HydroOptions
-
-      Get or set the resolved fused reconstruction/Riemann CUDA path status.
-      For options loaded from YAML, the ``FUSED`` environment variable is the
-      selection control: ``FUSED=OFF`` disables the path, ``FUSED=ON`` requires
-      it and errors if unsupported, and ``FUSED=AUTO`` or an unset ``FUSED``
-      enables it only when the configuration is supported.
-
-      :return: Resolved fused reconstruction/Riemann status
-      :rtype: bool
-
    .. method:: eos() -> EquationOfStateOptions
                eos(value: EquationOfStateOptions) -> HydroOptions
 

docs/user_guide/configuration.rst

@@ -106,15 +106,6 @@ Hydrodynamic solver configuration:
       disable_flux_x2: false
       disable_flux_x3: false
 
-The fused reconstruction/Riemann CUDA path is controlled exclusively by the
-``FUSED`` environment variable when loading options from YAML. Set
-``FUSED=OFF`` to disable the fused path. Set ``FUSED=ON`` to require it, failing
-if the EOS/Riemann/reconstruction combination is unsupported. Set
-``FUSED=AUTO`` or leave ``FUSED`` unset to use the fused path when supported and
-fall back to the staged path otherwise. Option loading prints the resolved
-``FUSED`` mode, whether the fused path is enabled, and whether the configuration
-is supported.
-
 Physical Forcing
 ----------------
 

python/csrc/pyhydro.cpp

@@ -13,15 +13,15 @@
 
 namespace py = pybind11;
 
-void bind_hydro(py::module &m) {
+void bind_hydro(py::module& m) {
   auto pyHydroOptions =
       py::class_<snap::HydroOptionsImpl, snap::HydroOptions>(m, "HydroOptions");
 
   pyHydroOptions.def(py::init<>())
       .def_static("from_yaml", &snap::HydroOptionsImpl::from_yaml,
                   py::arg("filename"), py::arg("verbose") = false)
       .def("__repr__",
-           [](const snap::HydroOptions &a) {
+           [](const snap::HydroOptions& a) {
              std::stringstream ss;
              a->report(ss);
              return fmt::format("HydroOptions(\n{})", ss.str());
@@ -30,7 +30,6 @@ void bind_hydro(py::module &m) {
       .ADD_OPTION(bool, snap::HydroOptionsImpl, disable_flux_x1)
       .ADD_OPTION(bool, snap::HydroOptionsImpl, disable_flux_x2)
       .ADD_OPTION(bool, snap::HydroOptionsImpl, disable_flux_x3)
-      .ADD_OPTION(bool, snap::HydroOptionsImpl, fused_recon_riemann)
       .ADD_OPTION(snap::ConstGravityOptions, snap::HydroOptionsImpl, grav)
       .ADD_OPTION(snap::CoriolisOptions, snap::HydroOptionsImpl, coriolis)
       .ADD_OPTION(snap::DiffusionOptions, snap::HydroOptionsImpl, diffusion)
@@ -41,7 +40,7 @@ void bind_hydro(py::module &m) {
       .ADD_OPTION(snap::ImplicitOptions, snap::HydroOptionsImpl, icorr);
 
   ADD_SNAP_MODULE(Hydro, HydroOptions)
-      .def(py::init<snap::HydroOptions, torch::nn::Module *>(),
+      .def(py::init<snap::HydroOptions, torch::nn::Module*>(),
            py::arg("options"), py::arg("block") = nullptr)
       .def("max_time_step", &snap::HydroImpl::max_time_step);
 }

python/snapy/hydro.pyi

@@ -83,16 +83,6 @@ class HydroOptions:
         """Set disable flux x3 flag."""
         ...
 
-    @overload
-    def fused_recon_riemann(self) -> bool:
-        """Get resolved fused reconstruction/Riemann status."""
-        ...
-
-    @overload
-    def fused_recon_riemann(self, value: bool) -> "HydroOptions":
-        """Set fused reconstruction/Riemann status for manually constructed options."""
-        ...
-
     @overload
     def grav(self) -> ConstGravityOptions:
         """Get gravity options."""

src/CMakeLists.txt

@@ -142,16 +142,6 @@ if (CUDAToolkit_FOUND)
       ${C10_CUDA_LIBRARY}
       )
 
-  target_include_directories(${namel}_cuda_${buildl}
-      SYSTEM PUBLIC ${NVSHMEM_INCLUDE_DIR})
-  if(NVSHMEM_TORCH_TARGET)
-    target_link_libraries(${namel}_cuda_${buildl}
-        PUBLIC ${NVSHMEM_TORCH_TARGET})
-  else()
-    target_link_libraries(${namel}_cuda_${buildl}
-        PUBLIC ${NVSHMEM_LIBRARY})
-  endif()
-
   add_library(snapy::snap_cu ALIAS ${namel}_cuda_${buildl})
 endif()