Skip to content

Preparing for latest spectra version #23

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.

Sign up for GitHub

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

Open
jdbancal wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Preparing for latest spectra version #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
702001e
ignore gmp compiled files
jdbancal May 30, 2023
41e3672
typo
jdbancal May 30, 2023
066516b
Updating compile instructions to gmp and mpfr repositories
jdbancal May 30, 2023
8e10b7d
Updatin MOcov and MOxUnit to latest versions
jdbancal May 30, 2023
5017a94
don't ask for more eigenvalues than available
jdbancal May 30, 2023
ced4f76
submodule spectra update
jdbancal May 30, 2023
178ab9e
Spectra migration WIP
jdbancal May 30, 2023
dedba5d
Merge commit 'c0b419a76d809fc6765ef39a9e658e46b93e0370' into preparin…
jdbancal May 30, 2023
50bb7b0
submodule spectra updated
jdbancal Aug 15, 2023
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 external/spectra
Open in desktop
Submodule spectra updated 106 files
48 changes: 24 additions & 24 deletions src/gem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4271,16 +4271,16 @@ GmpEigenMatrix GmpEigenMatrix::eigs(const long int& nbEigenvalues, GmpEigenMatri
switch (type) {
case 1: {
// Construct eigen solver object, requesting desired eigenvalues
Spectra::SymEigsSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseSymMatProd<mpreal> > eigs(&op, nbEigenvalues, ncv);
Spectra::SymEigsSolver< Spectra::DenseSymMatProd<mpreal> > eigs(op, nbEigenvalues, ncv);

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::LARGEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::LargestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand All @@ -4300,16 +4300,16 @@ GmpEigenMatrix GmpEigenMatrix::eigs(const long int& nbEigenvalues, GmpEigenMatri
Spectra::DenseSymShiftSolve<mpreal> op(matrixR);

// Construct eigen solver object, requesting desired eigenvalues
Spectra::SymEigsShiftSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseSymShiftSolve<mpreal> > eigs(&op, nbEigenvalues, ncv, sigma.matrixR(0,0));
Spectra::SymEigsShiftSolver< Spectra::DenseSymShiftSolve<mpreal> > eigs(op, nbEigenvalues, ncv, sigma.matrixR(0,0));

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::SMALLEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::SmallestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand Down Expand Up @@ -4384,16 +4384,16 @@ GmpEigenMatrix GmpEigenMatrix::eigs(const long int& nbEigenvalues, GmpEigenMatri
Spectra::DenseGenMatProd<mpreal> op(matrixR);

// Construct eigen solver object, requesting desired eigenvalues
Spectra::GenEigsSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseGenMatProd<mpreal> > eigs(&op, nbEigenvalues, ncv);
Spectra::GenEigsSolver< Spectra::DenseGenMatProd<mpreal> > eigs(op, nbEigenvalues, ncv);

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::LARGEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::LargestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand All @@ -4419,16 +4419,16 @@ GmpEigenMatrix GmpEigenMatrix::eigs(const long int& nbEigenvalues, GmpEigenMatri
mpreal sigmaI(0);
if (sigma.isComplex)
sigmaI = sigma.matrixI(0,0);
Spectra::GenEigsComplexShiftSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseGenComplexShiftSolve<mpreal> > eigs(&op, nbEigenvalues, ncv, sigma.matrixR(0,0), sigmaI);
Spectra::GenEigsComplexShiftSolver< Spectra::DenseGenComplexShiftSolve<mpreal> > eigs(op, nbEigenvalues, ncv, sigma.matrixR(0,0), sigmaI);

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::SMALLEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::SmallestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand Down Expand Up @@ -4497,16 +4497,16 @@ GmpEigenMatrix& GmpEigenMatrix::eigs_new(const long int& nbEigenvalues, GmpEigen
switch (type) {
case 1: {
// Construct eigen solver object, requesting desired eigenvalues
Spectra::SymEigsSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseSymMatProd<mpreal> > eigs(&op, nbEigenvalues, ncv);
Spectra::SymEigsSolver< Spectra::DenseSymMatProd<mpreal> > eigs(op, nbEigenvalues, ncv);

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::LARGEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::LargestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand All @@ -4526,16 +4526,16 @@ GmpEigenMatrix& GmpEigenMatrix::eigs_new(const long int& nbEigenvalues, GmpEigen
Spectra::DenseSymShiftSolve<mpreal> op(matrixR);

// Construct eigen solver object, requesting desired eigenvalues
Spectra::SymEigsShiftSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseSymShiftSolve<mpreal> > eigs(&op, nbEigenvalues, ncv, sigma.matrixR(0,0));
Spectra::SymEigsShiftSolver< Spectra::DenseSymShiftSolve<mpreal> > eigs(op, nbEigenvalues, ncv, sigma.matrixR(0,0));

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::SMALLEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::SmallestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand Down Expand Up @@ -4610,16 +4610,16 @@ GmpEigenMatrix& GmpEigenMatrix::eigs_new(const long int& nbEigenvalues, GmpEigen
Spectra::DenseGenMatProd<mpreal> op(matrixR);

// Construct eigen solver object, requesting desired eigenvalues
Spectra::GenEigsSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseGenMatProd<mpreal> > eigs(&op, nbEigenvalues, ncv);
Spectra::GenEigsSolver< Spectra::DenseGenMatProd<mpreal> > eigs(op, nbEigenvalues, ncv);

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::LARGEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::LargestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand All @@ -4645,16 +4645,16 @@ GmpEigenMatrix& GmpEigenMatrix::eigs_new(const long int& nbEigenvalues, GmpEigen
mpreal sigmaI(0);
if (sigma.isComplex)
sigmaI = sigma.matrixI(0,0);
Spectra::GenEigsComplexShiftSolver< mpreal, Spectra::LARGEST_MAGN, Spectra::DenseGenComplexShiftSolve<mpreal> > eigs(&op, nbEigenvalues, ncv, sigma.matrixR(0,0), sigmaI);
Spectra::GenEigsComplexShiftSolver< Spectra::DenseGenComplexShiftSolve<mpreal> > eigs(op, nbEigenvalues, ncv, sigma.matrixR(0,0), sigmaI);

// Initialize and compute
eigs.init();
int maxIter(1000);
mpreal tolerance(pow(10,-mpfr::bits2digits(mpfr::mpreal::get_default_prec())));
int nconv = eigs.compute(maxIter, tolerance, Spectra::SMALLEST_MAGN);
int nconv = eigs.compute(Spectra::SortRule::LargestMagn, maxIter, tolerance, Spectra::SortRule::SmallestMagn);

// Check for error
if(eigs.info() != Spectra::SUCCESSFUL)
if(eigs.info() != Spectra::CompInfo::Successful)
mexErrMsgTxt("Eigenvalue decomposition failed.");

// Retrieve results
Expand Down
Loading