Merge cgogn:~cgogn/CGoGN

18f74232 · David Cazier · 9b375901 · 333cfee2 · 18f74232 · 18f74232
Commit 18f74232 authored Oct 09, 2012 by David Cazier
--- a/Apps/Tuto/CMakeLists.txt
+++ b/Apps/Tuto/CMakeLists.txt
@@ -81,10 +81,10 @@ add_executable( tuto_subdivision tuto_subdivision.cpp)
 target_link_libraries( tuto_subdivision
 	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS} )

-QT4_WRAP_CPP(tp_master_moc tp_master.h)
-add_executable( tp_master tp_master.cpp ${tp_master_moc})
-target_link_libraries( tp_master
-	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS}  )
+#QT4_WRAP_CPP(tp_master_moc tp_master.h)
+#add_executable( tp_master tp_master.cpp ${tp_master_moc})
+#target_link_libraries( tp_master
+#	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS}  )

 QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h)
 add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui}  ${tuto_histo_moc})

--- a/Apps/Tuto/tuto_mt.cpp
+++ b/Apps/Tuto/tuto_mt.cpp
@@ -39,7 +39,7 @@
 #include "Algo/Modelisation/polyhedron.h"

 #include "Algo/Parallel/parallel_foreach.h"
-#include "Algo/Parallel/cgogn_thread.h"
+
 #include "Utils/cgognStream.h"
 #include "Utils/chrono.h"

@@ -63,28 +63,6 @@ VertexAttribute<PFP::VEC3> normal;



-
-template <typename XXX>
-class ThreadNormals: public Algo::Parallel::CGoGNThread<typename XXX::MAP>
-{
-protected:
-	VertexAttribute<typename XXX::VEC3>& m_positions;
-	VertexAttribute<typename XXX::VEC3>& m_normals;
-public:
-	ThreadNormals(typename XXX::MAP& map, VertexAttribute<typename XXX::VEC3>& pos, VertexAttribute<typename XXX::VEC3>& norm, unsigned int th):
-		Algo::Parallel::CGoGNThread<typename XXX::MAP>(map,th),
-		m_positions(pos),
-		m_normals(norm)
-	{}
-
-	void operator()()
-	{
-		Algo::Geometry::computeNormalVertices<XXX>(this->m_map, m_positions, m_normals, SelectorTrue(), this->tid());
-	}
-};
-
-
-
 void MyQT::cb_initGL()
 {
 	Utils::GLSLShader::setCurrentOGLVersion(2);
@@ -109,9 +87,7 @@ void MyQT::cb_initGL()
 	m_lines->setScale(2.0f);
 	m_lines->setColor(Geom::Vec4f(0.0f, 1.0f, 0.2f, 0.0f));

-	CGoGNout << "Je calcule les normales en meme temps que les primitives" << CGoGNendl;
-	boost::thread thread1( ThreadNormals<PFP>(myMap,position,normal,1));
-
+	Algo::Geometry::computeNormalVertices<PFP>(myMap, position, normal) ;

 	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
 	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
@@ -119,8 +95,6 @@ void MyQT::cb_initGL()
 	registerShader(m_shader);
 	registerShader(m_lines);

-	// on attend la fin du thread pour etre sur que normal est a jour
-	thread1.join();
 	m_normalVBO->updateData(normal);

 }

--- a/Apps/Tuto/tp_master.cpp
+++ b/Apps/Tuto/tp_master.cpp
--- a/Apps/Tuto/tp_master.h
+++ b/Apps/Tuto/tp_master.h
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,11 @@ SET ( WITH_ZINRI ON CACHE BOOL "build CGoGN with Zinri lib  ")
 SET ( WITH_QT ON CACHE BOOL "build CGoGN with Qt lib  ")
 SET ( WITH_NUMERICAL ON CACHE BOOL "build CGoGN with Numerical libs support ")
 # for CGoGN MR
-SET ( FORCE_MR "2" CACHE STRING "0:none / 1 force multi / 2: force mono")
+SET ( FORCE_MR "0" CACHE STRING "0: normal mode / 1 multires mode")
 #create one big lib
 SET ( ONELIB OFF CACHE BOOL "build CGoGN in one lib")
+SET ( WITH_GLEWMX OFF CACHE BOOL "use multi-contex GLEW")
+

 IF(WIN32)
 	set(CMAKE_PREFIX_PATH ${CGoGN_ROOT_DIR}/windows_dependencies CACHE STRING "path to dependencies")
@@ -47,12 +49,6 @@ IF (FORCE_MR EQUAL 1)
 	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_mr.h "1" )
 ENDIF (FORCE_MR EQUAL 1)

-IF (FORCE_MR EQUAL 2)
-	add_definitions(-DCGoGN_FORCE_MR=2)
-	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_mr.h "2" )
-ENDIF (FORCE_MR EQUAL 2)
-
-

 IF (ONELIB)
 	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_onelib.h "1" )
@@ -60,6 +56,15 @@ ELSE (ONELIB)
 	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_onelib.h "0" )
 ENDIF (ONELIB)

+
+IF (WITH_GLEWMX)
+	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_gmx.h "1" )
+ELSE (WITH_GLEWMX)
+	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_gmx.h "0" )
+ENDIF (WITH_GLEWMX)
+
+
+
 add_definitions(-DSHADERPATH="${CGoGN_ROOT_DIR}/lib/Shaders/")

 # define includes of external libs 
@@ -106,6 +111,10 @@ IF (WITH_QT)
 	SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${QT_LIBRARIES} )
 ENDIF (WITH_QT)

+IF (WITH_GLEWMX)
+	ADD_DEFINITIONS(-DGLEW_MX)
+ENDIF (WITH_GLEWMX)
+
 #IF (WITH_NUMERICAL)
 #	add_definitions(-DWITH_NUMERICAL)
 #	SET (CGoGN_NUMERICAL_INCLUDES  ${CGoGN_ROOT_DIR}/ThirdParty/Numerical ${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig)
@@ -134,7 +143,7 @@ IF(WIN32)
 	set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE)
 #	set(CMAKE_CONFIGURATION_TYPES "Release Debug" CACHE STRING "Only Release or Debug" FORCE)
 ELSE(WIN32)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC")
 	add_subdirectory(Release)
 	add_subdirectory(Debug)
 	add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps)

--- a/README.TXT
+++ b/README.TXT
 Dépendences Linux:
 installer les paquets suivants:
-cmake libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev
+cmake libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev

 Pour compiler CGoGN:
 - aller dans ThirdParty, cd build, taper "cmake .", puis make ( avec -j x si vous avez x core sur votre machine)

--- a/README_ECLIPSE.TXT
+++ b/README_ECLIPSE.TXT
-Pour utiliser Eclipse (testé avec la version Helios, Galileo & Indigo)
-English version bellow
+ *** English version below ***

+Pour utiliser Eclipse (testé avec la version Helios, Galileo, Indigo & Juno)
 * Configurer un projet dans Eclipse :
 - Faire un nouveau projet C++
 - Choisir Makefile project -> Empty Project
@@ -31,8 +31,8 @@ Projet X -> Properties -> Project references : cocher le projet dont il dépend.
 Afin d'éviter qu'Eclipse ne rejette les syntaxes Qt (les includes de Qt, les Q_OBJECT, les callbacks) :
 - Télécharger le plugin Qt "eclipse-integration" http://qt.nokia.com/developer/eclipse-integration/
 - Décompresser l'archive et copier son contenu dans le répertoire d'installation d'Eclipse (plugins et features)
- - Relancer Eclipse au moins une fois avec l'option --clean (relecture des répertoires locaux)
-Normalement, dans Window->Preferences de Eclipse, Qt apparait dans le menu.
+ - Relancer Eclipse au moins une fois avec l'option "-clean" (relecture des répertoires locaux)
+Normalement, dans Window --> Preferences de Eclipse, Qt apparait dans le menu.
 - Y ajouter le répertoire de Qt (/usr/bin sur Debian/Ubuntu) et le répertoire d'include (/usr/include/qt4).
 Ensuite, pour chaque projet, ajouter les includes suivants dans Properties -> C/C++ general -> Paths and Symbols
 parmi les includes de C++ :
@@ -63,7 +63,7 @@ Dans Preferences -> Shaders Preferences, on peut désormais configurer certaines
                                ENGLISH VERSION
 =========================================================================================

-To use Eclipse (tested with version Helios, Galileo & Indigo)
+To use Eclipse (tested with version Helios, Galileoi, Indigo & Juno)

 * Setting up a project in Eclipse:
 - Make a new C + + project
@@ -84,18 +84,18 @@ In the project properties:
 	Tutorial: Build / Apps / Tutorial (compiles tutorials)
 	etc. ..

-This added to the directory of CGoGN a .project. and .cproject files.
+This adds a .project. and .cproject files to the CGoGN directory.

- * Inter-dependencies projects and autocompletion
-If the project X depends on another project, then:
+ * Project inter-dependencies and autocompletion
+If project X depends on another project, then:
 Project X -> Properties -> Project references: check the project which it depends.

 * Qt dependencies:
-To avoid Eclipse rejects the Qt syntax (the Qt includes the Q_OBJECT, callbacks):
+To avoid Eclipse rejecting the Qt syntax (includes, Q_OBJECT, callbacks):
 - Download the Qt plugin "eclipse-integration" http://qt.nokia.com/developer/eclipse-integration/
 - Unzip the archive and copy its contents into the installation directory of Eclipse (plugins and features)
- - Restart Eclipse at least once with the - clean (proofreading local directories)
-Normally in Window-> Preferences of Eclipse, Qt appears in the menu.
+ - Restart Eclipse at least once with the "-clean" (proofreading local directories)
+Normally in Window --> Preferences of Eclipse, Qt appears in the menu.
 - Add the Qt directory (/ usr / bin on Debian / Ubuntu) and the directory include (/ usr/include/qt4).
 Then, for each project, add the following includes in Properties -> C / C + + general -> Paths and Symbols
 among the C + + includes:

--- a/Release/CMakeLists.txt
+++ b/Release/CMakeLists.txt
@@ -8,7 +8,7 @@ IF(WIN32)
 	SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib)
 ELSE(WIN32)
 	SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/Release)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
