Remove Cajita deprecation wrappers

CMakeLists.txt

@@ -236,16 +236,6 @@ endif()
 add_subdirectory(core)
 
 option(Cabana_ENABLE_GRID "Build grid and particle-grid capabilities" ${Cabana_ENABLE_MPI})
-### FIXME: remove in next release.
-option(Cabana_ENABLE_CAJITA "Build grid and particle-grid capabilities" OFF)
-option(Cabana_DISABLE_CAJITA_DEPRECATION_WARNINGS "Do not warn about Cajita deprecation." OFF)
-if (Cabana_ENABLE_CAJITA)
-  if (NOT Cabana_DISABLE_CAJITA_DEPRECATION_WARNINGS)
-    message(DEPRECATION "Option Cabana_ENABLE_CAJITA is deprecated, replaced by Cabana_ENABLE_GRID")
-  endif()
-  set(Cabana_ENABLE_GRID ON)
-endif()
-
 if(Cabana_ENABLE_GRID)
   if(MPI_FOUND)
     add_subdirectory(grid)

benchmark/plot/Cabana_BenchmarkPlotUtils.py

@@ -281,8 +281,7 @@ def getData(filelist):
         txt = f.read()
     if "Cabana Comm" in txt:
         return AllDataMPI(filelist)
-    # FIXME: Cajita backwards compatibility
-    elif ("Cajita" in txt or "Cabana::Grid " in txt):
+    elif ("Cabana::Grid " in txt):
         return AllDataGrid(filelist, grid=True)
 
     return AllData(filelist)

core/src/CMakeLists.txt

@@ -67,15 +67,6 @@ set(HEADERS_IMPL
 add_library(Core INTERFACE)
 add_library(Cabana::Core ALIAS Core)
 
-### FIXME: remove cabanacore in next release.
-add_library(cabanacore INTERFACE)
-target_link_libraries(cabanacore INTERFACE Core)
-if(CMAKE_VERSION VERSION_GREATER 3.17)
-  if(NOT Cabana_DISABLE_CAJITA_DEPRECATION_WARNINGS)
-    set_property(TARGET cabanacore PROPERTY DEPRECATION "NOTE: cabanacore subpackage is now Core. Link to Cabana::Core. Cabana::cabanacore will be removed in a future release.")
-  endif()
-endif()
-
 # Require minimum of C++17
 set_target_properties(Core PROPERTIES INTERFACE_COMPILE_FEATURES cxx_std_17)
 
@@ -113,7 +104,7 @@ if(Cabana_ENABLE_HDF5)
   )
 endif()
 
