devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining MSVC warnings in Windows CI (C4804, C4244, C4146, C4305)

Browse Source 
libeigen/eigen!2374

Co-authored-by: Rasmus Munk Larsen <rmlarsen@gmail.com>
This commit is contained in:
Rasmus Munk Larsen
2026-04-01 17:20:31 -07:00
parent 6a07970d7d
commit 64885cc6a3
7 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Core/MathFunctions.h
View File

@@ -2097,7 +2097,15 @@ struct expm1_impl<std::complex<RealScalar>> {
template <typename T>
struct rsqrt_impl {
// C4804: unsafe use of type 'bool' in operation. Unavoidable when instantiated with T=bool.
#if EIGEN_COMP_MSVC
#pragma warning(push)
#pragma warning(disable : 4804)
#endif
EIGEN_DEVICE_FUNC static EIGEN_ALWAYS_INLINE T run(const T& x) { return T(1) / numext::sqrt(x); }
#if EIGEN_COMP_MSVC
#pragma warning(pop)
#endif
};
#if defined(EIGEN_GPU_COMPILE_PHASE)

11
Eigen/src/Core/ProductEvaluators.h
View File

@@ -15,6 +15,13 @@
// IWYU pragma: private
#include "./InternalHeaderCheck.h"
// C4804: unsafe use of type 'bool' in operation. Unavoidable in generic code
// instantiated with bool scalars (e.g. += and * on bool).
#if EIGEN_COMP_MSVC
#pragma warning(push)
#pragma warning(disable : 4804)
#endif
namespace Eigen {
namespace internal {
@@ -1260,4 +1267,8 @@ struct generic_product_impl<Lhs, Rhs, HomogeneousShape, PermutationShape, Produc
} // end namespace Eigen
#if EIGEN_COMP_MSVC
#pragma warning(pop)
#endif
#endif // EIGEN_PRODUCT_EVALUATORS_H

2
test/clz.cpp
View File

@@ -33,7 +33,7 @@ int ref_ctz(T val) {
template <typename T>
void test_clz_ctz() {
T step = sizeof(T) <= 2 ? 1 : (Eigen::NumTraits<T>::highest() / (T(1) << 16));
T step = sizeof(T) <= 2 ? T(1) : (Eigen::NumTraits<T>::highest() / (T(1) << 16));
T iters = Eigen::NumTraits<T>::highest() / step;
for (T i = 0; i < iters; ++i) {
T val = i * step;

4
test/mixingtypes.cpp
View File

@@ -89,9 +89,9 @@ void mixingtypes(int size = SizeAtCompileType) {
VERIFY_MIX_SCALAR(scd * vd, scd * vd.template cast<complex<double> >());
VERIFY_MIX_SCALAR(vcf * 2, vcf * complex<float>(2));
VERIFY_MIX_SCALAR(vcf * 2.1, vcf * complex<float>(2.1));
VERIFY_MIX_SCALAR(vcf * 2.1, vcf * complex<float>(2.1f));
VERIFY_MIX_SCALAR(2 * vcf, vcf * complex<float>(2));
VERIFY_MIX_SCALAR(2.1 * vcf, vcf * complex<float>(2.1));
VERIFY_MIX_SCALAR(2.1 * vcf, vcf * complex<float>(2.1f));
// check scalar quotients
VERIFY_MIX_SCALAR(vcf / sf, vcf / complex<float>(sf));

16
test/nullary.cpp
View File

@@ -155,11 +155,11 @@ void testVectorType(const VectorType& base) {
VERIFY(m.size() == n0);
if (VectorType::SizeAtCompileTime == Dynamic) {
VERIFY_IS_EQUAL(VectorType::LinSpaced(n0, 0, Scalar(n0 - 1)).sum(), Scalar(0));
VERIFY_IS_EQUAL(VectorType::LinSpaced(n0, 0, Scalar(RealScalar(n0 - 1))).sum(), Scalar(0));
VERIFY_IS_EQUAL(VectorType::LinSpaced(n0, low, low - RealScalar(1)).sum(), Scalar(0));
}
m.setLinSpaced(n0, 0, Scalar(n0 - 1));
m.setLinSpaced(n0, 0, Scalar(RealScalar(n0 - 1)));
VERIFY(m.size() == n0);
m.setLinSpaced(n0, low, low - RealScalar(1));
VERIFY(m.size() == n0);
@@ -170,18 +170,18 @@ void testVectorType(const VectorType& base) {
VERIFY_IS_APPROX(m, VectorType::Constant(size, low));
if (NumTraits<Scalar>::IsInteger) {
VERIFY_IS_APPROX(VectorType::LinSpaced(size, low, low + Scalar(size - 1)),
VectorType::LinSpaced(size, low + Scalar(size - 1), low).reverse());
VERIFY_IS_APPROX(VectorType::LinSpaced(size, low, low + Scalar(RealScalar(size - 1))),
VectorType::LinSpaced(size, low + Scalar(RealScalar(size - 1)), low).reverse());
if (VectorType::SizeAtCompileTime == Dynamic) {
// Check negative multiplicator path:
for (Index k = 1; k < 5; ++k)
VERIFY_IS_APPROX(VectorType::LinSpaced(size, low, low + Scalar((size - 1) * k)),
VectorType::LinSpaced(size, low + Scalar((size - 1) * k), low).reverse());
VERIFY_IS_APPROX(VectorType::LinSpaced(size, low, low + Scalar(RealScalar((size - 1) * k))),
VectorType::LinSpaced(size, low + Scalar(RealScalar((size - 1) * k)), low).reverse());
// Check negative divisor path:
for (Index k = 1; k < 5; ++k)
VERIFY_IS_APPROX(VectorType::LinSpaced(size * k, low, low + Scalar(size - 1)),
VectorType::LinSpaced(size * k, low + Scalar(size - 1), low).reverse());
VERIFY_IS_APPROX(VectorType::LinSpaced(size * k, low, low + Scalar(RealScalar(size - 1))),
VectorType::LinSpaced(size * k, low + Scalar(RealScalar(size - 1)), low).reverse());
}
}
}

13
test/numext.cpp
View File

@@ -45,10 +45,17 @@ void check_negate() {
}
template <typename T>
std::enable_if_t<NumTraits<T>::IsInteger, T> random_abs2_input() {
std::enable_if_t<NumTraits<T>::IsInteger && NumTraits<T>::IsSigned, T> random_abs2_input() {
const T safeAbs2Input = static_cast<T>(std::sqrt(static_cast<long double>(NumTraits<T>::highest())));
return NumTraits<T>::IsSigned ? internal::random<T>(-safeAbs2Input, safeAbs2Input)
: internal::random<T>(T(0), safeAbs2Input);
return internal::random<T>(-safeAbs2Input, safeAbs2Input);
}
// Note: bool resolves here (IsInteger && !IsSigned), but check_abs<bool> is fully
// specialized and never calls random_abs2_input<bool>().
template <typename T>
std::enable_if_t<NumTraits<T>::IsInteger && !NumTraits<T>::IsSigned, T> random_abs2_input() {
const T safeAbs2Input = static_cast<T>(std::sqrt(static_cast<long double>(NumTraits<T>::highest())));
return internal::random<T>(T(0), safeAbs2Input);
}
template <typename T>

8
test/packetmath.cpp
View File

@@ -721,6 +721,11 @@ void packetmath() {
}
}
// C4804: unsafe use of type 'bool' in operation. Unavoidable when Scalar=bool.
#if EIGEN_COMP_MSVC
#pragma warning(push)
#pragma warning(disable : 4804)
#endif
ref[0] = Scalar(0);
for (int i = 0; i < PacketSize; ++i) ref[0] += data1[i];
VERIFY(test::isApproxAbs(ref[0], internal::predux(internal::pload<Packet>(data1)), refvalue) && "internal::predux");
@@ -732,6 +737,9 @@ void packetmath() {
internal::pstore(data2, internal::predux_half(internal::pload<Packet>(data1)));
VERIFY(test::areApprox(ref, data2, HalfPacketSize) && "internal::predux_half");
}
#if EIGEN_COMP_MSVC
#pragma warning(pop)
#endif
// Avoid overflows.
if (NumTraits<Scalar>::IsInteger && NumTraits<Scalar>::IsSigned &&