From 46ab16986d5b9141e8a6b8d57c7553bf5eb85327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Sun, 24 Jul 2022 16:41:14 +0200
Subject: [PATCH] Remove "eigen3/" from Eigen includes

---
 demos/solver/test_SPQR.cpp                         | 4 ++--
 demos/solver/test_ccolamd.cpp                      | 6 +++---
 demos/solver/test_ccolamd_blocks.cpp               | 6 +++---
 demos/solver/test_iQR.cpp                          | 6 +++---
 demos/solver/test_iQR_wolf.cpp                     | 4 ++--
 demos/solver/test_incremental_ccolamd_blocks.cpp   | 6 +++---
 demos/solver/test_permutations.cpp                 | 2 +-
 include/core/ceres_wrapper/sparse_utils.h          | 2 +-
 include/core/solver_suitesparse/ccolamd_ordering.h | 6 +++---
 include/core/solver_suitesparse/qr_solver.h        | 4 ++--
 include/core/solver_suitesparse/sparse_utils.h     | 2 +-
 include/core/utils/converter.h                     | 4 ++--
 include/core/yaml/yaml_conversion.h                | 4 ++--
 src/utils/converter_utils.cpp                      | 4 ++--
 test/gtest_yaml_conversions.cpp                    | 2 +-
 15 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/demos/solver/test_SPQR.cpp b/demos/solver/test_SPQR.cpp
index b5f159c73..56df88821 100644
--- a/demos/solver/test_SPQR.cpp
+++ b/demos/solver/test_SPQR.cpp
@@ -27,8 +27,8 @@
  */
 
 #include <iostream>
-#include <eigen3/Eigen/SPQRSupport>
-#include <eigen3/Eigen/CholmodSupport>
+#include <Eigen/SPQRSupport>
+#include <Eigen/CholmodSupport>
 #include "SuiteSparseQR.hpp"
 
 using namespace Eigen;
diff --git a/demos/solver/test_ccolamd.cpp b/demos/solver/test_ccolamd.cpp
index 98f496f26..126fa7f86 100644
--- a/demos/solver/test_ccolamd.cpp
+++ b/demos/solver/test_ccolamd.cpp
@@ -43,9 +43,9 @@
 #include "solver/ccolamd_ordering.h"
 
 // eigen includes
-#include <eigen3/Eigen/OrderingMethods>
-#include <eigen3/Eigen/CholmodSupport>
-#include <eigen3/Eigen/SparseLU>
+#include <Eigen/OrderingMethods>
+#include <Eigen/CholmodSupport>
+#include <Eigen/SparseLU>
 
 using namespace Eigen;
 using namespace wolf;
diff --git a/demos/solver/test_ccolamd_blocks.cpp b/demos/solver/test_ccolamd_blocks.cpp
index 14bb17428..2d8263343 100644
--- a/demos/solver/test_ccolamd_blocks.cpp
+++ b/demos/solver/test_ccolamd_blocks.cpp
@@ -37,9 +37,9 @@
 #include <queue>
 
 // eigen includes
-#include <eigen3/Eigen/OrderingMethods>
-#include <eigen3/Eigen/CholmodSupport>
-#include <eigen3/Eigen/SparseLU>
+#include <Eigen/OrderingMethods>
+#include <Eigen/CholmodSupport>
+#include <Eigen/SparseLU>
 
 // ccolamd
 #include "solver/ccolamd_ordering.h"
diff --git a/demos/solver/test_iQR.cpp b/demos/solver/test_iQR.cpp
index 53a37cef1..ba4ae194a 100644
--- a/demos/solver/test_iQR.cpp
+++ b/demos/solver/test_iQR.cpp
@@ -44,9 +44,9 @@
 #include <queue>
 
 // eigen includes
-#include <eigen3/Eigen/OrderingMethods>
-#include <eigen3/Eigen/SparseQR>
-#include <eigen3/Eigen/SPQRSupport>
+#include <Eigen/OrderingMethods>
+#include <Eigen/SparseQR>
+#include <Eigen/SPQRSupport>
 
 // ccolamd
 #include "solver/ccolamd_ordering.h"
diff --git a/demos/solver/test_iQR_wolf.cpp b/demos/solver/test_iQR_wolf.cpp
index a8df23723..4ffc4a0bf 100644
--- a/demos/solver/test_iQR_wolf.cpp
+++ b/demos/solver/test_iQR_wolf.cpp
@@ -38,8 +38,8 @@
 #include <queue>
 
 // eigen includes
-#include <eigen3/Eigen/OrderingMethods>
-#include <eigen3/Eigen/SparseQR>
+#include <Eigen/OrderingMethods>
+#include <Eigen/SparseQR>
 #include <Eigen/SPQRSupport>
 
 // ccolamd
diff --git a/demos/solver/test_incremental_ccolamd_blocks.cpp b/demos/solver/test_incremental_ccolamd_blocks.cpp
index 740407a9a..f0eabf66c 100644
--- a/demos/solver/test_incremental_ccolamd_blocks.cpp
+++ b/demos/solver/test_incremental_ccolamd_blocks.cpp
@@ -37,9 +37,9 @@
 #include <queue>
 
 // eigen includes
-#include <eigen3/Eigen/OrderingMethods>
-#include <eigen3/Eigen/CholmodSupport>
-#include <eigen3/Eigen/SparseLU>
+#include <Eigen/OrderingMethods>
+#include <Eigen/CholmodSupport>
+#include <Eigen/SparseLU>
 
 // ccolamd
 #include "solver/ccolamd_ordering.h"
