From a42f50ee889da28188d5e2976f92ca1bade6b83f Mon Sep 17 00:00:00 2001 From: Sebastian Keller <44800242+sekelle@users.noreply.github.com> Date: Mon, 27 Jan 2025 19:49:15 +0100 Subject: [PATCH] Merge cstone upstream (#480) Merges https://github.com/sekelle/cornerstone-octree/pull/38 --- domain/include/cstone/primitives/warpscan.cuh | 5 +---- domain/include/cstone/tree/definitions.h | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/domain/include/cstone/primitives/warpscan.cuh b/domain/include/cstone/primitives/warpscan.cuh index dd582d66f..c0bba1c20 100644 --- a/domain/include/cstone/primitives/warpscan.cuh +++ b/domain/include/cstone/primitives/warpscan.cuh @@ -18,6 +18,7 @@ #include #include "cstone/cuda/gpu_config.cuh" +#include "cstone/primitives/clz.hpp" namespace cstone { @@ -26,10 +27,6 @@ namespace cstone __device__ __forceinline__ int imin(int a, int b) { return a < b ? a : b; } __device__ __forceinline__ unsigned imin(unsigned a, unsigned b) { return a < b ? a : b; } -__device__ __forceinline__ int countLeadingZeros(uint32_t x) { return __clz(x); } - -__device__ __forceinline__ int countLeadingZeros(uint64_t x) { return __clzll(x); } - __device__ __forceinline__ uint32_t reverseBits(uint32_t x) { return __brev(x); } __device__ __forceinline__ uint64_t reverseBits(uint64_t x) { return __brevll(x); } diff --git a/domain/include/cstone/tree/definitions.h b/domain/include/cstone/tree/definitions.h index 003beab5b..1a01e8e5a 100644 --- a/domain/include/cstone/tree/definitions.h +++ b/domain/include/cstone/tree/definitions.h @@ -25,7 +25,8 @@ #pragma once -#include +#include +#include #include "cstone/cuda/annotation.hpp" #include "cstone/primitives/stl.hpp"