Merge branch 'hotfix/1.28.1'

ecmwf · Oct 18, 2024 · c4a2cc5 · c4a2cc5
2 parents f118ce4 + 22f23d1
commit c4a2cc5
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -276,9 +276,6 @@ if( HAVE_RSYNC )
   set( LIBRSYNC_LIBRARIES rsync )
 endif()
 
-ecbuild_add_option( FEATURE SANDBOX
-                    DEFAULT OFF
-                    DESCRIPTION "Sandbox playground for prototyping code that may never see the light of day" )
 
 ### Performance tests
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.28.0
+1.28.1
diff --git a/src/eckit/codec/Stream.cc b/src/eckit/codec/Stream.cc
@@ -25,8 +25,6 @@ Stream::Stream(DataHandle* datahandle) : shared_(datahandle), ptr_(shared_.get()
 
 Stream::Stream(std::shared_ptr<DataHandle> datahandle) : shared_(datahandle), ptr_(shared_.get()) {}
 
-Stream::Stream(const Stream& other) = default;
-
 DataHandle& Stream::datahandle() {
     ASSERT(ptr_ != nullptr);
     return *ptr_;

diff --git a/src/eckit/codec/Stream.h b/src/eckit/codec/Stream.h
@@ -46,8 +46,11 @@ class Stream {
     ///       the referenced datahandle
     Stream(DataHandle&);
 
-    /// Assignment constructor sharing datahandle with other Stream
-    Stream(const Stream&);
+    /// Assignment/Copy constructor sharing datahandle with other Stream
+    Stream(const Stream&) = default;
+    Stream(Stream&&) = default;
+    Stream& operator=(const Stream&) = default;
+    Stream& operator=(Stream&&) = default;
 
     /// Access internal DataHandle
     DataHandle& datahandle();

diff --git a/src/eckit/linalg/CMakeLists.txt b/src/eckit/linalg/CMakeLists.txt
@@ -90,6 +90,10 @@ ecbuild_add_library( TARGET             eckit_linalg TYPE SHARED
                      PRIVATE_LIBS       ${eckit_la_plibs} )
 
 if( eckit_HAVE_EIGEN )
+    if(NOT EIGEN3_INCLUDE_DIRS AND TARGET Eigen3::Eigen)
+        get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
+    endif()
+
     # Add include directories with "SYSTEM" to avoid warnings from within Eigen headers
     target_include_directories( eckit_linalg SYSTEM PRIVATE ${EIGEN3_INCLUDE_DIRS} )
 endif()

diff --git a/src/eckit/linalg/sparse/LinearAlgebraEigen.cc b/src/eckit/linalg/sparse/LinearAlgebraEigen.cc
@@ -26,7 +26,7 @@ static const LinearAlgebraEigen __la("eigen");
 
 using vec_t = Eigen::VectorXd::MapType;
 using mat_t = Eigen::MatrixXd::MapType;
-using spm_t = Eigen::MappedSparseMatrix<Scalar, Eigen::RowMajor, Index>;
+using spm_t = Eigen::Map<Eigen::SparseMatrix<Scalar, Eigen::RowMajor, Index>>;
 
 
 void LinearAlgebraEigen::print(std::ostream& out) const {

diff --git a/src/eckit/maths/CMakeLists.txt b/src/eckit/maths/CMakeLists.txt
@@ -24,7 +24,11 @@ ecbuild_add_library(
     PUBLIC_LIBS        eckit
 )
 
-if(HAVE_EIGEN)
+if(eckit_HAVE_EIGEN)
+    if(NOT EIGEN3_INCLUDE_DIRS AND TARGET Eigen3::Eigen)
+        get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
+    endif()
+
     # Add include directories with "SYSTEM" to avoid warnings from within Eigen headers
     target_include_directories(eckit_maths SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIRS})
 endif()

diff --git a/tests/value/CMakeLists.txt b/tests/value/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach( valueType nil boolean integer double string valuemap valuelist date ord
                      LIBS     eckit )
 endforeach()
 
-if( CMAKE_CXX_COMPILER_ID MATCHES "Cray" )
+if( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
    # Disable warnings for test_value_integer due to following:
    #    "Integer conversion resulted in a change of sign."
    set_source_files_properties(test_value_integer.cc PROPERTIES COMPILE_FLAGS "-hmsglevel_4" )