#33: remove epetra from pressio-ops

Pressio · Dec 13, 2024 · a4f285e · a4f285e
1 parent b191a39
commit a4f285e
Show file tree

Hide file tree

Showing 52 changed files with 1 addition and 3,380 deletions.
diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml
@@ -27,9 +27,6 @@ jobs:
         build_type:
           - Release
           - Debug
-        epetra_toggle:
-          - ON
-          - OFF
 
     runs-on: ubuntu-latest
     container: ghcr.io/pressio/${{ matrix.image }}:${{ matrix.tag }}
@@ -61,7 +58,6 @@ jobs:
           -D PRESSIO_ENABLE_TPL_EIGEN:BOOL=ON \
           -D PRESSIO_ENABLE_TPL_MPI:BOOL=ON \
           -D PRESSIO_ENABLE_TPL_TRILINOS:BOOL=ON \
-          -D PRESSIO_ENABLE_EPETRA:BOOL=${{ matrix.epetra_toggle }} \
           -D PRESSIO_ENABLE_TPL_KOKKOS:BOOL=ON \
           -D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
           -D Trilinos_DIR=${{ env.trilinos_dir }}/lib/cmake/Trilinos \

diff --git a/docs/source/components/ops.rst b/docs/source/components/ops.rst
@@ -35,10 +35,6 @@ All expressions are within the ``pressio`` namespace.
      - ``is_vector_kokkos<T>::value``
      - ``is_dense_matrix_kokkos<T>::value``,   ``is_sparse_matrix_kokkos<T>::value``
 
-   * - Epetra
-     - ``is_vector_epetra<T>::value``
-     - ``is_multi_vector_epetra<T>::value``
-
    * - Tpetra
      - ``is_vector_tpetra<T>::value``
      - ``is_multi_vector_tpetra<T>::value``

diff --git a/docs/source/components/ops/abs.rst b/docs/source/components/ops/abs.rst
@@ -33,8 +33,6 @@ Description
 
   * a Tpetra block vector
 
-  * a Epetra vector
-
   * a Pressio expression, i.e. ``pressio::diag``, ``pressio::span``, ``pressio::subspan``, based on Eigen or Kokkos container
 
 Notes

diff --git a/docs/source/components/ops/clone.rst b/docs/source/components/ops/clone.rst
@@ -36,8 +36,6 @@ Description
 
   * a Teuchos vector
 
-  * or an Epetra vector or multi-vector
-
   * or a Tpetra vector or multi-vector
 
   * or a Tpetra block vector or multi-vector
@@ -56,7 +54,7 @@ Notes
   And any operation applied to ``result`` will not have any impact on ``operand``.
 
 * For types that have value semantics, for example ``Eigen::Matrix<...>``,
-  Epetra vector or MV, this kernel can be implemented by calling the copy constructor
+  this kernel can be implemented by calling the copy constructor
   and returning the copy
 
 * For Kokkos, Tpetra, or TpetraBlock data types, which by default have view semantics

diff --git a/docs/source/components/ops/deep_copy.rst b/docs/source/components/ops/deep_copy.rst
@@ -37,8 +37,6 @@ Description
 
   * a Tpetra block vector or multi-vector
 
-  * a Epetra vector or multi-vector
-
 Notes
 -----
 

diff --git a/docs/source/components/ops/dot.rst b/docs/source/components/ops/dot.rst
@@ -37,8 +37,6 @@ Description
 
   * a Tpetra block vector
 
-  * a Epetra vector
-
   * a pressio expression, i.e. ``pressio::diag``, ``pressio::span``, ``pressio::subspan``, based on Eigen or Kokkos container
 
 Notes

diff --git a/docs/source/components/ops/elementwise_multiply.rst b/docs/source/components/ops/elementwise_multiply.rst
@@ -38,8 +38,6 @@ Description
 
   * a Tpetra block vector
 
-  * a Epetra vector
-
   * a pressio expression, i.e. ``pressio::diag``, ``pressio::span``, ``pressio::subspan``, based on Eigen or Kokkos container
 
 Notes

diff --git a/docs/source/components/ops/extent.rst b/docs/source/components/ops/extent.rst
@@ -34,8 +34,6 @@ Description
 
   * a Tpetra block vector or multi-vector
 
-  * a Epetra vector or multi-vector
-
   * a pressio expression, i.e. ``pressio::diag``, ``pressio::span``, ``pressio::subspan``, based on an Eigen, Tpetra Block, or Kokkos container
 
 Notes

diff --git a/docs/source/components/ops/fill.rst b/docs/source/components/ops/fill.rst
@@ -34,8 +34,6 @@ Description
 
   * a Tpetra block vector or multi-vector
 
-  * a Epetra vector or multi-vector
-
   * a pressio expression, i.e. ``pressio::diag``, ``pressio::span``, ``pressio::subspan``, based on an Eigen or Kokkos container
 
 * ``ScalarType`` must be convertible to ``pressio::Traits<T>::scalar_type``

diff --git a/docs/source/components/ops/matrix_matrix_product.rst b/docs/source/components/ops/matrix_matrix_product.rst
@@ -74,8 +74,6 @@ The matrix-matrix product works for the following matrix types:
 
 * Eigen (all containers are rank-2 Eigen matrices)
 
-* Epetra (``A`` and ``B`` are Epetra multi-vectors; ``C`` is a rank-2 Eigen matrix)
-
 * Kokkos (all containers are rank-2 Kokkos views)
 
 * Tpetra (``A`` and ``B`` are Tpetra multi-vectors; ``C`` is either a rank-2 Eigen matrix or a rank-2 Kokkos view)

diff --git a/docs/source/components/ops/matrix_vector_product.rst b/docs/source/components/ops/matrix_vector_product.rst
@@ -71,11 +71,6 @@ Description
 
     * All container types are either Eigen containers or Pressio expressions of Eigen containers,
 
-  * Epetra
-
-    * ``A_type`` is an Epetra rank-2 container
-    * Either ``x_type`` or ``y_type`` is a rank-1 Epetra container
-    * The other non-Epetra container is a rank-1 Teuchos or Eigen container
 
   * Kokkos
 

diff --git a/docs/source/components/ops/scale.rst b/docs/source/components/ops/scale.rst
@@ -26,8 +26,6 @@ Description
 
   * Eigen (or a Pressio expression acting on an Eigen container)
 
-  * Epetra
-
   * Kokkos (or a Pressio expression acting on a Kokkos container)
 
   * Teuchos

diff --git a/docs/source/components/ops/set_zero.rst b/docs/source/components/ops/set_zero.rst
@@ -26,8 +26,6 @@ Description
 
   * Eigen (or a Pressio expression acting on an Eigen container)
 
-  * Epetra (rank-1 only)
-
   * Kokkos (or a Pressio expression acting on a Kokkos container)
 
   * Teuchos (rank-1 only)

diff --git a/docs/source/components/ops/update.rst b/docs/source/components/ops/update.rst
@@ -67,8 +67,6 @@ Description
 
   * Rank-1 or Rank-2 (see specific overload) Eigen containers or Pressio expressions of Eigen containers
 
-  * Rank-1 Epetra containers
-
   * Rank-1 or Rank-2 (see specific overload) Kokkos containers or Pressio expressions of Kokkos containers
 
   * Rank-1 Tpetra containers or Pressio column expressions acting on Tpetra

diff --git a/docs/source/components/type_traits.rst b/docs/source/components/type_traits.rst
@@ -104,10 +104,6 @@ The following list is partial, and more will be added as we continue the develop
      - Provides static member constant ``value`` equal to ``true`` if ``T`` is a dense Teuchos vector. :raw-html-m2r:`<br/>` Requires: ``PRESSIO_ENABLE_TPL_TRILINOS==On``
    * - ``template<class T>`` :raw-html-m2r:`<br/>` ``struct is_dense_matrix_teuchos;``
      - Provides static member constant ``value`` equal to ``true`` if ``T`` is a dense Teuchos matrix. :raw-html-m2r:`<br/>` Requires: ``PRESSIO_ENABLE_TPL_TRILINOS==On``
-   * - ``template<class T>`` :raw-html-m2r:`<br/>` ``struct is_vector_epetra;``
-     - Provides static member constant ``value`` equal to ``true`` if ``T`` is Epetra vector. :raw-html-m2r:`<br/>` Requires: ``PRESSIO_ENABLE_TPL_TRILINOS==On``
-   * - ``template<class T>`` :raw-html-m2r:`<br/>` ``struct is_multi_vector_epetra;``
-     - Provides static member constant ``value`` equal to ``true`` if ``T`` is an Epetra multi vector. :raw-html-m2r:`<br/>` Requires: ``PRESSIO_ENABLE_TPL_TRILINOS==On``
    * - ``template<class T>`` :raw-html-m2r:`<br/>` ``struct is_vector_tpetra;``
      - Provides static member constant ``value`` equal to ``true`` if ``T`` is a Tpetra vector. :raw-html-m2r:`<br/>` Requires: ``PRESSIO_ENABLE_TPL_TRILINOS==On``
    * - ``template<class T>`` :raw-html-m2r:`<br/>` ``struct is_multi_vector_tpetra;``

diff --git a/include/pressio/ops.hpp b/include/pressio/ops.hpp
@@ -163,27 +163,6 @@ template<class ...> struct matching_extents;
 #include "ops/tpetra_block/ops_multi_vector_update.hpp"
 #include "ops/tpetra_block/ops_level2.hpp"
 #include "ops/tpetra_block/ops_level3.hpp"
-
-#ifdef PRESSIO_ENABLE_EPETRA
-// Epetra
-#include "ops/epetra/ops_clone.hpp"
-#include "ops/epetra/ops_extent.hpp"
-#include "ops/epetra/ops_deep_copy.hpp"
-#include "ops/epetra/ops_set_zero.hpp"
-#include "ops/epetra/ops_scale.hpp"
-#include "ops/epetra/ops_fill.hpp"
-#include "ops/epetra/ops_abs.hpp"
-#include "ops/epetra/ops_dot.hpp"
-#include "ops/epetra/ops_min_max.hpp"
-#include "ops/epetra/ops_norms.hpp"
-#include "ops/epetra/ops_pow.hpp"
-#include "ops/epetra/ops_rank1_update.hpp"
-#include "ops/epetra/ops_elementwise_multiply.hpp"
-#include "ops/epetra/ops_multi_vector_update.hpp"
-#include "ops/epetra/ops_level2.hpp"
-#include "ops/epetra/ops_level3.hpp"
-#endif // PRESSIO_ENABLE_EPETRA
-
 #endif //PRESSIO_ENABLE_TPL_TRILINOS
 
 // keep this last

diff --git a/include/pressio/ops/epetra/ops_abs.hpp b/include/pressio/ops/epetra/ops_abs.hpp
diff --git a/include/pressio/ops/epetra/ops_clone.hpp b/include/pressio/ops/epetra/ops_clone.hpp
diff --git a/include/pressio/ops/epetra/ops_deep_copy.hpp b/include/pressio/ops/epetra/ops_deep_copy.hpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,8 +33,6 @@ Description @@
       * a Tpetra block vector
-      * a Epetra vector
       * a Pressio expression, i.e. ``pressio::diag``, ``pressio::span``, ``pressio::subspan``, based on Eigen or Kokkos container
     Notes
@@ Expand Down @@