Skip to content

Commit 681c0f9

Browse files
author
Bernhard Kerbl
committed
Removed bad conversions
1 parent 79cbd71 commit 681c0f9

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

cuda_rasterizer/rasterizer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ namespace CudaRasterizer
1818
bool* present);
1919

2020
static int forward(
21-
std::function<char* (int)> geometryBuffer,
22-
std::function<char* (int)> binningBuffer,
23-
std::function<char* (int)> imageBuffer,
21+
std::function<char* (size_t)> geometryBuffer,
22+
std::function<char* (size_t)> binningBuffer,
23+
std::function<char* (size_t)> imageBuffer,
2424
const int P, int D, int M,
2525
const float* background,
2626
const int width, int height,

cuda_rasterizer/rasterizer_impl.cu

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void CudaRasterizer::Rasterizer::markVisible(
141141
present);
142142
}
143143

144-
CudaRasterizer::GeometryState CudaRasterizer::GeometryState::fromChunk(char*& chunk, int P)
144+
CudaRasterizer::GeometryState CudaRasterizer::GeometryState::fromChunk(char*& chunk, size_t P)
145145
{
146146
GeometryState geom;
147147
obtain(chunk, geom.depths, P, 128);
@@ -158,7 +158,7 @@ CudaRasterizer::GeometryState CudaRasterizer::GeometryState::fromChunk(char*& ch
158158
return geom;
159159
}
160160

161-
CudaRasterizer::ImageState CudaRasterizer::ImageState::fromChunk(char*& chunk, int N)
161+
CudaRasterizer::ImageState CudaRasterizer::ImageState::fromChunk(char*& chunk, size_t N)
162162
{
163163
ImageState img;
164164
obtain(chunk, img.accum_alpha, N, 128);
@@ -167,7 +167,7 @@ CudaRasterizer::ImageState CudaRasterizer::ImageState::fromChunk(char*& chunk, i
167167
return img;
168168
}
169169

170-
CudaRasterizer::BinningState CudaRasterizer::BinningState::fromChunk(char*& chunk, int P)
170+
CudaRasterizer::BinningState CudaRasterizer::BinningState::fromChunk(char*& chunk, size_t P)
171171
{
172172
BinningState binning;
173173
obtain(chunk, binning.point_list, P, 128);
@@ -185,9 +185,9 @@ CudaRasterizer::BinningState CudaRasterizer::BinningState::fromChunk(char*& chun
185185
// Forward rendering procedure for differentiable rasterization
186186
// of Gaussians.
187187
int CudaRasterizer::Rasterizer::forward(
188-
std::function<char*(int)> geometryBuffer,
189-
std::function<char* (int)> binningBuffer,
190-
std::function<char* (int)> imageBuffer,
188+
std::function<char* (size_t)> geometryBuffer,
189+
std::function<char* (size_t)> binningBuffer,
190+
std::function<char* (size_t)> imageBuffer,
191191
const int P, int D, int M,
192192
const float* background,
193193
const int width, int height,
@@ -210,7 +210,7 @@ int CudaRasterizer::Rasterizer::forward(
210210
const float focal_y = height / (2.0f * tan_fovy);
211211
const float focal_x = width / (2.0f * tan_fovx);
212212

213-
int chunk_size = required<GeometryState>(P);
213+
size_t chunk_size = required<GeometryState>(P);
214214
char* chunkptr = geometryBuffer(chunk_size);
215215
GeometryState geomState = GeometryState::fromChunk(chunkptr, P);
216216

cuda_rasterizer/rasterizer_impl.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace CudaRasterizer
2929
uint32_t* point_offsets;
3030
uint32_t* tiles_touched;
3131

32-
static GeometryState fromChunk(char*& chunk, int P);
32+
static GeometryState fromChunk(char*& chunk, size_t P);
3333
};
3434

3535
struct ImageState
@@ -38,7 +38,7 @@ namespace CudaRasterizer
3838
uint32_t* n_contrib;
3939
float* accum_alpha;
4040

41-
static ImageState fromChunk(char*& chunk, int N);
41+
static ImageState fromChunk(char*& chunk, size_t N);
4242
};
4343

4444
struct BinningState
@@ -50,14 +50,14 @@ namespace CudaRasterizer
5050
uint32_t* point_list;
5151
char* list_sorting_space;
5252

53-
static BinningState fromChunk(char*& chunk, int P);
53+
static BinningState fromChunk(char*& chunk, size_t P);
5454
};
5555

5656
template<typename T>
57-
int required(int P)
57+
size_t required(size_t P)
5858
{
5959
char* size = nullptr;
6060
T::fromChunk(size, P);
61-
return ((int)size) + 128;
61+
return ((size_t)size) + 128;
6262
}
6363
};

rasterize_points.cu

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include <string>
1616
#include <functional>
1717

18-
std::function<char*(int N)> resizeFunctional(torch::Tensor& t) {
19-
auto lambda = [&t](int N) {
20-
t.resize_({N});
18+
std::function<char*(size_t N)> resizeFunctional(torch::Tensor& t) {
19+
auto lambda = [&t](size_t N) {
20+
t.resize_({(long long)N});
2121
return reinterpret_cast<char*>(t.contiguous().data_ptr());
2222
};
2323
return lambda;
@@ -64,9 +64,9 @@ RasterizeGaussiansCUDA(
6464
torch::Tensor geomBuffer = torch::empty({0}, options.device(device));
6565
torch::Tensor binningBuffer = torch::empty({0}, options.device(device));
6666
torch::Tensor imgBuffer = torch::empty({0}, options.device(device));
67-
std::function<char*(int)> geomFunc = resizeFunctional(geomBuffer);
68-
std::function<char*(int)> binningFunc = resizeFunctional(binningBuffer);
69-
std::function<char*(int)> imgFunc = resizeFunctional(imgBuffer);
67+
std::function<char*(size_t)> geomFunc = resizeFunctional(geomBuffer);
68+
std::function<char*(size_t)> binningFunc = resizeFunctional(binningBuffer);
69+
std::function<char*(size_t)> imgFunc = resizeFunctional(imgBuffer);
7070

7171
int rendered = 0;
7272
if(P != 0)

0 commit comments

Comments
 (0)