Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add compatibility for older Eigen and Boost #10

Merged
merged 1 commit into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions c++/triqs_Nevanlinna/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,25 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING

# ========= Library Dependencies ==========

find_package (Eigen3 3.4 REQUIRED CONFIG)
find_package(Eigen3 REQUIRED CONFIG)
target_link_libraries(${PROJECT_NAME}_c PUBLIC Eigen3::Eigen)

find_package(Boost 1.73 REQUIRED)
# Prior to Eigen 3.4, the template Eigen::internal::result_of attempts to use
# std::result_of which was removed in C++20 in favor of
# std::invoke_result. However, Eigen also has its own implementation of
# result_of which can be used by simply defining the macro
# EIGEN_HAS_STD_RESULT_OF=0. It doesn't interfere with newer versions of
# Eigen. These will still use std::invoke_result because guarded by yet another
# feature macro.
# https://gitlab.com/libeigen/eigen/-/commit/a31effc3bca2f0924752caeebfd6f61f7edf9a43
target_compile_definitions(${PROJECT_NAME}_c PUBLIC EIGEN_HAS_STD_RESULT_OF=0)
hmenke marked this conversation as resolved.
Show resolved Hide resolved

find_package(Boost REQUIRED)
target_link_libraries(${PROJECT_NAME}_c PUBLIC Boost::boost)
# There is a usage of std::unary_function (remove in C++17) in Boost
# container_hash that is not correctly guarded before Boost 1.73.0, because
# _HAS_AUTO_PTR_ETC only exists in MSVC (as far as I can tell).
# https://github.com/boostorg/container_hash/commit/90a0e3663875973909f77062dc274081bf32dc0d
target_compile_definitions(${PROJECT_NAME}_c PUBLIC _HAS_AUTO_PTR_ETC=0)
hmenke marked this conversation as resolved.
Show resolved Hide resolved

find_package(OpenMP REQUIRED COMPONENTS CXX)
target_link_libraries(${PROJECT_NAME}_c PUBLIC OpenMP::OpenMP_CXX)
Expand Down
2 changes: 1 addition & 1 deletion c++/triqs_Nevanlinna/Caratheodory_kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace triqs_Nevanlinna {
}
auto eigenvalues = Pick.eigenvalues();
auto pick_eigenvalues = nda::vector<double>(nw * N);
std::transform(eigenvalues.begin(), eigenvalues.end(), pick_eigenvalues.begin(), [](const std::complex<double> &r) { return r.real(); });
std::transform(eigenvalues.data(), eigenvalues.data() + eigenvalues.size(), pick_eigenvalues.begin(), [](const std::complex<double> &r) { return r.real(); });
return pick_eigenvalues;
}

Expand Down
2 changes: 1 addition & 1 deletion c++/triqs_Nevanlinna/Nevanlinna_factorization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace triqs_Nevanlinna {
}
auto evals = Pick.eigenvalues();
auto Pick_eigenvalues = nda::vector<double>(M);
std::transform(evals.begin(), evals.end(), Pick_eigenvalues.begin(), [](const std::complex<double> &r) { return r.real(); });
std::transform(evals.data(), evals.data() + evals.size(), Pick_eigenvalues.begin(), [](const std::complex<double> &r) { return r.real(); });
return Pick_eigenvalues;
}

Expand Down
1 change: 0 additions & 1 deletion test/c++/complex_math_test.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <nda/gtest_tools.hpp>
#include <triqs_Nevanlinna/types.hpp>
#include <boost/multiprecision/cpp_complex.hpp>
#include <Eigen/Dense>

using namespace triqs_Nevanlinna;
Expand Down
Loading