1
0
mirror of https://github.com/paboyle/Grid.git synced 2026-05-22 18:14:17 +01:00

Including guard on accelerator_for2dNB against invalid kernel configurations if GRID_HIP

This commit is contained in:
Julio Maia
2026-05-06 11:38:57 -05:00
parent b37390bb5a
commit 66da4e0657
+4 -6
View File
@@ -432,6 +432,7 @@ accelerator_inline int acceleratorSIMTlane(int Nsimd) {
#define accelerator_for2dNB( iter1, num1, iter2, num2, nsimd, ... ) \ #define accelerator_for2dNB( iter1, num1, iter2, num2, nsimd, ... ) \
{ \ { \
if (num1*num2) { \
typedef uint64_t Iterator; \ typedef uint64_t Iterator; \
auto lambda = [=] accelerator \ auto lambda = [=] accelerator \
(Iterator iter1,Iterator iter2,Iterator lane ) mutable { \ (Iterator iter1,Iterator iter2,Iterator lane ) mutable { \
@@ -441,13 +442,10 @@ accelerator_inline int acceleratorSIMTlane(int Nsimd) {
dim3 hip_threads(nsimd, nt, 1); \ dim3 hip_threads(nsimd, nt, 1); \
dim3 hip_blocks ((num1+nt-1)/nt,num2,1); \ dim3 hip_blocks ((num1+nt-1)/nt,num2,1); \
if(hip_threads.x * hip_threads.y * hip_threads.z <= 64){ \ if(hip_threads.x * hip_threads.y * hip_threads.z <= 64){ \
hipLaunchKernelGGL(LambdaApply64,hip_blocks,hip_threads, \ LambdaApply64<<<hip_blocks,hip_threads,0,computeStream>>>(num1,num2,nsimd,lambda); \
0,computeStream, \
num1,num2,nsimd, lambda); \
} else { \ } else { \
hipLaunchKernelGGL(LambdaApply,hip_blocks,hip_threads, \ LambdaApply<<<hip_blocks,hip_threads,0,computeStream>>>(num1,num2,nsimd,lambda); \
0,computeStream, \ } \
num1,num2,nsimd, lambda); \
} \ } \
} }