Simplify dependency structure

.github/workflows/builds.yml

@@ -76,18 +76,10 @@ jobs:
             CONTAINER: "ghcr.io/acts-project/ubuntu2404:67"
             OPTIONS: --preset eigen
             RUN_TESTS: true
-          - NAME: "HOST"
-            CONTAINER: "ghcr.io/acts-project/ubuntu2404:56"
-            OPTIONS: -DALGEBRA_PLUGINS_INCLUDE_SMATRIX=TRUE
-            RUN_TESTS: true
           - NAME: "HOST"
             CONTAINER: "ghcr.io/acts-project/ubuntu2404:67"
             OPTIONS: --preset vc
             RUN_TESTS: true
-          - NAME: "HOST"
-            CONTAINER: "ghcr.io/acts-project/ubuntu2404:67"
-            OPTIONS: --preset vecmem
-            RUN_TESTS: true
           - NAME: "HOST"
             CONTAINER: "ghcr.io/acts-project/ubuntu2404:67"
             OPTIONS: --preset fastor

CMakeLists.txt

@@ -42,14 +42,10 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY
 # Flags controlling how the Algebra Plugins code should behave.
 option( ALGEBRA_PLUGINS_INCLUDE_EIGEN
    "Include Eigen types in Algebra Plugins" FALSE )
-option( ALGEBRA_PLUGINS_INCLUDE_SMATRIX
-   "Include Smatrix types in Algebra Plugins" FALSE )
 option( ALGEBRA_PLUGINS_INCLUDE_VC
    "Include Vc types in Algebra Plugins" FALSE )
 option( ALGEBRA_PLUGINS_INCLUDE_FASTOR
    "Include Fastor types in Algebra Plugins" FALSE )
-option( ALGEBRA_PLUGINS_INCLUDE_VECMEM
-   "Include VecMem types in Algebra Plugins" FALSE )
 option( ALGEBRA_PLUGINS_BUILD_TESTING "Build the unit tests of Algebra Plugins"
    TRUE )
 option( ALGEBRA_PLUGINS_BUILD_BENCHMARKS "Build the benchmark suite of Algebra Plugins"
@@ -68,22 +64,6 @@ if( NOT DEFINED CMAKE_SUPPRESS_DEVELOPER_WARNINGS )
    set( _unsetDevWarningFlag TRUE )
 endif()
 
-# Set up VecMem.
-option( ALGEBRA_PLUGINS_SETUP_VECMEM
-   "Set up the VecMem target(s) explicitly" TRUE )
-option( ALGEBRA_PLUGINS_USE_SYSTEM_VECMEM
-   "Pick up an existing installation of VecMem from the build environment"
-   ${ALGEBRA_PLUGINS_USE_SYSTEM_LIBS} )
-if( ALGEBRA_PLUGINS_SETUP_VECMEM )
-   if( ALGEBRA_PLUGINS_USE_SYSTEM_VECMEM )
-      find_package( vecmem 0.7.0 REQUIRED COMPONENTS LANGUAGE )
-   else()
-      add_subdirectory( extern/vecmem )
-      # Make the "VecMem language code" available for the whole project.
-      include( "${VECMEM_LANGUAGE_DIR}/vecmem-check-language.cmake" )
-   endif()
-endif()
-
 # Set up GoogleTest.
 option( ALGEBRA_PLUGINS_SETUP_GOOGLETEST
    "Set up the GoogleTest target(s) explicitly" TRUE )

CMakePresets.json

@@ -15,15 +15,6 @@
             "ALGEBRA_PLUGINS_USE_SYSTEM_LIBS"  : "FALSE"
          }
       },
-      {
-         "name" : "vecmem",
-         "displayName" : "VecMem Enabled Configuration",
-         "inherits" : [ "base" ],
-         "cacheVariables": {
-            "ALGEBRA_PLUGINS_SETUP_VECMEM"   : "TRUE",
-            "ALGEBRA_PLUGINS_INCLUDE_VECMEM" : "TRUE"
-         }
-      },
       {
          "name" : "eigen",
          "displayName" : "Eigen Enabled Configuration",
@@ -54,28 +45,27 @@
       {
          "name" : "default-x86-64",
          "displayName" : "Default Developer Configuration for x86_64",
-         "inherits" : [ "vecmem", "eigen", "vc", "fastor" ]
+         "inherits" : [ "eigen", "vc", "fastor" ]
       },
       {
          "name" : "default-aarch64",
          "displayName" : "Default Developer Configuration for ARM64",
-         "inherits" : [ "vecmem", "eigen", "vc" ]
+         "inherits" : [ "eigen", "vc" ]
       },
       {
          "name" : "cuda",
          "displayName" : "CUDA Developer Configuration",
-         "inherits" : [ "vecmem", "eigen" ],
+         "inherits" : [ "eigen" ],
          "cacheVariables" : {
             "ALGEBRA_PLUGINS_TEST_CUDA" : "TRUE"
          }
       },
       {
          "name" : "sycl",
          "displayName" : "SYCL Developer Configuration",
-         "inherits" : [ "vecmem", "eigen" ],
+         "inherits" : [ "eigen" ],
          "cacheVariables" : {
-            "ALGEBRA_PLUGINS_TEST_SYCL" : "TRUE",
-            "VECMEM_BUILD_SYCL_LIBRARY" : "TRUE"
+            "ALGEBRA_PLUGINS_TEST_SYCL" : "TRUE"
          }
       }
    ]

