diff --git a/Eigen/src/Core/arch/SSE/PacketMath.h b/Eigen/src/Core/arch/SSE/PacketMath.h index 908e27368..23aec8ecd 100644 --- a/Eigen/src/Core/arch/SSE/PacketMath.h +++ b/Eigen/src/Core/arch/SSE/PacketMath.h @@ -51,7 +51,7 @@ template<> struct is_arithmetic<__m128d> { enum { value = true }; }; #define vec2d_swizzle1(v,p,q) \ (_mm_castsi128_pd(_mm_shuffle_epi32( _mm_castpd_si128(v), ((q*2+1)<<6|(q*2)<<4|(p*2+1)<<2|(p*2))))) - + #define vec4f_swizzle2(a,b,p,q,r,s) \ (_mm_shuffle_ps( (a), (b), ((s)<<6|(r)<<4|(q)<<2|(p)))) @@ -495,8 +495,8 @@ template<> EIGEN_STRONG_INLINE int predux_min(const Packet4i& a) // for GCC (eg., it does not like using std::min after the pstore !!) EIGEN_ALIGN16 int aux[4]; pstore(aux, a); - register int aux0 = aux[0] EIGEN_STRONG_INLINE int predux_max(const Packet4i& a) // for GCC (eg., it does not like using std::min after the pstore !!) EIGEN_ALIGN16 int aux[4]; pstore(aux, a); - register int aux0 = aux[0]>aux[1] ? aux[0] : aux[1]; - register int aux2 = aux[2]>aux[3] ? aux[2] : aux[3]; + int aux0 = aux[0]>aux[1] ? aux[0] : aux[1]; + int aux2 = aux[2]>aux[3] ? aux[2] : aux[3]; return aux0>aux2 ? aux0 : aux2; } diff --git a/Eigen/src/Core/products/SelfadjointMatrixVector.h b/Eigen/src/Core/products/SelfadjointMatrixVector.h index d6121fc07..86f258e89 100644 --- a/Eigen/src/Core/products/SelfadjointMatrixVector.h +++ b/Eigen/src/Core/products/SelfadjointMatrixVector.h @@ -62,7 +62,7 @@ static EIGEN_DONT_INLINE void product_selfadjoint_vector( // FIXME this copy is now handled outside product_selfadjoint_vector, so it could probably be removed. // if the rhs is not sequentially stored in memory we copy it to a temporary buffer, // this is because we need to extract packets - ei_declare_aligned_stack_constructed_variable(Scalar,rhs,size,rhsIncr==1 ? const_cast(_rhs) : 0); + ei_declare_aligned_stack_constructed_variable(Scalar,rhs,size,rhsIncr==1 ? const_cast(_rhs) : 0); if (rhsIncr!=1) { const Scalar* it = _rhs; @@ -77,8 +77,8 @@ static EIGEN_DONT_INLINE void product_selfadjoint_vector( for (Index j=FirstTriangular ? bound : 0; j<(FirstTriangular ? size : bound);j+=2) { - register const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride; - register const Scalar* EIGEN_RESTRICT A1 = lhs + (j+1)*lhsStride; + const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride; + const Scalar* EIGEN_RESTRICT A1 = lhs + (j+1)*lhsStride; Scalar t0 = cjAlpha * rhs[j]; Packet ptmp0 = pset1(t0); @@ -145,7 +145,7 @@ static EIGEN_DONT_INLINE void product_selfadjoint_vector( } for (Index j=FirstTriangular ? 0 : bound;j<(FirstTriangular ? bound : size);j++) { - register const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride; + const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride; Scalar t1 = cjAlpha * rhs[j]; Scalar t2 = 0; @@ -160,7 +160,7 @@ static EIGEN_DONT_INLINE void product_selfadjoint_vector( } } -} // end namespace internal +} // end namespace internal /*************************************************************************** * Wrapper to product_selfadjoint_vector @@ -190,7 +190,7 @@ struct SelfadjointProductMatrix typedef typename Dest::Scalar ResScalar; typedef typename Base::RhsScalar RhsScalar; typedef Map, Aligned> MappedDest; - + eigen_assert(dest.rows()==m_lhs.rows() && dest.cols()==m_rhs.cols()); const ActualLhsType lhs = LhsBlasTraits::extract(m_lhs); @@ -203,16 +203,16 @@ struct SelfadjointProductMatrix EvalToDest = (Dest::InnerStrideAtCompileTime==1), UseRhs = (_ActualRhsType::InnerStrideAtCompileTime==1) }; - + internal::gemv_static_vector_if static_dest; internal::gemv_static_vector_if static_rhs; ei_declare_aligned_stack_constructed_variable(ResScalar,actualDestPtr,dest.size(), EvalToDest ? dest.data() : static_dest.data()); - + ei_declare_aligned_stack_constructed_variable(RhsScalar,actualRhsPtr,rhs.size(), UseRhs ? const_cast(rhs.data()) : static_rhs.data()); - + if(!EvalToDest) { #ifdef EIGEN_DENSE_STORAGE_CTOR_PLUGIN @@ -221,7 +221,7 @@ struct SelfadjointProductMatrix #endif MappedDest(actualDestPtr, dest.size()) = dest; } - + if(!UseRhs) { #ifdef EIGEN_DENSE_STORAGE_CTOR_PLUGIN @@ -230,8 +230,8 @@ struct SelfadjointProductMatrix #endif Map(actualRhsPtr, rhs.size()) = rhs; } - - + + internal::product_selfadjoint_vector::Flags&RowMajorBit) ? RowMajor : ColMajor, int(LhsUpLo), bool(LhsBlasTraits::NeedToConjugate), bool(RhsBlasTraits::NeedToConjugate)> ( lhs.rows(), // size @@ -240,7 +240,7 @@ struct SelfadjointProductMatrix actualDestPtr, // result info actualAlpha // scale factor ); - + if(!EvalToDest) dest = MappedDest(actualDestPtr, dest.size()); } diff --git a/ci/build.linux.gitlab-ci.yml b/ci/build.linux.gitlab-ci.yml index a99c4e334..f4ffbd4d3 100644 --- a/ci/build.linux.gitlab-ci.yml +++ b/ci/build.linux.gitlab-ci.yml @@ -26,5 +26,6 @@ build:linux:docs: EIGEN_CI_C_COMPILER: clang EIGEN_CI_CXX_COMPILER: clang++ EIGEN_CI_BEFORE_SCRIPT: ". ci/scripts/build_and_install_doxygen.sh Release_1_13_2" + EIGEN_CI_ADDITIONAL_ARGS: "-DCMAKE_CXX_FLAGS='-Wno-deprecated-declarations -Wno-ignored-reference-qualifiers'" rules: - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "libeigen" diff --git a/ci/scripts/build.linux.script.sh b/ci/scripts/build.linux.script.sh index d00edbfda..54f7c9bc5 100755 --- a/ci/scripts/build.linux.script.sh +++ b/ci/scripts/build.linux.script.sh @@ -12,7 +12,7 @@ cmake -G Ninja \ -DCMAKE_CXX_COMPILER=${EIGEN_CI_CXX_COMPILER} \ -DCMAKE_C_COMPILER=${EIGEN_CI_C_COMPILER} \ -DCMAKE_CXX_COMPILER_TARGET=${EIGEN_CI_CXX_COMPILER_TARGET} \ - ${EIGEN_CI_ADDITIONAL_ARGS} ${rootdir} + "${EIGEN_CI_ADDITIONAL_ARGS}" ${rootdir} target="" if [[ ${EIGEN_CI_BUILD_TARGET} ]]; then diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 50ce7ee0c..55bcc0756 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -70,7 +70,8 @@ add_custom_target(doc ALL COMMAND doxygen COMMAND doxygen Doxyfile-unsupported # run doxygen twice to get proper eigen <=> unsupported cross references COMMAND ${CMAKE_COMMAND} -E rename html eigen-doc - COMMAND ${CMAKE_COMMAND} -E tar cvfz eigen-doc/eigen-doc.tgz eigen-doc/*.html eigen-doc/*.map eigen-doc/*.png eigen-doc/*.css eigen-doc/*.js eigen-doc/*.txt eigen-doc/unsupported + COMMAND ${CMAKE_COMMAND} -E remove eigen-doc/eigen-doc.tgz + COMMAND ${CMAKE_COMMAND} -E tar cvfz eigen-doc/eigen-doc.tgz eigen-doc COMMAND ${CMAKE_COMMAND} -E rename eigen-doc html WORKING_DIRECTORY ${Eigen_BINARY_DIR}/doc)