Skip to content

Commit f4f5880

Browse files
committed
Merge branch 'upstream-Eigen3' into eigen-fork-update-verify-2026-05-10
* upstream-Eigen3: Eigen3 2026-05-10 (ae53bfe8) # Conflicts: # Modules/ThirdParty/Eigen3/src/itkeigen/cmake/Eigen3Config.cmake.in
2 parents b6eb189 + f7a9a8a commit f4f5880

441 files changed

Lines changed: 5924 additions & 2699 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Modules/ThirdParty/Eigen3/UpdateFromUpstream.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ readonly ownership="Eigen Upstream <kwrobot@kitware.com>"
1313
exact_tree_match=false
1414
readonly subtree="Modules/ThirdParty/Eigen3/src/itkeigen"
1515
readonly repo="https://github.com/InsightSoftwareConsortium/eigen"
16-
readonly tag="for/itk-20260501-879885e1"
16+
readonly tag="for/itk-20260509-599d71ab-p2"
1717
readonly paths="
1818
Eigen/AccelerateSupport
1919
Eigen/Cholesky

Modules/ThirdParty/Eigen3/src/itkeigen/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: The Eigen Authors
2+
# SPDX-License-Identifier: MPL-2.0
3+
14
# Same version of ITK cmake_minimum_required
25
cmake_minimum_required(VERSION 3.16.3)
36