diff --git a/demos/solver/test_permutations.cpp b/demos/solver/test_permutations.cpp
index 0765d8ae7..6724ea83f 100644
--- a/demos/solver/test_permutations.cpp
+++ b/demos/solver/test_permutations.cpp
@@ -37,7 +37,7 @@
 #include <queue>
 
 // eigen includes
-#include <eigen3/Eigen/OrderingMethods>
+#include <Eigen/OrderingMethods>
 
 using namespace Eigen;
 
diff --git a/include/core/ceres_wrapper/sparse_utils.h b/include/core/ceres_wrapper/sparse_utils.h
index e0d70f26f..132a4aba7 100644
--- a/include/core/ceres_wrapper/sparse_utils.h
+++ b/include/core/ceres_wrapper/sparse_utils.h
@@ -30,7 +30,7 @@
 #define SPARSE_UTILS_H_
 
 // eigen includes
-//#include <eigen3/Eigen/Sparse>
+//#include <Eigen/Sparse>
 
 namespace wolf
 {
diff --git a/include/core/solver_suitesparse/ccolamd_ordering.h b/include/core/solver_suitesparse/ccolamd_ordering.h
index 468337355..38ec767ef 100644
--- a/include/core/solver_suitesparse/ccolamd_ordering.h
+++ b/include/core/solver_suitesparse/ccolamd_ordering.h
@@ -33,9 +33,9 @@
 #include <iostream>
 
 // Eigen includes
-#include <eigen3/Eigen/OrderingMethods>
-#include <eigen3/Eigen/CholmodSupport>
-#include <eigen3/Eigen/SparseLU>
+#include <Eigen/OrderingMethods>
+#include <Eigen/CholmodSupport>
+#include <Eigen/SparseLU>
 
 // ccolamd
 #include "ccolamd.h"
diff --git a/include/core/solver_suitesparse/qr_solver.h b/include/core/solver_suitesparse/qr_solver.h
index 83c392894..c5fc85822 100644
--- a/include/core/solver_suitesparse/qr_solver.h
+++ b/include/core/solver_suitesparse/qr_solver.h
@@ -46,8 +46,8 @@
 #include "solver/cost_function_sparse.h"
 
 // eigen includes
-#include <eigen3/Eigen/OrderingMethods>
-#include <eigen3/Eigen/SparseQR>
+#include <Eigen/OrderingMethods>
+#include <Eigen/SparseQR>
 #include <Eigen/StdVector>
 #include "core/factor/factor_pose_2d.h"
 
diff --git a/include/core/solver_suitesparse/sparse_utils.h b/include/core/solver_suitesparse/sparse_utils.h
index 393a2fb27..e9bc9f76e 100644
--- a/include/core/solver_suitesparse/sparse_utils.h
+++ b/include/core/solver_suitesparse/sparse_utils.h
@@ -30,7 +30,7 @@
 #define SPARSE_UTILS_H_
 
 // eigen includes
-#include <eigen3/Eigen/Sparse>
+#include <Eigen/Sparse>
 
 namespace wolf
 {
diff --git a/include/core/utils/converter.h b/include/core/utils/converter.h
index 1c53906c6..12a8eee4d 100644
--- a/include/core/utils/converter.h
+++ b/include/core/utils/converter.h
@@ -28,8 +28,8 @@
 #include "core/state_block/state_composite.h"
 
 // Eigen
-#include <eigen3/Eigen/Dense>
-#include <eigen3/Eigen/Geometry>
+#include <Eigen/Dense>
+#include <Eigen/Geometry>
 
 // std
 #include <regex>
diff --git a/include/core/yaml/yaml_conversion.h b/include/core/yaml/yaml_conversion.h
index 76991419a..8ae7e0384 100644
--- a/include/core/yaml/yaml_conversion.h
+++ b/include/core/yaml/yaml_conversion.h
@@ -33,8 +33,8 @@
 #include <yaml-cpp/yaml.h>
 
 // Eigen
-#include <eigen3/Eigen/Dense>
-#include <eigen3/Eigen/Geometry>
+#include <Eigen/Dense>
+#include <Eigen/Geometry>
 
 // stl
 #include <iostream>
diff --git a/src/utils/converter_utils.cpp b/src/utils/converter_utils.cpp
index f77008e1b..b54126846 100644
--- a/src/utils/converter_utils.cpp
+++ b/src/utils/converter_utils.cpp
@@ -23,8 +23,8 @@
 
 // Eigen
 #include <array>
-#include <eigen3/Eigen/Dense>
-#include <eigen3/Eigen/Geometry>
+#include <Eigen/Dense>
+#include <Eigen/Geometry>
 
 // STD
 #include <iostream>
diff --git a/test/gtest_yaml_conversions.cpp b/test/gtest_yaml_conversions.cpp
index 21a4f8978..f558c5764 100644
--- a/test/gtest_yaml_conversions.cpp
+++ b/test/gtest_yaml_conversions.cpp
@@ -30,7 +30,7 @@
 #include "core/utils/utils_gtest.h"
 #include "core/yaml/yaml_conversion.h"
 #include <yaml-cpp/yaml.h>
-#include <eigen3/Eigen/Dense>
+#include <Eigen/Dense>
 #include <iostream>
 //#include <fstream>
 
-- 
GitLab