Removal of features

CMakeLists.txt

@@ -113,17 +113,6 @@ ecbuild_add_option( FEATURE RADOS
                     DESCRIPTION "Ceph/Rados storage support"
                     REQUIRED_PACKAGES Rados )
 
-### Armadillo
-
-ecbuild_add_option( FEATURE ARMADILLO
-                    CONDITION HAVE_EXPERIMENTAL
-                    DESCRIPTION "Armadillo linear algebra library"
-                    REQUIRED_PACKAGES Armadillo )
-
-set_package_properties( Armadillo PROPERTIES
-                        DESCRIPTION "C++ linear algebra"
-                      )
-
 ### MKL
 
 ecbuild_add_option( FEATURE MKL
@@ -263,13 +252,6 @@ if(HAVE_CURL)
   ecbuild_info("Curl version ${CURL_VERSION_STRING} -- libs [${CURL_LIBRARIES}] incs [${CURL_INCLUDE_DIRS}]")
 endif()
 
-#### Jemalloc
-
-ecbuild_add_option( FEATURE JEMALLOC
-                    DEFAULT OFF
-                    DESCRIPTION "Link against jemalloc memory allocator"
-                    REQUIRED_PACKAGES Jemalloc )
-
 #### CUDA
 
 ecbuild_add_option( FEATURE CUDA
@@ -284,29 +266,6 @@ ecbuild_add_option( FEATURE HIP
                     DESCRIPTION "HIP GPU linear algebra operations"
                     REQUIRED_PACKAGES hip hipsparse )
 
-### ViennaCL
-
-ecbuild_add_option( FEATURE VIENNACL
-                    CONDITION HAVE_EXPERIMENTAL
-                    DESCRIPTION "ViennaCL OpenCL linear algebra operations"
-                    REQUIRED_PACKAGES ViennaCL )
-
-set_package_properties( ViennaCL PROPERTIES
-                        DESCRIPTION "linear algebra library for computations on many-core architectures"
-                        TYPE RECOMMENDED
-                        PURPOSE "Dense and sparse matrix operations on OpenCL devices" )
-
-### LibRsync
-
-ecbuild_add_option( FEATURE RSYNC
-                    DEFAULT OFF
-                    DESCRIPTION "librsync implementation of the rsync algorithm"
-                    REQUIRED_PACKAGES LibRsync )
-if( HAVE_RSYNC )
-  set( LIBRSYNC_LIBRARIES rsync )
-endif()
-
-
 ### Performance tests
 
 ecbuild_add_option( FEATURE EXTRA_TESTS

README.md

@@ -39,7 +39,7 @@ It features facilities to easily handle, in a cross-platform way:
 * asynchronous processing
 * exception handling and stack dumping
 * MPI object-oriented wrapper
-* linear algebra abstraction with multiple backends (BLAS, MKL, Armadillo, Eigen3)
+* linear algebra abstraction with multiple backends (BLAS, MKL, Eigen3)
 * advanced container classes
 * space partition trees
 * file-mapped arrays

cmake/FindLZ4.cmake

@@ -15,7 +15,7 @@
 #
 # The following paths will be searched with priority if set in CMake or env
 #
-#  LZ4_PATH          - prefix path of the Armadillo installation
+#  LZ4_PATH          - prefix path of the LZ4 installation
 #  LZ4_ROOT              - Set this variable to the root installation
 
 # Search with priority for LZ4_PATH if given as CMake or env var

cmake/FindRADOS.cmake

@@ -9,14 +9,14 @@
 # - Try to find Rados
 # Once done this will define
 #
-#  RADOS_FOUND         - system has Armadillo
-#  RADOS_INCLUDE_DIRS  - the Armadillo include directory
-#  RADOS_LIBRARIES     - the Armadillo library
+#  RADOS_FOUND         - system has Rados
+#  RADOS_INCLUDE_DIRS  - the Rados include directory
+#  RADOS_LIBRARIES     - the Rados library
 #  RADOS_VERSION - This is set to $major.$minor.$patch (eg. 0.9.8)
 #
 # The following paths will be searched with priority if set in CMake or env
 #
-#  RADOS_PATH          - prefix path of the Armadillo installation
+#  RADOS_PATH          - prefix path of the Rados installation
 #  RADOS_ROOT              - Set this variable to the root installation
 
 # Search with priority for RADOS_PATH if given as CMake or env var

cmake/FindSnappy.cmake

@@ -15,7 +15,7 @@
 #
 # The following paths will be searched with priority if set in CMake or env
 #
-#  SNAPPY_PATH          - prefix path of the Armadillo installation
+#  SNAPPY_PATH          - prefix path of the Snappy installation
 #  SNAPPY_ROOT              - Set this variable to the root installation
 
 # Search with priority for SNAPPY_PATH if given as CMake or env var

src/eckit/CMakeLists.txt

@@ -740,13 +740,6 @@ if(eckit_HAVE_SSL)
     )
 endif()
 
-if(eckit_HAVE_RSYNC)
-    list( APPEND eckit_utils_srcs
-        utils/Rsync.cc
-        utils/Rsync.h
-    )
-endif()
-
 if(eckit_HAVE_XXHASH)
     list( APPEND eckit_utils_srcs
         utils/xxHashing.cc
@@ -822,10 +815,6 @@ else()
     ecbuild_warn("eckit does not support SystemInfo for OS '${EC_OS_NAME}'")
 endif()
 
-if(HAVE_JEMALLOC)
-    list(APPEND ECKIT_SYSTEM_EXTRA_LIBS ${JEMALLOC_LIBRARIES})
-endif()
-
 list( APPEND eckit_bases_srcs
     bases/Loader.cc
     bases/Loader.h
@@ -942,7 +931,6 @@ ecbuild_add_library(
 
           PRIVATE_LIBS
               "${SNAPPY_LIBRARIES}"
-              "${LIBRSYNC_LIBRARIES}"
               "${LZ4_LIBRARIES}"
               "${BZIP2_LIBRARIES}"
               "${OPENSSL_LIBRARIES}"

src/eckit/eckit_config.h.in

@@ -48,17 +48,14 @@
 
 // external packages
 
-#cmakedefine01 eckit_HAVE_ARMADILLO
 #cmakedefine01 eckit_HAVE_CUDA
 #cmakedefine01 eckit_HAVE_CURL
 #cmakedefine01 eckit_HAVE_EIGEN
-#cmakedefine01 eckit_HAVE_JEMALLOC
 #cmakedefine01 eckit_HAVE_LAPACK
 #cmakedefine01 eckit_HAVE_MKL
 #cmakedefine01 eckit_HAVE_MPI
 #cmakedefine01 eckit_HAVE_OMP
 #cmakedefine01 eckit_HAVE_SSL
-#cmakedefine01 eckit_HAVE_VIENNACL
 #cmakedefine01 eckit_HAVE_ZIP
 
 // Have we built certain libraries

src/eckit/linalg/CMakeLists.txt

@@ -32,14 +32,6 @@ list( APPEND eckit_la_srcs
       sparse/LinearAlgebraGeneric.h
       types.h )
 
-if( eckit_HAVE_ARMADILLO )
-    list( APPEND eckit_la_srcs
-          dense/LinearAlgebraArmadillo.cc
-          dense/LinearAlgebraArmadillo.h )
-    list( APPEND eckit_la_pincludes "${ARMADILLO_INCLUDE_DIRS}" )
-    list( APPEND eckit_la_plibs "${ARMADILLO_LIBRARIES}" )
-endif()
-
 if( eckit_HAVE_CUDA )
     list( APPEND eckit_la_srcs
           dense/LinearAlgebraCUDA.cc
@@ -83,15 +75,6 @@ if( eckit_HAVE_MKL )
     list( APPEND eckit_la_plibs "${MKL_LIBRARIES}" )
 endif()
 
-if( eckit_HAVE_VIENNACL )
-    list( APPEND eckit_la_srcs
-          dense/LinearAlgebraViennaCL.cc
-          dense/LinearAlgebraViennaCL.h
-          sparse/LinearAlgebraViennaCL.cc
-          sparse/LinearAlgebraViennaCL.h )
-    list( APPEND eckit_la_pincludes "${VIENNACL_INCLUDE_DIRS}" )
-endif()
-
 if( eckit_HAVE_OMP )
     list( APPEND eckit_la_plibs OpenMP::OpenMP_CXX )
 endif()