Skip to content

unify Eigen inclusions #5278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 23, 2025
+14 −66
Merged

unify Eigen inclusions #5278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e605d84
include Eigen via our headers
Fedr Oct 22, 2025
6110d28
#include <unsupported/Eigen/NonLinearOptimization>
Fedr Oct 22, 2025
1a41815
MRBestFitQuadric.cpp
Fedr Oct 22, 2025
722d8f8
MRBestFitPolynomial.cpp
Fedr Oct 22, 2025
567bb05
MRCircleObject.cpp
Fedr Oct 22, 2025
886e5c8
#include <Eigen/SVD>
Fedr Oct 22, 2025
853349a
MRSphereObject.cpp
Fedr Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion source/MRMesh/MRBestFitPolynomial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include "MRBestFitPolynomial.h"
#include "MRGTest.h"

#include <Eigen/Dense>
#include <MRPch/MREigenCore.h>
#include <Eigen/LU>

#include <cmath>
#include <complex>
Expand Down
3 changes: 2 additions & 1 deletion source/MRMesh/MRBestFitQuadric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "MRBestFitQuadric.h"
#include "MRVector4.h"
#include <Eigen/Dense>
#include <MRPch/MREigenCore.h>
#include <Eigen/QR>

namespace MR
{
Expand Down
25 changes: 2 additions & 23 deletions source/MRMesh/MRCircleObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,8 @@
#include "MRPch/MRJson.h"
#include "MRConstants.h"
#include "MRBestFit.h"

#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:5054) //operator '&': deprecated between enumerations of different types
#pragma warning(disable:4127) //C4127. "Consider using 'if constexpr' statement instead"
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif

#include <Eigen/Dense>

#ifdef _MSC_VER
#pragma warning(pop)
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

#include <MRPch/MREigenCore.h>
#include <Eigen/QR>

namespace MR
{
Expand Down
22 changes: 5 additions & 17 deletions source/MRMesh/MRConeApproximator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,22 @@
#include "MRCone3.h"
#include "MRToFromEigen.h"
#include "MRConstants.h"
#include "MRPch/MRTBB.h"
#include <algorithm>
#include <MRPch/MREigenCore.h>
#include <Eigen/SVD>

#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4068) // unknown pragmas
#pragma warning(disable: 4127) // conditional expression is constant
#pragma warning(disable: 4244) // conversion from double to float
#pragma warning(disable: 4464) // relative include path contains '..'
#pragma warning(disable: 4643) // Forward declaring 'tuple' in namespace std is not permitted by the C++ Standard.
#pragma warning(disable: 5054) // operator '|': deprecated between enumerations of different types
#pragma warning(disable: 4244) // casting float to double
#elif defined(__clang__)
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif

#include <unsupported/Eigen/NonLinearOptimization>
#include <unsupported/Eigen/NumericalDiff>
#include <Eigen/Dense>

#ifdef _MSC_VER
#pragma warning(pop)
#elif defined(__clang__)
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

#include "MRPch/MRTBB.h"
#include <algorithm>

// Main idea is here: https://www.geometrictools.com/Documentation/LeastSquaresFitting.pdf pages 45-51
// Below we will write out the function and Jacobian for minimization by the Levenberg-Marquard method
Expand Down
27 changes: 3 additions & 24 deletions source/MRMesh/MRSphereObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,9 @@
#include "MRMatrix3.h"
#include "MRMesh.h"
#include "MRObjectFactory.h"
#include "MRPch/MRJson.h"

#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:5054) //operator '&': deprecated between enumerations of different types
#pragma warning(disable:4127) //C4127. "Consider using 'if constexpr' statement instead"
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif

#include <Eigen/Dense>

#ifdef _MSC_VER
#pragma warning(pop)
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

#include <MRPch/MREigenCore.h>
#include <Eigen/QR>
#include <MRPch/MRJson.h>

namespace MR
{
Expand Down
Loading