-
Notifications
You must be signed in to change notification settings - Fork 119
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
JCGoran
wants to merge
1
commit into
master
Choose a base branch
from
jelic/remove_dead_code
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -132,56 +132,29 @@ inline void nrn_scopmath_solve_thread(int n, | |
int* y, | ||
_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
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
given the large number of macros, it's very hard to know if
y
is really used or not.