mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-10-12 08:01:29 +08:00
Fix c++03 build and tests
This commit is contained in:
parent
13507d1efd
commit
0e607fd350
@ -160,7 +160,7 @@ struct eigen_packet_wrapper
|
|||||||
{
|
{
|
||||||
EIGEN_ALWAYS_INLINE operator T&() { return m_val; }
|
EIGEN_ALWAYS_INLINE operator T&() { return m_val; }
|
||||||
EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; }
|
EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; }
|
||||||
EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default;
|
EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {};
|
||||||
EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {}
|
EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {}
|
||||||
EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) {
|
EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) {
|
||||||
m_val = v;
|
m_val = v;
|
||||||
|
@ -132,7 +132,7 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(SPQR)
|
find_package(SPQR)
|
||||||
if(SPQR_FOUND AND CHOLMOD_FOUND AND EIGEN_BUILD_BLAS AND EIGEN_BUILD_LAPACK AND (EIGEN_Fortran_COMPILER_WORKS OR LAPACK_FOUND) )
|
if(SPQR_FOUND AND EIGEN_TEST_CXX11 AND CHOLMOD_FOUND AND EIGEN_BUILD_BLAS AND EIGEN_BUILD_LAPACK AND (EIGEN_Fortran_COMPILER_WORKS OR LAPACK_FOUND) )
|
||||||
add_definitions("-DEIGEN_SPQR_SUPPORT")
|
add_definitions("-DEIGEN_SPQR_SUPPORT")
|
||||||
include_directories(${SPQR_INCLUDES})
|
include_directories(${SPQR_INCLUDES})
|
||||||
set(SPQR_ALL_LIBS ${SPQR_LIBRARIES} ${CHOLMOD_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
|
set(SPQR_ALL_LIBS ${SPQR_LIBRARIES} ${CHOLMOD_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
|
||||||
@ -326,7 +326,7 @@ if(PASTIX_FOUND AND (SCOTCH_FOUND OR METIS_FOUND))
|
|||||||
ei_add_test(pastix_support "" "${PASTIX_ALL_LIBS}")
|
ei_add_test(pastix_support "" "${PASTIX_ALL_LIBS}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(SPQR_FOUND AND CHOLMOD_FOUND AND EIGEN_BUILD_BLAS AND EIGEN_BUILD_LAPACK)
|
if(SPQR_FOUND AND EIGEN_TEST_CXX11 AND CHOLMOD_FOUND AND EIGEN_BUILD_BLAS AND EIGEN_BUILD_LAPACK)
|
||||||
ei_add_test(spqr_support "" "${SPQR_ALL_LIBS}")
|
ei_add_test(spqr_support "" "${SPQR_ALL_LIBS}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -358,7 +358,7 @@ endif()
|
|||||||
|
|
||||||
# boost MP unit test
|
# boost MP unit test
|
||||||
find_package(Boost 1.53.0)
|
find_package(Boost 1.53.0)
|
||||||
if(Boost_FOUND)
|
if(Boost_FOUND AND EIGEN_TEST_CXX11)
|
||||||
include_directories(${Boost_INCLUDE_DIRS})
|
include_directories(${Boost_INCLUDE_DIRS})
|
||||||
ei_add_test(boostmultiprec "" "${Boost_LIBRARIES}")
|
ei_add_test(boostmultiprec "" "${Boost_LIBRARIES}")
|
||||||
ei_add_property(EIGEN_TESTED_BACKENDS "Boost.Multiprecision, ")
|
ei_add_property(EIGEN_TESTED_BACKENDS "Boost.Multiprecision, ")
|
||||||
|
@ -652,10 +652,10 @@ void packetmath_test_IEEE_corner_cases(const RefFunctorT& ref_fun,
|
|||||||
const Scalar norm_min = (std::numeric_limits<Scalar>::min)();
|
const Scalar norm_min = (std::numeric_limits<Scalar>::min)();
|
||||||
const Scalar norm_max = (std::numeric_limits<Scalar>::max)();
|
const Scalar norm_max = (std::numeric_limits<Scalar>::max)();
|
||||||
|
|
||||||
constexpr int size = PacketSize * 2;
|
const int size = PacketSize * 2;
|
||||||
EIGEN_ALIGN_MAX Scalar data1[size];
|
EIGEN_ALIGN_MAX Scalar data1[PacketSize * 2];
|
||||||
EIGEN_ALIGN_MAX Scalar data2[size];
|
EIGEN_ALIGN_MAX Scalar data2[PacketSize * 2];
|
||||||
EIGEN_ALIGN_MAX Scalar ref[size];
|
EIGEN_ALIGN_MAX Scalar ref[PacketSize * 2];
|
||||||
for (int i = 0; i < size; ++i) {
|
for (int i = 0; i < size; ++i) {
|
||||||
data1[i] = data2[i] = ref[i] = Scalar(0);
|
data1[i] = data2[i] = ref[i] = Scalar(0);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user