diff options
| author |  Antonio Sanchez <cantonios@google.com> | 2021-02-19 14:17:10 -0800 |
|---|---|---|
| committer | Antonio Sánchez <cantonios@google.com> | 2021-02-19 22:26:56 +0000 |
| commit | 5f9cfb25294289730a78a2a3dcfbce3f36252422 (patch) | |
| tree | baccc94dac9f28324f89a51da6d91a0a13e6e07f | |
| parent | ce4af0b38f5b71c327689f8bbb37e3a0da3b8927 (diff) | |
Add missing adolc isinf/isnan.
Also modified cmake/FindAdolc.cmake to eliminate warnings, and added
search paths to match install layout.
Fixed: #2157
| -rw-r--r-- | cmake/FindAdolc.cmake | 14 | ||||
| -rw-r--r-- | unsupported/Eigen/AdolcForward | 3 | ||||
| -rw-r--r-- | unsupported/test/CMakeLists.txt | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/cmake/FindAdolc.cmake b/cmake/FindAdolc.cmake index 374af76aa..13c59fcf7 100644 --- a/cmake/FindAdolc.cmake +++ b/cmake/FindAdolc.cmake @@ -4,17 +4,17 @@ if (ADOLC_INCLUDES AND ADOLC_LIBRARIES) endif () find_path(ADOLC_INCLUDES - NAMES - adolc/adtl.h - PATHS - $ENV{ADOLCDIR} - ${INCLUDE_INSTALL_DIR} + NAMES adolc/adtl.h + PATHS $ENV{ADOLCDIR} $ENV{ADOLCDIR}/include ${INCLUDE_INSTALL_DIR} ) -find_library(ADOLC_LIBRARIES adolc PATHS $ENV{ADOLCDIR} ${LIB_INSTALL_DIR}) +find_library(ADOLC_LIBRARIES + adolc + PATHS $ENV{ADOLCDIR} ${LIB_INSTALL_DIR} + PATH_SUFFIXES lib lib64) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(ADOLC DEFAULT_MSG +find_package_handle_standard_args(Adolc DEFAULT_MSG ADOLC_INCLUDES ADOLC_LIBRARIES) mark_as_advanced(ADOLC_INCLUDES ADOLC_LIBRARIES) diff --git a/unsupported/Eigen/AdolcForward b/unsupported/Eigen/AdolcForward index 9b8d3cd1a..56caeaebf 100644 --- a/unsupported/Eigen/AdolcForward +++ b/unsupported/Eigen/AdolcForward @@ -74,6 +74,9 @@ inline adouble imag(const adouble&) { return 0.; } inline adouble abs(const adouble& x) { return fabs(x); } inline adouble abs2(const adouble& x) { return x*x; } +inline bool (isinf)(const adouble& x) { return (Eigen::numext::isinf)(x.getValue()); } +inline bool (isnan)(const adouble& x) { return (Eigen::numext::isnan)(x.getValue()); } + } namespace Eigen { diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 6bbcf50d5..34aa47d4a 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -23,7 +23,7 @@ endif() find_package(Adolc) -if(ADOLC_FOUND) +if(Adolc_FOUND) include_directories(${ADOLC_INCLUDES}) ei_add_property(EIGEN_TESTED_BACKENDS "Adolc, ") if(EIGEN_TEST_CXX11) |