mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 19:57:55 +08:00
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
|
commit ab8cb6f8a9034da2a289b84685c6d959266029be
|
||
|
|
Author: cudawarped <12133430+cudawarped@users.noreply.github.com>
|
||
|
|
Date: Tue Aug 1 13:02:42 2023 +0300
|
||
|
|
|
||
|
|
cuda: fix for compatibility with CUDA Toolkit >= 12.2.0
|
||
|
|
|
||
|
|
diff --git a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp
|
||
|
|
index f067dddaa7..91ff33f817 100644
|
||
|
|
--- a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp
|
||
|
|
+++ b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp
|
||
|
|
@@ -111,7 +111,7 @@ namespace cv { namespace dnn { namespace cuda4dnn {
|
||
|
|
* or there might be several weights
|
||
|
|
* or we don't have to scale
|
||
|
|
*/
|
||
|
|
- if (weight != 1.0)
|
||
|
|
+ if (weight != static_cast<T>(1.0f))
|
||
|
|
{
|
||
|
|
kernels::scale1_with_bias1<T>(stream, output, input, weight, 1.0);
|
||
|
|
}
|
||
|
|
diff --git a/modules/dnn/src/cuda4dnn/primitives/region.hpp b/modules/dnn/src/cuda4dnn/primitives/region.hpp
|
||
|
|
index d22d44214e..3af05155fe 100644
|
||
|
|
--- a/modules/dnn/src/cuda4dnn/primitives/region.hpp
|
||
|
|
+++ b/modules/dnn/src/cuda4dnn/primitives/region.hpp
|
||
|
|
@@ -121,7 +121,7 @@ namespace cv { namespace dnn { namespace cuda4dnn {
|
||
|
|
new_coords
|
||
|
|
);
|
||
|
|
|
||
|
|
- if (nms_iou_threshold > 0) {
|
||
|
|
+ if (nms_iou_threshold > static_cast<T>(0.0f)) {
|
||
|
|
auto output_mat = output_wrapper->getMutableHostMat();
|
||
|
|
CV_Assert(output_mat.type() == CV_32F);
|
||
|
|
for (int i = 0; i < input.get_axis_size(0); i++) {
|