Merge cstone upstream (#480)

Merges sekelle/cornerstone-octree#38
sphexa-org · Jan 27, 2025 · a42f50e · a42f50e
1 parent 87cdae5
commit a42f50e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/domain/include/cstone/primitives/warpscan.cuh b/domain/include/cstone/primitives/warpscan.cuh
@@ -18,6 +18,7 @@
 #include <type_traits>
 
 #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
@@ -25,7 +25,8 @@
 
 #pragma once
 
-#include <cstdint>
+#include <cassert>
+#include <type_traits>
 #include "cstone/cuda/annotation.hpp"
 
 #include "cstone/primitives/stl.hpp"