Skip to content

suppress warning re std::complex return by C-linkage LAPACK functions #367

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

Merged
merged 1 commit into from
Sep 1, 2022
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
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
- Boost.Container: header-only
- Boost.Test: header-only or (optionally) as a compiled library, *only used for unit testing*
- Boost.Range: header-only, *only used for unit testing*
- [BTAS](http://github.com/ValeevGroup/BTAS), tag 240b49b033864b34d74f2b8d6dd55f2ab524eae3 . If usable BTAS installation is not found, TiledArray will download and compile
- [BTAS](http://github.com/ValeevGroup/BTAS), tag f1d9eaeaf8f88f54defec991d34c7790c6c45bb2 . If usable BTAS installation is not found, TiledArray will download and compile
BTAS from source. *This is the recommended way to compile BTAS for all users*.
- [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag 66b199a08bf5f33b1565811fc202a051ec1b0fbb .
Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray.
Expand Down
4 changes: 2 additions & 2 deletions external/versions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ set(TA_TRACKED_MADNESS_PREVIOUS_TAG c0df7338779d06df7eaff31644d508940a7cfd90)
set(TA_TRACKED_MADNESS_VERSION 0.10.1)
set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)

set(TA_TRACKED_BTAS_TAG 240b49b033864b34d74f2b8d6dd55f2ab524eae3)
set(TA_TRACKED_BTAS_PREVIOUS_TAG ab866a760b72ff23053266bf46b87f19d3df44b7)
set(TA_TRACKED_BTAS_TAG f1d9eaeaf8f88f54defec991d34c7790c6c45bb2)
set(TA_TRACKED_BTAS_PREVIOUS_TAG 240b49b033864b34d74f2b8d6dd55f2ab524eae3)

set(TA_TRACKED_CUTT_TAG 0e8685bf82910bc7435835f846e88f1b39f47f09)
set(TA_TRACKED_CUTT_PREVIOUS_TAG 592198b93c93b7ca79e7900b9a9f2e79f9dafec3)
Expand Down
21 changes: 15 additions & 6 deletions src/TiledArray/math/linalg/rank-local.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@
#include <TiledArray/external/eigen.h>
#include <TiledArray/math/linalg/forward.h>

#if defined(LAPACK_COMPLEX_CPP)
TILEDARRAY_PRAGMA_CLANG(diagnostic push)
TILEDARRAY_PRAGMA_CLANG(diagnostic ignored "-Wreturn-type-c-linkage")
#endif // defined(LAPACK_COMPLEX_CPP)

#include <lapack.hh>

#if defined(LAPACK_COMPLEX_CPP)
TILEDARRAY_PRAGMA_CLANG(diagnostic pop)
#endif // defined(LAPACK_COMPLEX_CPP)

#include <vector>

namespace TiledArray::math::linalg::rank_local {
Expand Down Expand Up @@ -39,13 +48,13 @@ template <typename T>
void heig(Matrix<T> &A, Matrix<T> &B, std::vector<T> &W);

template <typename T>
void svd(Job jobu, Job jobvt, Matrix<T> &A, std::vector<T> &S, Matrix<T> *U, Matrix<T> *VT);
void svd(Job jobu, Job jobvt, Matrix<T> &A, std::vector<T> &S, Matrix<T> *U,
Matrix<T> *VT);

template <typename T>
void svd(Matrix<T> &A, std::vector<T> &S, Matrix<T> *U, Matrix<T> *VT) {
svd( U ? Job::SomeVec : Job::NoVec,
VT ? Job::SomeVec : Job::NoVec,
A, S, U, VT );
svd(U ? Job::SomeVec : Job::NoVec, VT ? Job::SomeVec : Job::NoVec, A, S, U,
VT);
}

template <typename T>
Expand All @@ -54,8 +63,8 @@ void lu_solve(Matrix<T> &A, Matrix<T> &B);
template <typename T>
void lu_inv(Matrix<T> &A);

template <bool QOnly,typename T>
void householder_qr( Matrix<T> &V, Matrix<T> &R );
template <bool QOnly, typename T>
void householder_qr(Matrix<T> &V, Matrix<T> &R);

} // namespace TiledArray::math::linalg::rank_local

Expand Down