README.md

@@ -8,7 +8,6 @@ for the R&D projects [detray](https://github.com/acts-project/detray) and
 | ------------------------------------------------------------------------- | --- | ---- | ---- |
 | generic                                                                     | ✅  | ✅  | ✅   |
 | [Eigen](https://eigen.tuxfamily.org)                                      | ✅  | ✅  | ✅   |
-| [SMatrix](https://root.cern.ch/doc/master/group__SMatrixGroup.html)       | ✅  | ⚪  | ⚪   |
 | [VC](https://github.com/VcDevel/Vc)                                       | ✅  | ⚪  | ⚪   |
 | [Fastor](https://github.com/romeric/Fastor)                               | ✅  | ⚪  | ⚪   |
 
@@ -28,18 +27,13 @@ Available options:
   the following plugins:
   * `EIGEN`: Plugin using [Eigen](https://eigen.tuxfamily.org)
     (`OFF` by default)
-  * `SMATRIX`: Plugin using
-    [SMatrix](https://root.cern/doc/master/group__SMatrixGroup.html)
-    (`OFF` by default)
   * `VC`: Plugin using [Vc](https://github.com/VcDevel/Vc)
     (`OFF` by default)
   * `FASTOR`: Plugin using [Fastor](https://github.com/romeric/Fastor)
     (`OFF` by default)
-  * `VECMEM`: Plugin using [VecMem](https://github.com/acts-project/vecmem)
-    (`OFF` by default)
 - `ALGEBRA_PLUGINS_USE_SYSTEM_LIBS`: Boolean configuring whether to search for all external libraries "on the system" or not
 - `ALGEBRA_PLUGINS_SETUP_<XXX>`: Boolean to turn on/off the explicit "setup" of
-  the external libraries (`GOOGLETEST`, [`BENCHMARK`](https://github.com/google/benchmark), `EIGEN3`, `VC`, `FASTOR`, and `VECMEM`)
+  the external libraries (`GOOGLETEST`, [`BENCHMARK`](https://github.com/google/benchmark), `EIGEN3`, `VC`, `FASTOR`)
 - `ALGEBRA_PLUGINS_USE_SYSTEM_<XXX>`: Boolean configuring how to set up a given
   external library
   * `ON`: The external library is searched for "on the system" using

cmake/algebra-plugins-config.cmake.in

@@ -10,9 +10,7 @@
 # Set up variables describing which plugins were enabled during the Algebra
 # Plugins build.
 set( ALGEBRA_PLUGINS_INCLUDE_EIGEN @ALGEBRA_PLUGINS_INCLUDE_EIGEN@ )
-set( ALGEBRA_PLUGINS_INCLUDE_SMATRIX @ALGEBRA_PLUGINS_INCLUDE_SMATRIX@ )
 set( ALGEBRA_PLUGINS_INCLUDE_VC @ALGEBRA_PLUGINS_INCLUDE_VC@ )
-set( ALGEBRA_PLUGINS_INCLUDE_VECMEM @ALGEBRA_PLUGINS_INCLUDE_VECMEM@ )
 
 # Set up some simple variables for using the package.
 set( algebra_plugins_VERSION "@PROJECT_VERSION@" )
@@ -25,15 +23,9 @@ include( CMakeFindDependencyMacro )
 if( ALGEBRA_PLUGINS_INCLUDE_EIGEN )
    find_dependency( Eigen3 )
 endif()
-if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
-   find_dependency( ROOT COMPONENTS Smatrix )
-endif()
 if( ALGEBRA_PLUGINS_INCLUDE_VC )
    find_dependency( Vc 1.4.2 )
 endif()
-if( ALGEBRA_PLUGINS_INCLUDE_VECMEM )
-   find_dependency( vecmem )
-endif()
 
 # Print a standard information message about the package being found.
 include( FindPackageHandleStandardArgs )

frontend/CMakeLists.txt

@@ -8,18 +8,11 @@
 add_subdirectory( array_cmath )
 
 if( ALGEBRA_PLUGINS_INCLUDE_EIGEN )
-   add_subdirectory( eigen_generic )
    add_subdirectory( eigen_eigen )
 endif()
 
-if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
-   add_subdirectory( smatrix_generic )
-   add_subdirectory( smatrix_smatrix )
-endif()
-
 if( ALGEBRA_PLUGINS_INCLUDE_VC )
    add_subdirectory( vc_aos )
-   add_subdirectory( vc_aos_generic )
    if( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" )
       add_subdirectory( vc_soa )
    endif()
@@ -28,7 +21,3 @@ endif()
 if( ALGEBRA_PLUGINS_INCLUDE_FASTOR )
    add_subdirectory( fastor_fastor )
 endif()
-
-if( ALGEBRA_PLUGINS_INCLUDE_VECMEM )
-   add_subdirectory( vecmem_cmath )
-endif()