Skip to content

Commit 8ffcf23

Browse files
authored
Merge branch 'dev' into fix-murmur
2 parents 1196cf4 + aceb666 commit 8ffcf23

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ci/build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,16 @@ while [ "${#args[@]}" -ne 0 ]; do
131131
esac
132132
done
133133

134+
if [ $VERBOSE ]; then
135+
set -x
136+
fi
137+
134138
# Convert to full paths:
135139
HOST_COMPILER=$(which ${HOST_COMPILER})
136140
CUDA_COMPILER=$(which ${CUDA_COMPILER})
137141
# Make CUDA arch list compatible with cmake
138142
CUDA_ARCHS=$(echo "$CUDA_ARCHS" | tr ' ,' ';;')
139143

140-
if [ $VERBOSE ]; then
141-
set -x
142-
fi
143-
144144
# Begin processing unsets after option parsing
145145
set -u
146146

@@ -217,4 +217,4 @@ if command -v sccache >/dev/null; then
217217
source "./sccache_stats.sh" end
218218
else
219219
echo "sccache stats: N/A"
220-
fi
220+
fi

include/cuco/detail/dynamic_map_kernels.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ CUCO_KERNEL void find(InputIt first,
389389
auto submap_view = submap_views[i];
390390
auto found = submap_view.find(key, hash, key_equal);
391391
if (found != submap_view.end()) {
392-
found_value = found->second;
392+
found_value = found->second.load(cuda::std::memory_order_relaxed);
393393
break;
394394
}
395395
}
@@ -466,7 +466,7 @@ CUCO_KERNEL void find(InputIt first,
466466
auto submap_view = submap_views[i];
467467
auto found = submap_view.find(tile, key, hash, key_equal);
468468
if (found != submap_view.end()) {
469-
found_value = found->second;
469+
found_value = found->second.load(cuda::std::memory_order_relaxed);
470470
break;
471471
}
472472
}

0 commit comments

Comments
 (0)