Unverified Commit f5167537 authored by Francisco Massa's avatar Francisco Massa Committed by GitHub
Browse files

Fix windows build (#953)

* #944
  MSBuild Compile time casting Error

* #944
 MSBuild Error  static_cast<Long> to static_cast<int64_t>

* Add eval.py
 Not Work find_contours

* Remove unnecessary file

* Lint
parent 6cc8179b
...@@ -326,7 +326,10 @@ at::Tensor ROIAlign_forward_cuda( ...@@ -326,7 +326,10 @@ at::Tensor ROIAlign_forward_cuda(
auto output_size = num_rois * pooled_height * pooled_width * channels; auto output_size = num_rois * pooled_height * pooled_width * channels;
cudaStream_t stream = at::cuda::getCurrentCUDAStream(); cudaStream_t stream = at::cuda::getCurrentCUDAStream();
dim3 grid(std::min(at::cuda::ATenCeilDiv(output_size, 512L), 4096L)); dim3 grid(std::min(
at::cuda::ATenCeilDiv(
static_cast<int64_t>(output_size), static_cast<int64_t>(512)),
static_cast<int64_t>(4096)));
dim3 block(512); dim3 block(512);
if (output.numel() == 0) { if (output.numel() == 0) {
...@@ -379,7 +382,10 @@ at::Tensor ROIAlign_backward_cuda( ...@@ -379,7 +382,10 @@ at::Tensor ROIAlign_backward_cuda(
cudaStream_t stream = at::cuda::getCurrentCUDAStream(); cudaStream_t stream = at::cuda::getCurrentCUDAStream();
dim3 grid(std::min(at::cuda::ATenCeilDiv(grad.numel(), 512L), 4096L)); dim3 grid(std::min(
at::cuda::ATenCeilDiv(
static_cast<int64_t>(grad.numel()), static_cast<int64_t>(512)),
static_cast<int64_t>(4096)));
dim3 block(512); dim3 block(512);
// handle possibly empty gradients // handle possibly empty gradients
......
...@@ -146,7 +146,10 @@ std::tuple<at::Tensor, at::Tensor> ROIPool_forward_cuda( ...@@ -146,7 +146,10 @@ std::tuple<at::Tensor, at::Tensor> ROIPool_forward_cuda(
auto output_size = num_rois * pooled_height * pooled_width * channels; auto output_size = num_rois * pooled_height * pooled_width * channels;
cudaStream_t stream = at::cuda::getCurrentCUDAStream(); cudaStream_t stream = at::cuda::getCurrentCUDAStream();
dim3 grid(std::min(at::cuda::ATenCeilDiv(output_size, 512L), 4096L)); dim3 grid(std::min(
at::cuda::ATenCeilDiv(
static_cast<int64_t>(output_size), static_cast<int64_t>(512)),
static_cast<int64_t>(4096)));
dim3 block(512); dim3 block(512);
if (output.numel() == 0) { if (output.numel() == 0) {
...@@ -204,7 +207,10 @@ at::Tensor ROIPool_backward_cuda( ...@@ -204,7 +207,10 @@ at::Tensor ROIPool_backward_cuda(
cudaStream_t stream = at::cuda::getCurrentCUDAStream(); cudaStream_t stream = at::cuda::getCurrentCUDAStream();
dim3 grid(std::min(at::cuda::ATenCeilDiv(grad.numel(), 512L), 4096L)); dim3 grid(std::min(
at::cuda::ATenCeilDiv(
static_cast<int64_t>(grad.numel()), static_cast<int64_t>(512)),
static_cast<int64_t>(4096)));
dim3 block(512); dim3 block(512);
// handle possibly empty gradients // handle possibly empty gradients
......
...@@ -125,8 +125,7 @@ at::Tensor nms_cuda(const at::Tensor& dets, ...@@ -125,8 +125,7 @@ at::Tensor nms_cuda(const at::Tensor& dets,
} }
AT_CUDA_CHECK(cudaGetLastError()); AT_CUDA_CHECK(cudaGetLastError());
return return order_t.index(
order_t {keep.narrow(/*dim=*/0, /*start=*/0, /*length=*/num_to_keep)
.index({keep.narrow(/*dim=*/0, /*start=*/0, /*length=*/num_to_keep)
.to(order_t.device(), keep.scalar_type())}); .to(order_t.device(), keep.scalar_type())});
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment