From 64169389edb9f852bd7fabe15b4cc1ba909a9796 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Sat, 31 May 2008 23:21:49 +0000 Subject: [PATCH] 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 --- CMakeLists.txt | 2 + Eigen/CMakeLists.txt | 17 ++++++-- Eigen/Core | 5 ++- Eigen/src/Core/CacheFriendlyProduct.h | 1 - Eigen/src/Core/CoreInstanciations.cpp | 47 +++++++++++++++++++++++ Eigen/src/Core/util/ForwardDeclarations.h | 7 ++++ test/CMakeLists.txt | 4 ++ 7 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 Eigen/src/Core/CoreInstanciations.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 95a8a2311..a4aaee03b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ PROJECT(Eigen) +CMAKE_MINIMUM_REQUIRED(VERSION 2.4) + OPTION(BUILD_TESTS "Build tests" OFF) OPTION(BUILD_DOC "Build documentation and examples" OFF) diff --git a/Eigen/CMakeLists.txt b/Eigen/CMakeLists.txt index 773344119..e4eec9976 100644 --- a/Eigen/CMakeLists.txt +++ b/Eigen/CMakeLists.txt @@ -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 "${CMAKE_INSTALL_PREFIX}/include/eigen2" @@ -6,9 +12,14 @@ SET(INCLUDE_INSTALL_DIR "The directory where we install the header files" FORCE) -INSTALL(FILES - ${Eigen_SRCS} +INSTALL(FILES + ${Eigen_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen ) +INSTALL(TARGETS Eigen2 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + ADD_SUBDIRECTORY(src) \ No newline at end of file diff --git a/Eigen/Core b/Eigen/Core index f3e6b1fcc..0e5f82c63 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -37,7 +37,6 @@ namespace Eigen { #include "src/Core/CwiseUnaryOp.h" #include "src/Core/CwiseNullaryOp.h" #include "src/Core/InverseProduct.h" -#include "src/Core/CacheFriendlyProduct.h" #include "src/Core/Product.h" #include "src/Core/Block.h" #include "src/Core/Minor.h" @@ -55,6 +54,10 @@ namespace Eigen { #include "src/Core/Extract.h" #include "src/Core/Part.h" +#ifndef EIGEN_EXTERN_INSTANCIATIONS +#include "src/Core/CacheFriendlyProduct.h" +#endif + } // namespace Eigen #endif // EIGEN_CORE_H diff --git a/Eigen/src/Core/CacheFriendlyProduct.h b/Eigen/src/Core/CacheFriendlyProduct.h index 5e5d075b1..4a0e4e24a 100644 --- a/Eigen/src/Core/CacheFriendlyProduct.h +++ b/Eigen/src/Core/CacheFriendlyProduct.h @@ -349,5 +349,4 @@ static void ei_cache_friendly_product( } } - #endif // EIGEN_CACHE_FRIENDLY_PRODUCT_H diff --git a/Eigen/src/Core/CoreInstanciations.cpp b/Eigen/src/Core/CoreInstanciations.cpp new file mode 100644 index 000000000..c5a0ba522 --- /dev/null +++ b/Eigen/src/Core/CoreInstanciations.cpp @@ -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 +// +// 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 . + +#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( \ + 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); +EIGEN_INSTANCIATE_PRODUCT(std::complex); + +} diff --git a/Eigen/src/Core/util/ForwardDeclarations.h b/Eigen/src/Core/util/ForwardDeclarations.h index 9fa3718d3..d48d4c325 100644 --- a/Eigen/src/Core/util/ForwardDeclarations.h +++ b/Eigen/src/Core/util/ForwardDeclarations.h @@ -75,6 +75,13 @@ template struct ei_scalar_min_op; template struct ei_scalar_max_op; template struct ei_scalar_random_op; +template +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 class Inverse; template class QR; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a363d301e..c2c2bf08b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -53,6 +53,8 @@ MACRO(EI_ADD_TEST testname) EI_ADD_TARGET_PROPERTY(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_FUNC=${testname}") + target_link_libraries(${targetname} Eigen2) + IF(WIN32) ADD_TEST(${testname} "${targetname}") ELSE(WIN32) @@ -64,6 +66,8 @@ ENDMACRO(EI_ADD_TEST) ENABLE_TESTING() +ADD_DEFINITIONS("-DEIGEN_EXTERN_INSTANCIATION=1") + EI_ADD_TEST(basicstuff) EI_ADD_TEST(linearstructure) EI_ADD_TEST(cwiseop)