+	ADD_DEFINITIONS(-DNOTOPOWARNING)
 ENDIF(WIN32)

 include_directories(

--- a/ThirdParty/Numerical/Eigen/Cholesky
+++ b/ThirdParty/Numerical/Eigen/Cholesky
@@ -5,8 +5,6 @@

 #include "src/Core/util/DisableStupidWarnings.h"

-namespace Eigen {
-
 /** \defgroup Cholesky_Module Cholesky module
  *
  *
@@ -24,8 +22,9 @@ namespace Eigen {
 #include "src/misc/Solve.h"
 #include "src/Cholesky/LLT.h"
 #include "src/Cholesky/LDLT.h"
-
-} // namespace Eigen
+#ifdef EIGEN_USE_LAPACKE
+#include "src/Cholesky/LLT_MKL.h"
+#endif

 #include "src/Core/util/ReenableStupidWarnings.h"


--- a/ThirdParty/Numerical/Eigen/CholmodSupport
+++ b/ThirdParty/Numerical/Eigen/CholmodSupport
+#ifndef EIGEN_CHOLMODSUPPORT_MODULE_H
+#define EIGEN_CHOLMODSUPPORT_MODULE_H
+
+#include "SparseCore"
+
+#include "src/Core/util/DisableStupidWarnings.h"
+
+extern "C" {
+  #include <cholmod.h>
+}
+
+/** \ingroup Support_modules
+  * \defgroup CholmodSupport_Module CholmodSupport module
+  *
+  * This module provides an interface to the Cholmod library which is part of the <a href="http://www.cise.ufl.edu/research/sparse/SuiteSparse/">suitesparse</a> package.
+  * It provides the two following main factorization classes:
+  * - class CholmodSupernodalLLT: a supernodal LLT Cholesky factorization.
+  * - class CholmodDecomposiiton: a general L(D)LT Cholesky factorization with automatic or explicit runtime selection of the underlying factorization method (supernodal or simplicial).
+  *
+  * For the sake of completeness, this module also propose the two following classes:
+  * - class CholmodSimplicialLLT
+  * - class CholmodSimplicialLDLT
+  * Note that these classes does not bring any particular advantage compared to the built-in
+  * SimplicialLLT and SimplicialLDLT factorization classes.
+  *
+  * \code
+  * #include <Eigen/CholmodSupport>
+  * \endcode
+  *
+  * In order to use this module, the cholmod headers must be accessible from the include paths, and your binary must be linked to the cholmod library and its dependencies.
+  * The dependencies depend on how cholmod has been compiled.
+  * For a cmake based project, you can use our FindCholmod.cmake module to help you in this task.
+  *
+  */
+
+#include "src/misc/Solve.h"
+#include "src/misc/SparseSolve.h"
+
+#include "src/CholmodSupport/CholmodSupport.h"
+
+
+#include "src/Core/util/ReenableStupidWarnings.h"
+
+#endif // EIGEN_CHOLMODSUPPORT_MODULE_H
+
--- a/ThirdParty/Numerical/Eigen/Core
+++ b/ThirdParty/Numerical/Eigen/Core
@@ -4,24 +4,9 @@
 // Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.fr>
 // Copyright (C) 2007-2011 Benoit Jacob <jacob.benoit.1@gmail.com>
 //
-// Eigen is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 3 of the License, or (at your option) any later version.
-//
-// Alternatively, you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY
-// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License and a copy of the GNU General Public License along with
-// Eigen. If not, see <http://www.gnu.org/licenses/>.
+// This Source Code Form is subject to the terms of the Mozilla
+// Public License v. 2.0. If a copy of the MPL was not distributed
+// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.

 #ifndef EIGEN_CORE_H
 #define EIGEN_CORE_H
@@ -34,6 +19,12 @@
 // defined e.g. EIGEN_DONT_ALIGN) so it needs to be done before we do anything with vectorization.
 #include "src/Core/util/Macros.h"

+#include <complex>
+
+// this include file manages BLAS and MKL related macros
+// and inclusion of their respective header files
+#include "src/Core/util/MKL_support.h"
+
 // if alignment is disabled, then disable vectorization. Note: EIGEN_ALIGN is the proper check, it takes into
 // account both the user's will (EIGEN_DONT_ALIGN) and our own platform checks
 #if !EIGEN_ALIGN
@@ -136,7 +127,7 @@
 #endif

 // MSVC for windows mobile does not have the errno.h file
-#if !(defined(_MSC_VER) && defined(_WIN32_WCE))
+#if !(defined(_MSC_VER) && defined(_WIN32_WCE)) && !defined(__ARMCC_VERSION)
 #define EIGEN_HAS_ERRNO
 #endif

@@ -146,7 +137,6 @@
 #include <cstddef>
 #include <cstdlib>
 #include <cmath>
-#include <complex>
 #include <cassert>
 #include <functional>
 #include <iosfwd>
@@ -167,7 +157,7 @@
  #include <intrin.h>
 #endif

-#if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(EIGEN_NO_EXCEPTIONS)
+#if defined(_CPPUNWIND) || defined(__EXCEPTIONS)
  #define EIGEN_EXCEPTIONS
 #endif

@@ -175,9 +165,6 @@
  #include <new>
 #endif

-// defined in bits/termios.h
-#undef B0
-
 /** \brief Namespace containing all symbols from the %Eigen library. */
 namespace Eigen {

@@ -201,6 +188,8 @@ inline static const char *SimdInstructionSetsInUse(void) {
 #endif
 }

+} // end namespace Eigen
+
 #define STAGE10_FULL_EIGEN2_API             10
 #define STAGE20_RESOLVE_API_CONFLICTS       20
 #define STAGE30_FULL_EIGEN3_API             30
@@ -247,6 +236,10 @@ using std::ptrdiff_t;
  * \endcode
  */

+/** \defgroup Support_modules Support modules [category]
+  * Category of modules which add support for external libraries.
+  */
+
 #include "src/Core/util/Constants.h"
 #include "src/Core/util/ForwardDeclarations.h"
 #include "src/Core/util/Meta.h"
@@ -318,15 +311,15 @@ using std::ptrdiff_t;
 #include "src/Core/CommaInitializer.h"
 #include "src/Core/Flagged.h"
 #include "src/Core/ProductBase.h"
-#include "src/Core/Product.h"
+#include "src/Core/GeneralProduct.h"
 #include "src/Core/TriangularMatrix.h"
 #include "src/Core/SelfAdjointView.h"
-#include "src/Core/SolveTriangular.h"
+#include "src/Core/products/GeneralBlockPanelKernel.h"
 #include "src/Core/products/Parallelizer.h"
 #include "src/Core/products/CoeffBasedProduct.h"
-#include "src/Core/products/GeneralBlockPanelKernel.h"
 #include "src/Core/products/GeneralMatrixVector.h"
 #include "src/Core/products/GeneralMatrixMatrix.h"
+#include "src/Core/SolveTriangular.h"
 #include "src/Core/products/GeneralMatrixMatrixTriangular.h"
 #include "src/Core/products/SelfadjointMatrixVector.h"
 #include "src/Core/products/SelfadjointMatrixMatrix.h"
@@ -347,7 +340,20 @@ using std::ptrdiff_t;
 #include "src/Core/ArrayBase.h"
 #include "src/Core/ArrayWrapper.h"

-} // namespace Eigen
+#ifdef EIGEN_USE_BLAS
+#include "src/Core/products/GeneralMatrixMatrix_MKL.h"
+#include "src/Core/products/GeneralMatrixVector_MKL.h"
+#include "src/Core/products/GeneralMatrixMatrixTriangular_MKL.h"
+#include "src/Core/products/SelfadjointMatrixMatrix_MKL.h"
+#include "src/Core/products/SelfadjointMatrixVector_MKL.h"
+#include "src/Core/products/TriangularMatrixMatrix_MKL.h"
+#include "src/Core/products/TriangularMatrixVector_MKL.h"
+#include "src/Core/products/TriangularSolverMatrix_MKL.h"
+#endif // EIGEN_USE_BLAS
+
+#ifdef EIGEN_USE_MKL_VML
+#include "src/Core/Assign_MKL.h"
+#endif

 #include "src/Core/GlobalFunctions.h"


--- a/ThirdParty/Numerical/Eigen/Eigen2Support
+++ b/ThirdParty/Numerical/Eigen/Eigen2Support
@@ -3,24 +3,9 @@
 //
 // Copyright (C) 2009 Gael Guennebaud <gael.guennebaud@inria.fr>
 //
-// Eigen is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 3 of the License, or (at your option) any later version.
-//
-// Alternatively, you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY
-// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License and a copy of the GNU General Public License along with
-// Eigen. If not, see <http://www.gnu.org/licenses/>.
+// This Source Code Form is subject to the terms of the Mozilla
+// Public License v. 2.0. If a copy of the MPL was not distributed
+// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.

 #ifndef EIGEN2SUPPORT_H
 #define EIGEN2SUPPORT_H
@@ -31,9 +16,8 @@

 #include "src/Core/util/DisableStupidWarnings.h"

-namespace Eigen {
-
-/** \defgroup Eigen2Support_Module Eigen2 support module
+/** \ingroup Support_modules
+  * \defgroup Eigen2Support_Module Eigen2 support module
  * This module provides a couple of deprecated functions improving the compatibility with Eigen2.
  *
  * To use it, define EIGEN2_SUPPORT before including any Eigen header
@@ -56,13 +40,29 @@ namespace Eigen {
 #include "src/Eigen2Support/MathFunctions.h"


-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"

 // Eigen2 used to include iostream
 #include<iostream>

+#define EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, SizeSuffix) \
+using Eigen::Matrix##SizeSuffix##TypeSuffix; \
+using Eigen::Vector##SizeSuffix##TypeSuffix; \
+using Eigen::RowVector##SizeSuffix##TypeSuffix;
+
+#define EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(TypeSuffix) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 2) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 3) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, 4) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, X) \
+
+#define EIGEN_USING_MATRIX_TYPEDEFS \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(i) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(f) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(d) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(cf) \
+EIGEN_USING_MATRIX_TYPEDEFS_FOR_TYPE(cd)
+
 #define USING_PART_OF_NAMESPACE_EIGEN \
 EIGEN_USING_MATRIX_TYPEDEFS \
 using Eigen::Matrix; \

--- a/ThirdParty/Numerical/Eigen/Eigenvalues
+++ b/ThirdParty/Numerical/Eigen/Eigenvalues
@@ -9,8 +9,7 @@
 #include "Jacobi"
 #include "Householder"
 #include "LU"
-
-namespace Eigen {
+#include "Geometry"

 /** \defgroup Eigenvalues_Module Eigenvalues module
  *
@@ -35,8 +34,11 @@ namespace Eigen {
 #include "src/Eigenvalues/ComplexSchur.h"
 #include "src/Eigenvalues/ComplexEigenSolver.h"
 #include "src/Eigenvalues/MatrixBaseEigenvalues.h"
-
-} // namespace Eigen
+#ifdef EIGEN_USE_LAPACKE
+#include "src/Eigenvalues/RealSchur_MKL.h"
+#include "src/Eigenvalues/ComplexSchur_MKL.h"
+#include "src/Eigenvalues/SelfAdjointEigenSolver_MKL.h"
+#endif

 #include "src/Core/util/ReenableStupidWarnings.h"


--- a/ThirdParty/Numerical/Eigen/Geometry
+++ b/ThirdParty/Numerical/Eigen/Geometry
@@ -13,8 +13,6 @@
 #define M_PI 3.14159265358979323846
 #endif

-namespace Eigen {
-
 /** \defgroup Geometry_Module Geometry module
  *
  *
@@ -58,8 +56,6 @@ namespace Eigen {
 #include "src/Eigen2Support/Geometry/All.h"
 #endif

-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"

 #endif // EIGEN_GEOMETRY_MODULE_H

--- a/ThirdParty/Numerical/Eigen/Householder
+++ b/ThirdParty/Numerical/Eigen/Householder
@@ -5,8 +5,6 @@

 #include "src/Core/util/DisableStupidWarnings.h"

-namespace Eigen {
-
 /** \defgroup Householder_Module Householder module
  * This module provides Householder transformations.
  *
@@ -19,8 +17,6 @@ namespace Eigen {
 #include "src/Householder/HouseholderSequence.h"
 #include "src/Householder/BlockHouseholder.h"

-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"

 #endif // EIGEN_HOUSEHOLDER_MODULE_H

--- a/ThirdParty/Numerical/Eigen/IterativeLinearSolvers
+++ b/ThirdParty/Numerical/Eigen/IterativeLinearSolvers
+#ifndef EIGEN_ITERATIVELINEARSOLVERS_MODULE_H
+#define EIGEN_ITERATIVELINEARSOLVERS_MODULE_H
+
+#include "SparseCore"
+#include "OrderingMethods"
+
+#include "src/Core/util/DisableStupidWarnings.h"
+
+/** \ingroup Sparse_modules
+  * \defgroup IterativeLinearSolvers_Module IterativeLinearSolvers module
+  *
+  * This module currently provides iterative methods to solve problems of the form \c A \c x = \c b, where \c A is a squared matrix, usually very large and sparse.
+  * Those solvers are accessible via the following classes:
+  *  - ConjugateGradient for selfadjoint (hermitian) matrices,
+  *  - BiCGSTAB for general square matrices.
+  *
+  * These iterative solvers are associated with some preconditioners:
+  *  - IdentityPreconditioner - not really useful
+  *  - DiagonalPreconditioner - also called JAcobi preconditioner, work very well on diagonal dominant matrices.
+  *  - IncompleteILUT - incomplete LU factorization with dual thresholding
+  *
+  * Such problems can also be solved using the direct sparse decomposition modules: SparseCholesky, CholmodSupport, UmfPackSupport, SuperLUSupport.
+  *
+  * \code
+  * #include <Eigen/IterativeLinearSolvers>
+  * \endcode
+  */
+
+#include "src/misc/Solve.h"
+#include "src/misc/SparseSolve.h"
+
+#include "src/IterativeLinearSolvers/IterativeSolverBase.h"
+#include "src/IterativeLinearSolvers/BasicPreconditioners.h"
+#include "src/IterativeLinearSolvers/ConjugateGradient.h"
+#include "src/IterativeLinearSolvers/BiCGSTAB.h"
+#include "src/IterativeLinearSolvers/IncompleteLUT.h"
+
+#include "src/Core/util/ReenableStupidWarnings.h"
+
+#endif // EIGEN_ITERATIVELINEARSOLVERS_MODULE_H
--- a/ThirdParty/Numerical/Eigen/Jacobi
+++ b/ThirdParty/Numerical/Eigen/Jacobi
@@ -5,8 +5,6 @@

 #include "src/Core/util/DisableStupidWarnings.h"

-namespace Eigen {
-
 /** \defgroup Jacobi_Module Jacobi module
  * This module provides Jacobi and Givens rotations.
  *
@@ -21,8 +19,6 @@ namespace Eigen {

 #include "src/Jacobi/Jacobi.h"

-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"

 #endif // EIGEN_JACOBI_MODULE_H

--- a/ThirdParty/Numerical/Eigen/LU
+++ b/ThirdParty/Numerical/Eigen/LU
@@ -5,8 +5,6 @@

 #include "src/Core/util/DisableStupidWarnings.h"

-namespace Eigen {
-
 /** \defgroup LU_Module LU module
  * This module includes %LU decomposition and related notions such as matrix inversion and determinant.
  * This module defines the following MatrixBase methods:
@@ -23,6 +21,9 @@ namespace Eigen {
 #include "src/misc/Image.h"
 #include "src/LU/FullPivLU.h"
 #include "src/LU/PartialPivLU.h"
+#ifdef EIGEN_USE_LAPACKE
+#include "src/LU/PartialPivLU_MKL.h"
+#endif
 #include "src/LU/Determinant.h"
 #include "src/LU/Inverse.h"

@@ -34,8 +35,6 @@ namespace Eigen {
  #include "src/Eigen2Support/LU.h"
 #endif

-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"

 #endif // EIGEN_LU_MODULE_H

--- a/ThirdParty/Numerical/Eigen/LeastSquares
+++ b/ThirdParty/Numerical/Eigen/LeastSquares
@@ -15,8 +15,6 @@
 #include "Eigenvalues"
 #include "Geometry"

-namespace Eigen {
-
 /** \defgroup LeastSquares_Module LeastSquares module
  * This module provides linear regression and related features.
  *
@@ -27,8 +25,6 @@ namespace Eigen {

 #include "src/Eigen2Support/LeastSquares.h"

-} // namespace Eigen
-
 #include "src/Core/util/ReenableStupidWarnings.h"