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

Remove dead code in crout #3060

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
67 changes: 20 additions & 47 deletions src/coreneuron/sim/scopmath/crout_thread.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,56 +132,29 @@ inline void nrn_scopmath_solve_thread(int n,
int* y,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
int* y,
int* /* y */,

given the large number of macros, it's very hard to know if y is really used or not.

_threadargsproto_) {
/* Perform forward substitution with pivoting */
// if (y) { // pgacc bug. nullptr on cpu but not on GPU
if (0) {
for (int i = 0; i < n; i++) {
int pivot = perm[scopmath_crout_ix(i)];
double sum = 0.0;
for (int j = 0; j < i; j++)
sum += a[pivot][scopmath_crout_ix(j)] * (scopmath_crout_y(j));
scopmath_crout_y(i) = (scopmath_crout_b(pivot) - sum) / a[pivot][scopmath_crout_ix(i)];
}

/*
* Note that the y vector is already in the correct order for back
* substitution. Perform back substitution, pivoting the matrix but not
* the y vector. There is no need to divide by the diagonal element as
* this is assumed to be unity.
*/

for (int i = n - 1; i >= 0; i--) {
int pivot = perm[scopmath_crout_ix(i)];
double sum = 0.0;
for (int j = i + 1; j < n; j++)
sum += a[pivot][scopmath_crout_ix(j)] * (scopmath_crout_y(j));
scopmath_crout_y(i) -= sum;
}
} else {
for (int i = 0; i < n; i++) {
int pivot = perm[scopmath_crout_ix(i)];
double sum = 0.0;
if (i > 0) { // pgacc bug. with i==0 the following loop executes once
for (int j = 0; j < i; j++) {
sum += a[pivot][scopmath_crout_ix(j)] * (p[scopmath_crout_ix(j)]);
}
for (int i = 0; i < n; i++) {
int pivot = perm[scopmath_crout_ix(i)];
double sum = 0.0;
if (i > 0) { // pgacc bug. with i==0 the following loop executes once
for (int j = 0; j < i; j++) {
sum += a[pivot][scopmath_crout_ix(j)] * (p[scopmath_crout_ix(j)]);
}
p[scopmath_crout_ix(i)] = (scopmath_crout_b(pivot) - sum) /
a[pivot][scopmath_crout_ix(i)];
}
p[scopmath_crout_ix(i)] = (scopmath_crout_b(pivot) - sum) / a[pivot][scopmath_crout_ix(i)];
}

/*
* Note that the y vector is already in the correct order for back
* substitution. Perform back substitution, pivoting the matrix but not
* the y vector. There is no need to divide by the diagonal element as
* this is assumed to be unity.
*/
for (int i = n - 1; i >= 0; i--) {
int pivot = perm[scopmath_crout_ix(i)];
double sum = 0.0;
for (int j = i + 1; j < n; j++)
sum += a[pivot][scopmath_crout_ix(j)] * (p[scopmath_crout_ix(j)]);
p[scopmath_crout_ix(i)] -= sum;
}
/*
* Note that the y vector is already in the correct order for back
* substitution. Perform back substitution, pivoting the matrix but not
* the y vector. There is no need to divide by the diagonal element as
Comment on lines +146 to +149
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't figure out what these sentences what to convey. Maybe they should be updated along with the doc string of the function.

* this is assumed to be unity.
*/
for (int i = n - 1; i >= 0; i--) {
int pivot = perm[scopmath_crout_ix(i)];
double sum = 0.0;
for (int j = i + 1; j < n; j++)
sum += a[pivot][scopmath_crout_ix(j)] * (p[scopmath_crout_ix(j)]);
p[scopmath_crout_ix(i)] -= sum;
}
}
#undef scopmath_crout_b
Expand Down
Loading