Skip to content

Commit 8bfa4ad

Browse files
committed
Fix compilation with nvcc-5.5
As reported in flann-lib#133 we need to declare the functions for device and host. Signed-off-by: Justin Lecher <[email protected]>
1 parent bc99fa6 commit 8bfa4ad

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/cpp/flann/util/cuda/result_set.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct SingleResultSet
5454
DistanceType bestDist;
5555
const DistanceType epsError;
5656

57-
__device__
57+
__device__ __host__
5858
SingleResultSet( DistanceType eps ) : bestIndex(-1),bestDist(INFINITY), epsError(eps){ }
5959

6060
__device__
@@ -129,7 +129,7 @@ struct KnnResultSet
129129
const DistanceType epsError;
130130

131131

132-
__device__
132+
__device__ __host__
133133
KnnResultSet(int knn, bool sortResults, DistanceType eps) : foundNeighbors(0),largestHeapDist(INFINITY),k(knn), sorted(sortResults), epsError(eps){ }
134134

135135
// __host__ __device__
@@ -229,7 +229,7 @@ struct CountingRadiusResultSet
229229
DistanceType radius_sq_;
230230
int max_neighbors_;
231231

232-
__device__
232+
__device__ __host__
233233
CountingRadiusResultSet(DistanceType radius, int max_neighbors) : count_(0),radius_sq_(radius), max_neighbors_(max_neighbors){ }
234234

235235
__device__
@@ -279,7 +279,7 @@ struct RadiusKnnResultSet
279279
// int count_;
280280

281281

282-
__device__
282+
__device__ __host__
283283
RadiusKnnResultSet(DistanceType radius, int knn, int* segment_starts, bool sortResults) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), radius_sq_(radius),segment_starts_(segment_starts) { }
284284

285285
// __host__ __device__
@@ -381,7 +381,7 @@ struct KnnRadiusResultSet
381381
const DistanceType radius_sq;
382382

383383

384-
__device__
384+
__device__ __host__
385385
KnnRadiusResultSet(int knn, bool sortResults, DistanceType eps, DistanceType radius) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), epsError(eps),radius_sq(radius){ }
386386

387387
// __host__ __device__
@@ -484,7 +484,7 @@ struct RadiusResultSet
484484
int count_;
485485
bool sorted_;
486486

487-
__device__
487+
__device__ __host__
488488
RadiusResultSet(DistanceType radius, int* segment_starts, bool sorted) : radius_sq_(radius), segment_starts_(segment_starts), count_(0), sorted_(sorted){ }
489489

490490
__device__

0 commit comments

Comments
 (0)