Skip to content

Commit d45f966

Browse files
committed
Replaced internal isaac variable threadIdx as the nvcc may confuse it
with it's own unternal threadIdx variable.
1 parent 2b26dd1 commit d45f966

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

lib/isaac/isaac_kernel.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,11 @@ template <
472472
isaac_uint2 pixel[ISAAC_VECTOR_ELEM];
473473
bool finish[ISAAC_VECTOR_ELEM];
474474
#if ISAAC_ALPAKA == 1
475-
auto threadIdx = alpaka::idx::getIdx<alpaka::Grid, alpaka::Threads>(acc);
475+
auto alpThreadIdx = alpaka::idx::getIdx<alpaka::Grid, alpaka::Threads>(acc);
476476
ISAAC_ELEM_ITERATE(e)
477477
{
478-
pixel[e].x = isaac_uint(threadIdx[2]) * isaac_uint(ISAAC_VECTOR_ELEM) + e;
479-
pixel[e].y = isaac_uint(threadIdx[1]);
478+
pixel[e].x = isaac_uint(alpThreadIdx[2]) * isaac_uint(ISAAC_VECTOR_ELEM) + e;
479+
pixel[e].y = isaac_uint(alpThreadIdx[1]);
480480
#else
481481
ISAAC_ELEM_ITERATE(e)
482482
{
@@ -1135,11 +1135,11 @@ template
11351135
#endif
11361136
{
11371137
#if ISAAC_ALPAKA == 1
1138-
auto threadIdx = alpaka::idx::getIdx<alpaka::Grid, alpaka::Threads>(acc);
1138+
auto alpThreadIdx = alpaka::idx::getIdx<alpaka::Grid, alpaka::Threads>(acc);
11391139
isaac_int3 dest =
11401140
{
1141-
isaac_int(threadIdx[1]),
1142-
isaac_int(threadIdx[2]),
1141+
isaac_int(alpThreadIdx[1]),
1142+
isaac_int(alpThreadIdx[2]),
11431143
0
11441144
};
11451145
#else
@@ -1214,11 +1214,11 @@ template
12141214
#endif
12151215
{
12161216
#if ISAAC_ALPAKA == 1
1217-
auto threadIdx = alpaka::idx::getIdx<alpaka::Grid, alpaka::Threads>(acc);
1217+
auto alpThreadIdx = alpaka::idx::getIdx<alpaka::Grid, alpaka::Threads>(acc);
12181218
isaac_int3 coord =
12191219
{
1220-
isaac_int(threadIdx[1]),
1221-
isaac_int(threadIdx[2]),
1220+
isaac_int(alpThreadIdx[1]),
1221+
isaac_int(alpThreadIdx[2]),
12221222
0
12231223
};
12241224
#else

0 commit comments

Comments
 (0)