mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-08-13 20:26:03 +08:00
added an *optional* Eigen2 dynamic library.
it allows the possiblity to save some compilation time by linking to it *and* defining the token EIGEN_EXTERN_INSTANCIATIONS
This commit is contained in:
parent
fcf4457b78
commit
64169389ed
@ -1,5 +1,7 @@
|
|||||||
PROJECT(Eigen)
|
PROJECT(Eigen)
|
||||||
|
|
||||||
|
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
|
||||||
|
|
||||||
OPTION(BUILD_TESTS "Build tests" OFF)
|
OPTION(BUILD_TESTS "Build tests" OFF)
|
||||||
OPTION(BUILD_DOC "Build documentation and examples" OFF)
|
OPTION(BUILD_DOC "Build documentation and examples" OFF)
|
||||||
|
|
||||||
|
@ -1,4 +1,10 @@
|
|||||||
SET(Eigen_SRCS Core CoreDeclarations LU Cholesky QR)
|
SET(Eigen_HEADERS Core CoreDeclarations LU Cholesky QR)
|
||||||
|
|
||||||
|
SET(Eigen_SRCS
|
||||||
|
src/Core/CoreInstanciations.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
ADD_LIBRARY(Eigen2 ${Eigen_SRCS})
|
||||||
|
|
||||||
SET(INCLUDE_INSTALL_DIR
|
SET(INCLUDE_INSTALL_DIR
|
||||||
"${CMAKE_INSTALL_PREFIX}/include/eigen2"
|
"${CMAKE_INSTALL_PREFIX}/include/eigen2"
|
||||||
@ -6,9 +12,14 @@ SET(INCLUDE_INSTALL_DIR
|
|||||||
"The directory where we install the header files"
|
"The directory where we install the header files"
|
||||||
FORCE)
|
FORCE)
|
||||||
|
|
||||||
INSTALL(FILES
|
INSTALL(FILES
|
||||||
${Eigen_SRCS}
|
${Eigen_HEADERS}
|
||||||
DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen
|
DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen
|
||||||
)
|
)
|
||||||
|
|
||||||
|
INSTALL(TARGETS Eigen2
|
||||||
|
RUNTIME DESTINATION bin
|
||||||
|
LIBRARY DESTINATION lib
|
||||||
|
ARCHIVE DESTINATION lib)
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(src)
|
ADD_SUBDIRECTORY(src)
|
@ -37,7 +37,6 @@ namespace Eigen {
|
|||||||
#include "src/Core/CwiseUnaryOp.h"
|
#include "src/Core/CwiseUnaryOp.h"
|
||||||
#include "src/Core/CwiseNullaryOp.h"
|
#include "src/Core/CwiseNullaryOp.h"
|
||||||
#include "src/Core/InverseProduct.h"
|
#include "src/Core/InverseProduct.h"
|
||||||
#include "src/Core/CacheFriendlyProduct.h"
|
|
||||||
#include "src/Core/Product.h"
|
#include "src/Core/Product.h"
|
||||||
#include "src/Core/Block.h"
|
#include "src/Core/Block.h"
|
||||||
#include "src/Core/Minor.h"
|
#include "src/Core/Minor.h"
|
||||||
@ -55,6 +54,10 @@ namespace Eigen {
|
|||||||
#include "src/Core/Extract.h"
|
#include "src/Core/Extract.h"
|
||||||
#include "src/Core/Part.h"
|
#include "src/Core/Part.h"
|
||||||
|
|
||||||
|
#ifndef EIGEN_EXTERN_INSTANCIATIONS
|
||||||
|
#include "src/Core/CacheFriendlyProduct.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
} // namespace Eigen
|
} // namespace Eigen
|
||||||
|
|
||||||
#endif // EIGEN_CORE_H
|
#endif // EIGEN_CORE_H
|
||||||
|
@ -349,5 +349,4 @@ static void ei_cache_friendly_product(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif // EIGEN_CACHE_FRIENDLY_PRODUCT_H
|
#endif // EIGEN_CACHE_FRIENDLY_PRODUCT_H
|
||||||
|
47
Eigen/src/Core/CoreInstanciations.cpp
Normal file
47
Eigen/src/Core/CoreInstanciations.cpp
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
// This file is part of Eigen, a lightweight C++ template library
|
||||||
|
// for linear algebra. Eigen itself is part of the KDE project.
|
||||||
|
//
|
||||||
|
// Copyright (C) 2008 Gael Guennebaud <g.gael@free.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/>.
|
||||||
|
|
||||||
|
#ifdef EIGEN_EXTERN_INSTANCIATIONS
|
||||||
|
#undef EIGEN_EXTERN_INSTANCIATIONS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "../../Core"
|
||||||
|
|
||||||
|
namespace Eigen
|
||||||
|
{
|
||||||
|
|
||||||
|
#define EIGEN_INSTANCIATE_PRODUCT(TYPE) \
|
||||||
|
template static void ei_cache_friendly_product<TYPE>( \
|
||||||
|
int _rows, int _cols, int depth, \
|
||||||
|
bool _lhsRowMajor, const TYPE* _lhs, int _lhsStride, \
|
||||||
|
bool _rhsRowMajor, const TYPE* _rhs, int _rhsStride, \
|
||||||
|
bool resRowMajor, TYPE* res, int resStride)
|
||||||
|
|
||||||
|
EIGEN_INSTANCIATE_PRODUCT(float);
|
||||||
|
EIGEN_INSTANCIATE_PRODUCT(double);
|
||||||
|
EIGEN_INSTANCIATE_PRODUCT(int);
|
||||||
|
EIGEN_INSTANCIATE_PRODUCT(std::complex<float>);
|
||||||
|
EIGEN_INSTANCIATE_PRODUCT(std::complex<double>);
|
||||||
|
|
||||||
|
}
|
@ -75,6 +75,13 @@ template<typename Scalar> struct ei_scalar_min_op;
|
|||||||
template<typename Scalar> struct ei_scalar_max_op;
|
template<typename Scalar> struct ei_scalar_max_op;
|
||||||
template<typename Scalar> struct ei_scalar_random_op;
|
template<typename Scalar> struct ei_scalar_random_op;
|
||||||
|
|
||||||
|
template<typename Scalar>
|
||||||
|
static void ei_cache_friendly_product(
|
||||||
|
int _rows, int _cols, int depth,
|
||||||
|
bool _lhsRowMajor, const Scalar* _lhs, int _lhsStride,
|
||||||
|
bool _rhsRowMajor, const Scalar* _rhs, int _rhsStride,
|
||||||
|
bool resRowMajor, Scalar* res, int resStride);
|
||||||
|
|
||||||
template<typename ExpressionType, bool CheckExistence = true> class Inverse;
|
template<typename ExpressionType, bool CheckExistence = true> class Inverse;
|
||||||
template<typename MatrixType> class QR;
|
template<typename MatrixType> class QR;
|
||||||
|
|
||||||
|
@ -53,6 +53,8 @@ MACRO(EI_ADD_TEST testname)
|
|||||||
|
|
||||||
EI_ADD_TARGET_PROPERTY(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_FUNC=${testname}")
|
EI_ADD_TARGET_PROPERTY(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_FUNC=${testname}")
|
||||||
|
|
||||||
|
target_link_libraries(${targetname} Eigen2)
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
ADD_TEST(${testname} "${targetname}")
|
ADD_TEST(${testname} "${targetname}")
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
@ -64,6 +66,8 @@ ENDMACRO(EI_ADD_TEST)
|
|||||||
|
|
||||||
ENABLE_TESTING()
|
ENABLE_TESTING()
|
||||||
|
|
||||||
|
ADD_DEFINITIONS("-DEIGEN_EXTERN_INSTANCIATION=1")
|
||||||
|
|
||||||
EI_ADD_TEST(basicstuff)
|
EI_ADD_TEST(basicstuff)
|
||||||
EI_ADD_TEST(linearstructure)
|
EI_ADD_TEST(linearstructure)
|
||||||
EI_ADD_TEST(cwiseop)
|
EI_ADD_TEST(cwiseop)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user