Commit ca93fcd7 authored by Dominik Thoennes's avatar Dominik Thoennes
Browse files

remove HYTEG_BUILD_WITH_EIGEN option since we ship it as a submodule anyway

parent 11984379
Pipeline #34475 passed with stages
in 95 minutes and 7 seconds
......@@ -4,7 +4,6 @@ PROJECT ( hyteg )
enable_testing()
option ( HYTEG_BUILD_WITH_PETSC "Build with PETSc" OFF)
option ( HYTEG_BUILD_WITH_EIGEN "Build with Eigen" OFF)
option ( HYTEG_BUILD_WITH_TRILINOS "Build with Trilinos" OFF)
option ( HYTEG_USE_GENERATED_KERNELS "Use generated pystencils kernels if available" ON)
option ( HYTEG_GIT_SUBMODULE_AUTO "Check submodules during build" ON)
......@@ -35,10 +34,8 @@ if ( HYTEG_BUILD_WITH_PETSC )
message(STATUS "WALBERLA_BUILD_WITH_MPI was force set to ON")
endif()
if ( HYTEG_BUILD_WITH_EIGEN )
include_directories ( ${EIGEN_DIR} )
link_directories ( ${EIGEN_DIR} )
endif()
include_directories ( ${EIGEN_DIR} )
link_directories ( ${EIGEN_DIR} )
if ( HYTEG_BUILD_WITH_TRILINOS)
find_package( Trilinos )
......
......@@ -81,10 +81,7 @@ Optional:
* [Eigen](http://eigen.tuxfamily.org "Eigen homepage") for some linear algebra operations
Eigen is, (like waLBerla) automatically cloned as a git submodule, but disabled by default.
To activate Eigen, simply set the cmake variable `HYTEG_BUILD_WITH_EIGEN` to `ON`, e.g. via:
`$ cmake ../hyteg -DHYTEG_BUILD_WITH_EIGEN=ON`
Eigen is, (like waLBerla) automatically cloned as a git submodule.
CMake will automatically find the Eigen submodule, there is no need to specify a path
or to download Eigen at all.
......
......@@ -46,15 +46,13 @@ waLBerla_add_executable( NAME refCellCouplingCount
FILES refCellCouplingCount.cpp
DEPENDS hyteg)
if( HYTEG_BUILD_WITH_EIGEN )
waLBerla_add_executable( NAME cg_P1_blending
FILES cg_P1_blending.cpp
DEPENDS hyteg)
waLBerla_add_executable( NAME gmg_blending
FILES gmg_blending.cpp
DEPENDS hyteg)
endif()
waLBerla_add_executable(NAME cg_P1_blending
FILES cg_P1_blending.cpp
DEPENDS hyteg)
waLBerla_add_executable(NAME gmg_blending
FILES gmg_blending.cpp
DEPENDS hyteg)
if( HYTEG_BUILD_WITH_PETSC )
waLBerla_add_executable( NAME exportOperatorMatrix
......
waLBerla_add_executable(NAME compareP1Stencils
FILES compareP1Stencils.cpp
DEPENDS hyteg)
if( HYTEG_BUILD_WITH_EIGEN )
waLBerla_add_executable(NAME PolynomialBlending
FILES PolynomialBlending.cpp
DEPENDS hyteg)
waLBerla_add_executable( NAME compareP1Stencils
FILES compareP1Stencils.cpp
DEPENDS hyteg)
waLBerla_add_executable(NAME VariableCoeffLaplace_Surrogates
FILES VariableCoeffLaplace_Surrogates.cpp
DEPENDS hyteg)
waLBerla_add_executable( NAME PolynomialBlending
FILES PolynomialBlending.cpp
DEPENDS hyteg)
waLBerla_add_executable( NAME VariableCoeffLaplace_Surrogates
FILES VariableCoeffLaplace_Surrogates.cpp
DEPENDS hyteg)
waLBerla_add_executable( NAME Stokes2d_Surrogates
FILES Stokes2d_Surrogates.cpp
DEPENDS hyteg)
endif()
waLBerla_add_executable(NAME Stokes2d_Surrogates
FILES Stokes2d_Surrogates.cpp
DEPENDS hyteg)
......@@ -23,6 +23,4 @@ if( HYTEG_BUILD_WITH_PETSC )
add_subdirectory(PetscCompare-3D-P1-Apply)
endif()
if( HYTEG_BUILD_WITH_EIGEN )
add_subdirectory(surrogates)
endif()
add_subdirectory(surrogates)
......@@ -2115,7 +2115,7 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = HYTEG_BUILD_WITH_EIGEN HYTEG_BUILD_WITH_PETSC
PREDEFINED = HYTEG_BUILD_WITH_PETSC
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
......
......@@ -20,7 +20,6 @@
#pragma once
#cmakedefine HYTEG_BUILD_WITH_PETSC
#cmakedefine HYTEG_BUILD_WITH_EIGEN
#cmakedefine HYTEG_BUILD_WITH_TRILINOS
#cmakedefine HYTEG_USE_GENERATED_KERNELS
......
......@@ -21,8 +21,4 @@
#include "hyteg/HytegDefinitions.hpp"
#ifdef HYTEG_BUILD_WITH_EIGEN
#include <Eigen/Dense>
#endif
\ No newline at end of file
......@@ -79,8 +79,6 @@ namespace hyteg {
return radius;
}
#ifdef HYTEG_BUILD_WITH_EIGEN
// =================================================================================================
/// \brief Computes estimates for the smallest and largest eigenvalue of a symmetric
......@@ -129,7 +127,5 @@ namespace hyteg {
upperBound = ev[numIts-1];
}
#endif // HYTEG_BUILD_WITH_EIGEN
} // namespace hyteg
......@@ -29,8 +29,6 @@
#include "hyteg/polynomial/LSQPInterpolator.hpp"
#include "hyteg/polynomial/PolynomialEvaluator.hpp"
#ifdef HYTEG_BUILD_WITH_EIGEN
namespace hyteg {
template < class P1Form, bool USE_INCREMENTAL_EVAL = true >
......@@ -454,5 +452,3 @@ typedef P1SurrogateOperator< forms::p1_div_k_grad_blending_q3 > P1SurrogateDivkG
typedef P1SurrogateOperator< forms::p1_div_k_grad_affine_q3 > P1SurrogateAffineDivkGradOperator;
} // namespace hyteg
#endif
......@@ -21,8 +21,6 @@
#include "hyteg/eigen/EigenWrapper.hpp"
#ifdef HYTEG_BUILD_WITH_EIGEN
#include "Polynomial.hpp"
namespace hyteg {
......@@ -188,5 +186,3 @@ class LSQPInterpolator3D
Eigen::Matrix<real_t, Eigen::Dynamic, Eigen::Dynamic> rhs;
};
}
#endif
\ No newline at end of file
......@@ -313,10 +313,8 @@ waLBerla_execute_test(NAME ElementwiseOperatorAdditiveApplyTest)
waLBerla_compile_test(FILES operators/DiagonalNonConstantOperatorTest.cpp DEPENDS hyteg core)
waLBerla_execute_test(NAME DiagonalNonConstantOperatorTest)
if( HYTEG_BUILD_WITH_EIGEN )
waLBerla_compile_test(FILES operators/P1SurrogateOperatorTest.cpp DEPENDS hyteg core)
waLBerla_execute_test(NAME P1SurrogateOperatorTest)
endif()
waLBerla_compile_test(FILES operators/P1SurrogateOperatorTest.cpp DEPENDS hyteg core)
waLBerla_execute_test(NAME P1SurrogateOperatorTest)
waLBerla_compile_test(FILES operators/ViscousOperatorsTest.cpp DEPENDS hyteg core)
waLBerla_execute_test(NAME ViscousOperatorsTest)
......@@ -689,11 +687,9 @@ waLBerla_compile_test(FILES functions/FunctionMultElementwiseTest.cpp DEPENDS hy
waLBerla_execute_test(NAME FunctionMultElementwiseTest)
## numeric tools ##
if( HYTEG_BUILD_WITH_EIGEN )
waLBerla_compile_test(FILES numerictools/SpectrumEstimationTest.cpp DEPENDS hyteg core)
waLBerla_execute_test(NAME SpectrumEstimationTest )
waLBerla_execute_test(NAME SpectrumEstimationTestMPI COMMAND $<TARGET_FILE:SpectrumEstimationTest> PROCESSES 3 )
endif()
## Form Evaluation ##
waLBerla_compile_test(FILES forms/HytegVsFenicsFormTest.cpp DEPENDS hyteg core)
......
......@@ -30,10 +30,6 @@
#include "hyteg/HytegDefinitions.hpp"
#ifndef HYTEG_BUILD_WITH_EIGEN
#error "This test only works with Eigen enabled. Please enable it via -DHYTEG_BUILD_WITH_EIGEN=ON"
#endif
#include "core/Environment.h"
#include "core/logging/Logging.h"
#include "core/math/Constants.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment