saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-16 21:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make our CUDA code be compatible with the latest VS2019 update (#7062)

Browse source
This commit is contained in:
Changming Sun 2021-03-22 14:39:45 -07:00
parent 10714dfff9
commit eed9dea3ec
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
onnxruntime/core/providers/cuda/object_detection/roialign_impl.cu
View file

@ -130,9 +130,9 @@ __global__ void RoIAlignForward(
// We use roi_bin_grid to sample the grid and mimic integral
int roi_bin_grid_h = (sampling_ratio > 0)
? sampling_ratio
: ceil(roi_height / pooled_height); // e.g., = 2
: _Ceil(roi_height / pooled_height); // e.g., = 2
int roi_bin_grid_w =
(sampling_ratio > 0) ? sampling_ratio : ceil(roi_width / pooled_width);
(sampling_ratio > 0) ? sampling_ratio : _Ceil(roi_width / pooled_width);
// We do average (integral) pooling inside a bin
const T count = roi_bin_grid_h * roi_bin_grid_w; // e.g. = 4

14
onnxruntime/core/providers/cuda/tensor/resize_impl.cu
View file

@ -10,7 +10,7 @@ using onnxruntime::UpsampleMode;
__device__ int NearestPixel_SIMPLE(float x_original, bool is_down_sampling) {
if (is_down_sampling) {
return static_cast<int>(ceil(x_original));
return static_cast<int>(_Ceil(x_original));
} else {
return static_cast<int>(x_original);
}
@ -18,21 +18,21 @@ __device__ int NearestPixel_SIMPLE(float x_original, bool is_down_sampling) {
__device__ int NearestPixel_ROUND_PREFER_FLOOR(float x_original, bool) {
if (x_original == static_cast<int>(x_original) + 0.5f) {
return static_cast<int>(floor(x_original));
return static_cast<int>(_Floor(x_original));
}
return static_cast<int>(round(x_original));
return static_cast<int>(roundf(x_original));
}
__device__ int NearestPixel_ROUND_PREFER_CEIL(float x_original, bool) {
return static_cast<int>(round(x_original));
return static_cast<int>(roundf(x_original));
}
__device__ int NearestPixel_FLOOR(float x_original, bool) {
return static_cast<int>(floor(x_original));
return static_cast<int>(_Floor(x_original));
}
__device__ int NearestPixel_CEIL(float x_original, bool) {
return static_cast<int>(ceil(x_original));
return static_cast<int>(_Ceil(x_original));
}
using CudaFunctionNearestPixel = int (*)(float, bool);
@ -535,7 +535,7 @@ __global__ void _ResizeCubicCoordinateMapping(
static_cast<float>(max_input_coord),
(is_y_axis ? roi_height_start : roi_width_start),
(is_y_axis ? roi_height_end : roi_width_end));
int coord_int = static_cast<int>(floor(input_coordinat));
int coord_int = static_cast<int>(_Floor(input_coordinat));
float s_coord = abs(input_coordinat - coord_int);
float coeff_sum = 1.0f;
float coeff_0 = static_cast<float>(((cubic_coeff_a * (s_coord + 1) - 5 * cubic_coeff_a) * (s_coord + 1) + 8 * cubic_coeff_a) * (s_coord + 1) - 4 * cubic_coeff_a);