-install(TARGETS Core cabanacore
+install(TARGETS Core
   EXPORT Cabana_Targets
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

core/src/Cabana_Utils.hpp

@@ -37,13 +37,11 @@ deprecated( std::true_type )
     return true;
 }
 
-// Custom warning for switch from Cajita to Grid.
-#ifdef Cabana_DISABLE_CAJITA_DEPRECATION_WARNINGS
-#define CAJITA_DEPRECATED
+// Custom warning.
+#ifdef Cabana_DISABLE_DEPRECATION_WARNINGS
+#define CABANA_DEPRECATED
 #else
-#define CAJITA_DEPRECATED                                                      \
-    [[deprecated( "Cajita is now Cabana::Grid. The Cajita namespace will be "  \
-                  "removed in a future release." )]]
+#define CABANA_DEPRECATED [[deprecated( "Cabana deprecation." )]]
 #endif
 
 //! \endcond

grid/src/CMakeLists.txt

@@ -13,7 +13,6 @@ configure_file(Cabana_Grid_Config.hpp.in Cabana_Grid_Config.hpp)
 
 set(HEADERS_PUBLIC
   Cabana_Grid.hpp
-  Cajita.hpp # FIXME: remove in next release
   Cabana_Grid_Array.hpp
   Cabana_Grid_BovWriter.hpp
   Cabana_Grid_GlobalGrid.hpp
@@ -71,15 +70,6 @@ endif()
 add_library(Grid INTERFACE)
 add_library(Cabana::Grid ALIAS Grid)
 
-### FIXME: remove Cajita in next release.
-add_library(Cajita INTERFACE)
-target_link_libraries(Cajita INTERFACE Grid)
-if(CMAKE_VERSION VERSION_GREATER 3.17)
-  if(NOT Cabana_DISABLE_CAJITA_DEPRECATION_WARNINGS)
-    set_property(TARGET Cajita PROPERTY DEPRECATION "NOTE: Cajita subpackage is now Grid. Link to Cabana::Grid. Cabana::Cajita will be removed in a future release.")
-  endif()
-endif()
-
 set_target_properties(Grid PROPERTIES INTERFACE_COMPILE_FEATURES cxx_std_17)
 
 target_link_libraries(Grid INTERFACE
@@ -106,7 +96,7 @@ target_include_directories(Grid
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
-install(TARGETS Grid Cajita
+install(TARGETS Grid
   EXPORT Cabana_Targets
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

grid/src/Cabana_Grid_Array.hpp

@@ -20,7 +20,6 @@
 #include <Cabana_Grid_LocalGrid.hpp>
 #include <Cabana_Grid_MpiTraits.hpp>
 #include <Cabana_Grid_Types.hpp>
-#include <Cabana_Utils.hpp> // FIXME: remove after next release.
 
 #include <Kokkos_Core.hpp>
 
@@ -1123,112 +1122,4 @@ void norm2( const Array_t& array,
 } // namespace Grid
 } // namespace Cabana
 
-namespace Cajita
-{
-//! \cond Deprecated
-template <class EntityType, class MeshType>
-using ArrayLayout CAJITA_DEPRECATED =
-    Cabana::Grid::ArrayLayout<EntityType, MeshType>;
-
-template <class T>
-using is_array_layout CAJITA_DEPRECATED = Cabana::Grid::is_array_layout<T>;
-
-template <class... Args>
-CAJITA_DEPRECATED auto createArrayLayout( Args&&... args )
-{
-    return Cabana::Grid::createArrayLayout( std::forward<Args>( args )... );
-}
-
-template <class Scalar, class EntityType, class MeshType, class... Params>
-using Array CAJITA_DEPRECATED =
-    Cabana::Grid::Array<Scalar, EntityType, MeshType, Params...>;
-
-template <class T>
-using is_array CAJITA_DEPRECATED = Cabana::Grid::is_array<T>;
-
-template <class Scalar, class... Params, class... Args>
-CAJITA_DEPRECATED auto createArray( Args&&... args )
-{
-    return Cabana::Grid::createArray<Scalar, Params...>(
-        std::forward<Args>( args )... );
-}
-
-template <class... Args>
-CAJITA_DEPRECATED auto createSubarray( Args&&... args )
-{
-    return Cabana::Grid::createSubarray( std::forward<Args>( args )... );
-}
-
-namespace ArrayOp
-{
-template <class... Args>
-CAJITA_DEPRECATED auto clone( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::clone( std::forward<Args>( args )... );
-}
-template <class... Args>
-CAJITA_DEPRECATED auto assign( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::assign( std::forward<Args>( args )... );
-}
-template <class... Args>
-CAJITA_DEPRECATED void scale( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::scale( std::forward<Args>( args )... );
-}
-template <class... Args>
-CAJITA_DEPRECATED void copy( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::copy( std::forward<Args>( args )... );
-}
-template <class... Args>
-CAJITA_DEPRECATED auto cloneCopy( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::cloneCopy( std::forward<Args>( args )... );
-}
-template <class... Args>
-CAJITA_DEPRECATED void update( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::update( std::forward<Args>( args )... );
-}
-
-template <class ViewType, std::size_t NumSpaceDim>
-using DotFunctor CAJITA_DEPRECATED =
-    Cabana::Grid::ArrayOp::DotFunctor<ViewType, NumSpaceDim>;
-template <class... Args>
-CAJITA_DEPRECATED void dot( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::dot( std::forward<Args>( args )... );
-}
-
-template <class ViewType, std::size_t NumSpaceDim>
-using NormInfFunctor CAJITA_DEPRECATED =
-    Cabana::Grid::ArrayOp::NormInfFunctor<ViewType, NumSpaceDim>;
-template <class... Args>
-CAJITA_DEPRECATED void normInf( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::normInf( std::forward<Args>( args )... );
-}
-
-template <class ViewType, std::size_t NumSpaceDim>
-using Norm1Functor CAJITA_DEPRECATED =
-    Cabana::Grid::ArrayOp::Norm1Functor<ViewType, NumSpaceDim>;
-template <class... Args>
-CAJITA_DEPRECATED void norm1( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::norm1( std::forward<Args>( args )... );
-}
-
-template <class ViewType, std::size_t NumSpaceDim>
-using Norm2Functor CAJITA_DEPRECATED =
-    Cabana::Grid::ArrayOp::Norm2Functor<ViewType, NumSpaceDim>;
-template <class... Args>
-CAJITA_DEPRECATED void norm2( Args&&... args )
-{
-    return Cabana::Grid::ArrayOp::norm2( std::forward<Args>( args )... );
-}
-//! \endcond
-} // namespace ArrayOp
-} // namespace Cajita
-
 #endif // end CABANA_GRID_ARRAY_HPP

grid/src/Cabana_Grid_BovWriter.hpp

@@ -21,7 +21,6 @@
 #include <Cabana_Grid_IndexSpace.hpp>
 #include <Cabana_Grid_MpiTraits.hpp>
 #include <Cabana_Grid_Types.hpp>
-#include <Cabana_Utils.hpp> // FIXME: remove after next release.
 
 #include <Kokkos_Core.hpp>
 
@@ -462,43 +461,4 @@ void writeTimeStep( const int time_step_index, const double time,
 } // namespace Grid
 } // namespace Cabana
 
-namespace Cajita
-{
-namespace Experimental
-{
-namespace BovWriter
-{
-//! \cond Deprecated
-template <typename T>
-using BovFormat CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::BovWriter::BovFormat<T>;
-template <typename T>
-using BovCentering CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::BovWriter::BovCentering<T>;
-
-template <class... Args>
-CAJITA_DEPRECATED void createSubarray( Args&&... args )
-{
-    return Cabana::Grid::Experimental::BovWriter::createSubarray(
-        std::forward<Args>( args )... );
-}
-
-template <class... Args>
-CAJITA_DEPRECATED auto reorderView( Args&&... args )
-{
-    return Cabana::Grid::Experimental::BovWriter::reorderView(
-        std::forward<Args>( args )... );
-}
-
-template <class... Args>
-CAJITA_DEPRECATED auto writeTimeStep( Args&&... args )
-{
-    return Cabana::Grid::Experimental::BovWriter::writeTimeStep(
-        std::forward<Args>( args )... );
-}
-//! \endcond
-} // namespace BovWriter
-} // namespace Experimental
-} // namespace Cajita
-
 #endif // end CABANA_GRID_BOVWRITER_HPP

grid/src/Cabana_Grid_FastFourierTransform.hpp

@@ -784,68 +784,4 @@ auto createHeffteFastFourierTransform(
 } // namespace Grid
 } // namespace Cabana
 
-namespace Cajita
-{
-namespace Experimental
-{
-//! \cond Deprecated
-using FFTScaleFull CAJITA_DEPRECATED = Cabana::Grid::Experimental::FFTScaleFull;
-using FFTScaleNone CAJITA_DEPRECATED = Cabana::Grid::Experimental::FFTScaleNone;
-using FFTScaleSymmetric CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::FFTScaleSymmetric;
-using FFTBackendFFTW CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::FFTBackendFFTW;
-using FFTBackendMKL CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::FFTBackendMKL;
-namespace Impl
-{
-using FFTBackendDefault CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::Impl::FFTBackendDefault;
-}
-
-template <class ArrayEntity, class ArrayMesh, class ArrayDevice,
-          class ArrayScalar, class Entity, class Mesh, class Device,
-          class Scalar, typename SFINAE = void>
-using is_matching_array CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::is_matching_array<
-        ArrayEntity, ArrayMesh, ArrayDevice, ArrayScalar, Entity, Mesh, Device,
-        Scalar, SFINAE>;
-
-template <class EntityType, class MeshType, class Scalar, class DeviceType,
-          class Derived>
-using FastFourierTransform CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::FastFourierTransform<
-        EntityType, MeshType, Scalar, DeviceType, Derived>;
-
-using FastFourierTransformParams CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::FastFourierTransformParams;
-
-template <class EntityType, class MeshType, class Scalar, class DeviceType,
-          class Derived>
-using FastFourierTransform CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::FastFourierTransform<
-        EntityType, MeshType, Scalar, DeviceType, Derived>;
-
-template <class EntityType, class MeshType, class Scalar, class MemorySpace,
-          class ExecSpace, class BackendType>
-using HeffteFastFourierTransform CAJITA_DEPRECATED =
-    Cabana::Grid::Experimental::HeffteFastFourierTransform<
-        EntityType, MeshType, Scalar, MemorySpace, ExecSpace, BackendType>;
-
-template <class Scalar, class MemorySpace, class BackendType, class... Args>
-CAJITA_DEPRECATED auto createHeffteFastFourierTransform( Args&&... args )
-{
-    return Cabana::Grid::Experimental::createHeffteFastFourierTransform<
-        Scalar, MemorySpace, BackendType>( std::forward<Args>( args )... );
-}
-template <class Scalar, class MemorySpace, class... Args>
-CAJITA_DEPRECATED auto createHeffteFastFourierTransform( Args&&... args )
-{
-    return Cabana::Grid::Experimental::createHeffteFastFourierTransform<
-        Scalar, MemorySpace>( std::forward<Args>( args )... );
-}
-//! \endcond
-} // namespace Experimental
-} // namespace Cajita
-
 #endif // end CABANA_GRID_FASTFOURIERTRANSFORM_HPP

grid/src/Cabana_Grid_GlobalGrid.hpp

@@ -19,7 +19,6 @@
 #include <Cabana_Grid_GlobalMesh.hpp>
 #include <Cabana_Grid_Partitioner.hpp>
 #include <Cabana_Grid_Types.hpp>
-#include <Cabana_Utils.hpp> // FIXME: remove after next release.
 
 #include <array>
 #include <memory>
@@ -237,20 +236,6 @@ std::shared_ptr<GlobalGrid<SparseMesh<Scalar, NumSpaceDim>>> createGlobalGrid(
 } // namespace Grid
 } // namespace Cabana
 
-namespace Cajita
-{
-//! \cond Deprecated
-template <class MeshType>
-using GlobalGrid CAJITA_DEPRECATED = Cabana::Grid::GlobalGrid<MeshType>;
-
-template <class... Args>
-CAJITA_DEPRECATED auto createGlobalGrid( Args&&... args )
-{
-    return Cabana::Grid::createGlobalGrid( std::forward<Args>( args )... );
-}
-//! \endcond
-} // namespace Cajita
-
 //---------------------------------------------------------------------------//
 // Template implementation
 //---------------------------------------------------------------------------//