@@ -965,6 +968,17 @@ target_include_directories (eigen_internal SYSTEM INTERFACE
965968

966969
# Export as title case Eigen
967970
set_target_properties (eigen_internal PROPERTIES EXPORT_NAME Eigen)
971+
# Register in ITK's main export set so find_package(ITK) resolves
972+
# eigen_internal as an IMPORTED target loaded from ITKTargets.cmake
973+
# (issue InsightSoftwareConsortium/ITK#6239: SimpleITK FetchContent +
974+
# FIND_PACKAGE_ARGS fallback). ${ITK3P_INSTALL_EXPORT_NAME} is set by
975+
# ITK proper in Modules/ThirdParty/Eigen3/src/CMakeLists.txt; if unset
976+
# (i.e. building outside ITK), this install becomes a no-op.
977+
if(DEFINED ITK3P_INSTALL_EXPORT_NAME)
978+
install (TARGETS eigen_internal EXPORT ${ITK3P_INSTALL_EXPORT_NAME})
979+
endif()
980+
# Also register in the standalone ITKInternalEigen3 export set used by
981+
# find_package(ITKInternalEigen3) consumers.
968982
install (TARGETS eigen_internal EXPORT ITKInternalEigen3Targets)
969983

970984
set(EIGEN3_TARGETS_FILE ITKInternalEigen3Targets.cmake)

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/AccelerateSupport

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// This Source Code Form is subject to the terms of the Mozilla
55
// Public License v. 2.0. If a copy of the MPL was not distributed
66
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
// SPDX-FileCopyrightText: The Eigen Authors
8+
// SPDX-License-Identifier: MPL-2.0
79

810
#ifndef EIGEN_ACCELERATESUPPORT_MODULE_H
911
#define EIGEN_ACCELERATESUPPORT_MODULE_H

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/Cholesky

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// This Source Code Form is subject to the terms of the Mozilla
55
// Public License v. 2.0. If a copy of the MPL was not distributed
66
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
// SPDX-FileCopyrightText: The Eigen Authors
8+
// SPDX-License-Identifier: MPL-2.0
79

810
#ifndef EIGEN_CHOLESKY_MODULE_H
911
#define EIGEN_CHOLESKY_MODULE_H

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/CholmodSupport

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// This Source Code Form is subject to the terms of the Mozilla
55
// Public License v. 2.0. If a copy of the MPL was not distributed
66
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
// SPDX-FileCopyrightText: The Eigen Authors
8+
// SPDX-License-Identifier: MPL-2.0
79

810
#ifndef EIGEN_CHOLMODSUPPORT_MODULE_H
911
#define EIGEN_CHOLMODSUPPORT_MODULE_H

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/Core

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// This Source Code Form is subject to the terms of the Mozilla
88
// Public License v. 2.0. If a copy of the MPL was not distributed
99
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
10+
// SPDX-License-Identifier: MPL-2.0
1011

1112
#ifndef EIGEN_CORE_MODULE_H
1213
#define EIGEN_CORE_MODULE_H
@@ -49,7 +50,6 @@
4950
#include "src/Core/util/MKL_support.h"
5051
#include "src/Core/util/AOCL_Support.h"
5152

52-
5353
// EIGEN_HAS_GPU_FP16 is now always true when compiling with CUDA or HIP.
5454
// Use EIGEN_GPUCC (compile-time) or EIGEN_GPU_COMPILE_PHASE (device phase) instead.
5555
// TODO: Remove EIGEN_HAS_GPU_BF16 similarly once HIP bf16 guards are cleaned up.
@@ -152,8 +152,8 @@
152152

153153
namespace Eigen {
154154

155-
using std::size_t;
156155
using std::ptrdiff_t;
156+
using std::size_t;
157157

158158
} // namespace Eigen
159159

@@ -275,9 +275,10 @@ using std::ptrdiff_t;
275275
#include "src/Core/arch/SVE/TypeCasting.h"
276276
#include "src/Core/arch/SVE/MathFunctions.h"
277277
#elif defined EIGEN_VECTORIZE_RVV10
278+
#include "src/Core/arch/RVV10/PacketMathDecl.h"
278279
#include "src/Core/arch/RVV10/PacketMath.h"
279-
#include "src/Core/arch/RVV10/PacketMath4.h"
280280
#include "src/Core/arch/RVV10/PacketMath2.h"
281+
#include "src/Core/arch/RVV10/PacketMath4.h"
281282
#include "src/Core/arch/RVV10/TypeCasting.h"
282283
#include "src/Core/arch/RVV10/MathFunctions.h"
283284
#if defined EIGEN_VECTORIZE_RVV10FP16
@@ -286,6 +287,10 @@ using std::ptrdiff_t;
286287
#if defined EIGEN_VECTORIZE_RVV10BF16
287288
#include "src/Core/arch/RVV10/PacketMathBF16.h"
288289
#endif
290+
#if EIGEN_RISCV64_DEFAULT_LMUL == 1
291+
#include "src/Core/arch/RVV10/Complex.h"
292+
#include "src/Core/arch/RVV10/Complex2.h"
293+
#endif
289294
#elif defined EIGEN_VECTORIZE_ZVECTOR
290295
#include "src/Core/arch/ZVector/PacketMath.h"
291296
#include "src/Core/arch/ZVector/MathFunctions.h"

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/Dense

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// This Source Code Form is subject to the terms of the Mozilla
55
// Public License v. 2.0. If a copy of the MPL was not distributed
66
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
// SPDX-FileCopyrightText: The Eigen Authors
8+
// SPDX-License-Identifier: MPL-2.0
79

810
#ifndef EIGEN_DENSE_MODULE_H
911
#define EIGEN_DENSE_MODULE_H

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/Eigen

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// This Source Code Form is subject to the terms of the Mozilla
55
// Public License v. 2.0. If a copy of the MPL was not distributed
66
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
// SPDX-FileCopyrightText: The Eigen Authors
8+
// SPDX-License-Identifier: MPL-2.0
79

810
#ifndef EIGEN_EIGEN_MODULE_H
911
#define EIGEN_EIGEN_MODULE_H

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/Eigenvalues

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// This Source Code Form is subject to the terms of the Mozilla
55
// Public License v. 2.0. If a copy of the MPL was not distributed
66
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
// SPDX-FileCopyrightText: The Eigen Authors
8+
// SPDX-License-Identifier: MPL-2.0
79

810
#ifndef EIGEN_EIGENVALUES_MODULE_H
911
#define EIGEN_EIGENVALUES_MODULE_H

Modules/ThirdParty/Eigen3/src/itkeigen/Eigen/Geometry

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// This Source Code Form is subject to the terms of the Mozilla
55
// Public License v. 2.0. If a copy of the MPL was not distributed
66
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
7+
// SPDX-FileCopyrightText: The Eigen Authors
8+
// SPDX-License-Identifier: MPL-2.0
79

810
#ifndef EIGEN_GEOMETRY_MODULE_H
911
#define EIGEN_GEOMETRY_MODULE_H
@@ -23,7 +25,8 @@
2325
* - \link Quaternion quaternions \endlink
2426
* - cross products (\ref MatrixBase::cross(), \ref MatrixBase::cross3())
2527
* - orthogonal vector generation (MatrixBase::unitOrthogonal)
26-
* - some linear components: \link ParametrizedLine parametrized-lines \endlink and \link Hyperplane hyperplanes \endlink
28+
* - some linear components: \link ParametrizedLine parametrized-lines \endlink and \link Hyperplane hyperplanes
29+
* \endlink
2730
* - \link AlignedBox axis aligned bounding boxes \endlink
2831
* - \link umeyama() least-square transformation fitting \endlink
2932
* \code

0 commit comments

Comments
 (0)