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.

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

Jump to bottom

nonlinz.cpp: use eigen instead of sparse13 #2623

Merged
merged 20 commits into from
Jan 16, 2024
Merged

nonlinz.cpp: use eigen instead of sparse13 #2623

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9181bf2
nrnlinz.cpp: use eigen instead of sparse13
alkino Nov 30, 2023
3dec296
To complex
alkino Dec 1, 2023
ad31550
formatting.
1uc Dec 1, 2023
6e249c2
Fix
alkino Dec 1, 2023
9c5e210
Simplifications and errors
alkino Dec 4, 2023
c27defa
Format
alkino Dec 4, 2023
76b7e84
decltype is broken with nvhpc
alkino Dec 6, 2023
f53ba21
Simplify
alkino Dec 6, 2023
624c7dd
Remove all RowMajor
alkino Dec 7, 2023
e430c8d
Merge branch 'master' into cornu/sparse13_nrnlinz
alkino Dec 12, 2023
fb2a698
Avoid a useless copy
alkino Dec 12, 2023
769483a
Merge branch 'master' into cornu/sparse13_nrnlinz
alkino Dec 12, 2023
e06535b
No more complex sparse13 after that
alkino Dec 13, 2023
b895c2f
Add Success for silence warnings
alkino Dec 13, 2023
a8f33b3
Format + sonar
alkino Dec 13, 2023
bc5c51c
Merge branch 'master' into cornu/sparse13_nrnlinz
alkino Dec 18, 2023
27af30a
Follow review
alkino Dec 18, 2023
532b8c6
Remove final
alkino Dec 19, 2023
7312380
More doc
alkino Dec 19, 2023
5f3bf6d
Merge branch 'master' into cornu/sparse13_nrnlinz
alkino Jan 15, 2024
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
8 changes: 4 additions & 4 deletions src/nrniv/nonlinz.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class NonLinImpRep final {
void dsds();
int gapsolve();

Eigen::SparseMatrix<std::complex<double>, Eigen::RowMajor> m_{};
std::unique_ptr<Eigen::SparseLU<decltype(m_)>> lu_{};
Eigen::SparseMatrix<std::complex<double>> m_{};
std::unique_ptr<Eigen::SparseLU<Eigen::SparseMatrix<std::complex<double>>>> lu_{};
alkino marked this conversation as resolved.
Show resolved Hide resolved
int scnt_; // structure_change
int n_v_, n_ext_, n_lin_, n_ode_, neq_v_, neq_;
std::vector<neuron::container::data_handle<double>> pv_, pvdot_;
Expand Down Expand Up @@ -146,8 +146,8 @@ void NonLinImp::compute(double omega, double deltafac, int maxiter) {
// Now that the matrix is filled we can compressed it (mandatory for SparseLU)
alkino marked this conversation as resolved.
Show resolved Hide resolved
rep_->m_.makeCompressed();

rep_->lu_ = std::make_unique<Eigen::SparseLU<decltype(rep_->m_)>>(rep_->m_);
rep_->lu_->compute(rep_->m_);
rep_->lu_ = std::make_unique<Eigen::SparseLU<Eigen::SparseMatrix<std::complex<double>>>>(
rep_->m_);
auto info = rep_->lu_->info();
switch (info) {
case Eigen::NumericalIssue:
Expand Down