Skip to content

Fix incorrect #ifdef A && B usage #10

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

Closed
certik wants to merge 1 commit into from
Closed

Fix incorrect #ifdef A && B usage #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/formal/vector_1D_s.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ pure function premultiply_diagonal(d,A) result(DA)

allocate(DA, mold=A)

#ifdef HAVE_DO_CONCURRENT_TYPE_SPEC_SUPPORT && HAVE_LOCALITY_SPECIFIER_SUPPORT
#if defined(HAVE_DO_CONCURRENT_TYPE_SPEC_SUPPORT) && defined(HAVE_LOCALITY_SPECIFIER_SUPPORT)
Copy link
Contributor Author

@certik certik Feb 25, 2026

Choose a reason for hiding this comment

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

Actually what was likely intended is:

Suggested change
#if defined(HAVE_DO_CONCURRENT_TYPE_SPEC_SUPPORT) && defined(HAVE_LOCALITY_SPECIFIER_SUPPORT)
#if HAVE_DO_CONCURRENT_TYPE_SPEC_SUPPORT && HAVE_LOCALITY_SPECIFIER_SUPPORT

@rouson can you clarify?

Copy link
Contributor Author

@certik certik Feb 25, 2026

Choose a reason for hiding this comment

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

I am pretty sure this is the correct fix: #11.

do concurrent(integer :: row = 1 : size(A,1)) default(none) shared(d, A, DA)
DA(row,:) = d(row) * A(row,:)
end do
Expand All @@ -173,7 +173,7 @@ pure function postmultiply_diagonal(A,d) result(AD)

allocate(AD, mold=A)

#ifdef HAVE_DO_CONCURRENT_TYPE_SPEC_SUPPORT && HAVE_LOCALITY_SPECIFIER_SUPPORT
#if defined(HAVE_DO_CONCURRENT_TYPE_SPEC_SUPPORT) && defined(HAVE_LOCALITY_SPECIFIER_SUPPORT)
do concurrent(integer :: column = 1 : size(A,2)) default(none) shared(d, A, AD)
AD(:,column) = A(:,column) * d(column)
end do
Expand Down