Skip to content

Fix Cray GPU routine macros: INLINENEVER directive and cray_inline scoping #1406

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
sbryngelson wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −3
Open

Fix Cray GPU routine macros: INLINENEVER directive and cray_inline scoping #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1bfa9f
Fix Cray compiler GPU routine macros: INLINENEVER directive and cray_…
sbryngelson May 6, 2026
ee97ba7
Fix cray_inline: don't emit INLINEALWAYS on non-Cray OpenACC builds
sbryngelson May 7, 2026
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: 3 additions & 1 deletion src/common/include/parallel_macros.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@
#:if not isinstance(function_name, str)
#:stop "When using cray_noinline, function name must be given and given as a string"
#:endif
#:set cray_noinline_directive = ('!DIR$ NOINLINE ' + function_name).strip('\n')
#:set cray_noinline_directive = ('!DIR$ INLINENEVER ' + function_name).strip('\n')
#ifdef _CRAYFTN
#if MFC_OpenACC
$:acc_directive
$:cray_noinline_directive
#elif MFC_OpenMP
$:omp_directive
#else
Expand All @@ -91,6 +92,7 @@
#ifdef _CRAYFTN
#if MFC_OpenACC
$:acc_directive
$:cray_directive
#elif MFC_OpenMP
$:omp_directive
#else
Expand Down
3 changes: 1 addition & 2 deletions src/common/m_variables_conversion.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ contains
!> Compute the pressure from the appropriate equation of state
subroutine s_compute_pressure(energy, alf, dyn_p, pi_inf, gamma, rho, qv, rhoYks, pres, T, stress, mom, G, pres_mag)

$:GPU_ROUTINE(function_name='s_compute_pressure',parallelism='[seq]', cray_noinline=True)
$:GPU_ROUTINE(function_name='s_compute_pressure',parallelism='[seq]', cray_inline=True)

real(stp), intent(in) :: energy, alf
real(wp), intent(in) :: dyn_p
Expand Down Expand Up @@ -499,7 +499,6 @@ contains
real(wp) :: E, D !< Prim/Cons variables within Newton-Raphson iteration
real(wp) :: f, dGa_dW, dp_dW, df_dW !< Functions within Newton-Raphson iteration
integer :: iter !< Newton-Raphson iteration counter

$:GPU_PARALLEL_LOOP(collapse=3, private='[alpha_K, alpha_rho_K, Re_K, nRtmp, rho_K, gamma_K, pi_inf_K, qv_K, dyn_pres_K, &
& rhoYks, B, pres, vftmp, nbub_sc, G_K, T, pres_mag, Ga, B2, m2, S, W, dW, E, D, f, dGa_dW, dp_dW, &
& df_dW, iter]')
Expand Down
Loading