Skip to content

Commit d4fe021

Browse files
committed
attempting to fix win/os build error
1 parent d7f704c commit d4fe021

File tree

3 files changed

+3
-25
lines changed

3 files changed

+3
-25
lines changed

csrc/cpu/radius_cpu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ torch::Tensor batch_radius_cpu(torch::Tensor query,
6363
float radius, int max_num) {
6464

6565
torch::Tensor out;
66-
auto data_qb = query_batch.data_ptr<long>();
67-
auto data_sb = support_batch.data_ptr<long>();
66+
auto data_qb = query_batch.data_ptr<int64_t>();
67+
auto data_sb = support_batch.data_ptr<int64_t>();
6868
std::vector<long> query_batch_stl = std::vector<long>(data_qb, data_qb+query_batch.size(0));
6969
std::vector<long> size_query_batch_stl;
7070
get_size_batch(query_batch_stl, size_query_batch_stl);

csrc/cpu/utils/neighbors.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,11 @@ template<typename scalar_t>
77
int nanoflann_neighbors(vector<scalar_t>& queries, vector<scalar_t>& supports,
88
vector<long>& neighbors_indices, float radius, int dim, int max_num){
99

10-
// Initiate variables
11-
// ******************
12-
1310
const scalar_t search_radius = static_cast<scalar_t>(radius*radius);
1411

1512
// Counting vector
1613
size_t max_count = 1;
1714

18-
// Nanoflann related variables
19-
// ***************************
20-
2115
// CLoud variable
2216
PointCloud<scalar_t> pcd;
2317
pcd.set(supports, dim);
@@ -54,32 +48,15 @@ int nanoflann_neighbors(vector<scalar_t>& queries, vector<scalar_t>& supports,
5448
scalar_t* query_pt = new scalar_t[dim];
5549
std::copy(p0.begin(), p0.end(), query_pt);
5650

57-
//for(int i=0; i < p0.size(); i++)
58-
//std::cout << query_pt[i] << '\n';
59-
6051
list_matches[i0].reserve(max_count);
6152
std::vector<std::pair<size_t, scalar_t> > ret_matches;
6253

6354
const size_t nMatches = index->radiusSearch(query_pt, search_radius+eps, ret_matches, search_params);
6455

65-
//cout << "radiusSearch(): radius=" << search_radius << " -> " << nMatches << " matches\n";
66-
//for (size_t i = 0; i < nMatches; i++)
67-
// cout << "idx["<< i << "]=" << ret_matches[i].first << " dist["<< i << "]=" << ret_matches[i].second << endl;
68-
//cout << "\n";
69-
7056
list_matches[i0] = ret_matches;
7157
if(max_count < nMatches) max_count = nMatches;
7258
i0++;
7359

74-
75-
// Get worst (furthest) point, without sorting:
76-
77-
// cout << "\n neighbors: " << nMatches << "\n";
78-
79-
// Get worst (furthest) point, without sorting:
80-
// for(int i=0; i < ret_matches.size(); i++)
81-
// std::cout << ret_matches.at(i) << '\n';
82-
8360
}
8461
// Reserve the memory
8562
if(max_num > 0) {

csrc/cpu/utils/neighbors.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "nanoflann.hpp"
55
#include <set>
66
#include <cstdint>
7+
#include <thread>
78

89
using namespace std;
910

0 commit comments

Comments
 (0)