Merge pull request opencv#10218 from catree:fix_cuda_integral

alalek · alalek · commit 4d721e368a65 · 2017-12-05T15:10:00.000Z
diff --git a/modules/cudaarithm/test/test_reductions.cpp b/modules/cudaarithm/test/test_reductions.cpp
@@ -1076,7 +1076,7 @@ CUDA_TEST_P(Integral, Accuracy)
 
 INSTANTIATE_TEST_CASE_P(CUDA_Arithm, Integral, testing::Combine(
     ALL_DEVICES,
-    testing::Values(cv::Size(128, 128), cv::Size(113, 113), cv::Size(768, 1066)),
+    testing::Values(cv::Size(16, 16), cv::Size(128, 128), cv::Size(113, 113), cv::Size(768, 1066)),
     WHOLE_SUBMAT));
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp
@@ -598,7 +598,7 @@ namespace integral_detail
     __host__ static void integral(const GlobPtr<uchar>& src, const GlobPtr<uint>& dst, int rows, int cols, cudaStream_t stream)
     {
         if (deviceSupports(FEATURE_SET_COMPUTE_30)
-            && (cols % 16 == 0)
+            && (cols % 64 == 0)
             && reinterpret_cast<intptr_t>(src.data) % 32 == 0
             && reinterpret_cast<intptr_t>(dst.data) % 32 == 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ namespace integral_detail`
`598`	`598`	`__host__ static void integral(const GlobPtr<uchar>& src, const GlobPtr<uint>& dst, int rows, int cols, cudaStream_t stream)`
`599`	`599`	`{`
`600`	`600`	`if (deviceSupports(FEATURE_SET_COMPUTE_30)`
`601`		`- && (cols % 16 == 0)`
	`601`	`+ && (cols % 64 == 0)`
`602`	`602`	`&& reinterpret_cast<intptr_t>(src.data) % 32 == 0`
`603`	`603`	`&& reinterpret_cast<intptr_t>(dst.data) % 32 == 0)`
`604`	`604`	`{`