Merge pull request #98 from agusdallalba/master

Fix build error on Cuda toolkit 10.1
tromp · May 24, 2019 · 93975e9 · 93975e9
2 parents 0f65204 + 9059d35
commit 93975e9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/src/cuckatoo/mean.cu b/src/cuckatoo/mean.cu
@@ -75,6 +75,18 @@ const u64 ROW_EDGES_B = EDGES_B * NY;
 __constant__ uint2 recoveredges[PROOFSIZE];
 __constant__ uint2 e0 = {0,0};
 
+__device__ uint2 make_Edge(const u32 nonce, const uint2 dummy, const u32 node0, const u32 node1) {
+   return make_uint2(node0, node1);
+}
+
+__device__ uint2 make_Edge(const uint2 edge, const uint2 dummy, const u32 node0, const u32 node1) {
+   return edge;
+}
+
+__device__ u32 make_Edge(const u32 nonce, const u32 dummy, const u32 node0, const u32 node1) {
+   return nonce;
+}
+
 #ifndef FLUSHA // should perhaps be in trimparams and passed as template parameter
 #define FLUSHA 16
 #endif
@@ -224,18 +236,6 @@ __device__ __forceinline__  bool bitmaptest(u32 *ebitmap, const int bucket) {
   return (ebitmap[word] >> bit) & 1;
 }
 
-__device__ uint2 make_Edge(const u32 nonce, const uint2 dummy, const u32 node0, const u32 node1) {
-   return make_uint2(node0, node1);
-}
-
-__device__ uint2 make_Edge(const uint2 edge, const uint2 dummy, const u32 node0, const u32 node1) {
-   return edge;
-}
-
-__device__ u32 make_Edge(const u32 nonce, const u32 dummy, const u32 node0, const u32 node1) {
-   return nonce;
-}
-
 template <typename Edge> u32 __device__ endpoint(const siphash_keys &sipkeys, Edge e, int uorv);
 
 __device__ u32 endpoint(const siphash_keys &sipkeys, u32 nonce, int uorv) {

diff --git a/src/cuckoo/mean.cu b/src/cuckoo/mean.cu
@@ -60,6 +60,18 @@ const u32 ROW_EDGES_B = EDGES_B * NY;
 __constant__ uint2 recoveredges[PROOFSIZE];
 __constant__ uint2 e0 = {0,0};
 
+__device__ uint2 make_Edge(const u32 nonce, const uint2 dummy, const u32 node0, const u32 node1) {
+   return make_uint2(node0, node1);
+}
+
+__device__ uint2 make_Edge(const uint2 edge, const uint2 dummy, const u32 node0, const u32 node1) {
+   return edge;
+}
+
+__device__ u32 make_Edge(const u32 nonce, const u32 dummy, const u32 node0, const u32 node1) {
+   return nonce;
+}
+
 #ifndef FLUSHA // should perhaps be in trimparams and passed as template parameter
 #define FLUSHA 16
 #endif
@@ -213,18 +225,6 @@ __device__ __forceinline__  bool Read2bCounter(u32 *ecounters, const int bucket)
   return (ecounters[word + NZ/32] & mask) != 0;
 }
 
-__device__ uint2 make_Edge(const u32 nonce, const uint2 dummy, const u32 node0, const u32 node1) {
-   return make_uint2(node0, node1);
-}
-
-__device__ uint2 make_Edge(const uint2 edge, const uint2 dummy, const u32 node0, const u32 node1) {
-   return edge;
-}
-
-__device__ u32 make_Edge(const u32 nonce, const u32 dummy, const u32 node0, const u32 node1) {
-   return nonce;
-}
-
 template <typename Edge> u32 __device__ endpoint(const siphash_keys &sipkeys, Edge e, int uorv);
 
 __device__ u32 endpoint(const siphash_keys &sipkeys, u32 nonce, int uorv) {