Merge pull request #3383 from cudawarped:mirror_22633

asmorkalov · web-flow · commit 9d1c0f5294d2 · 2022-12-14T16:27:57.000+03:00
Reset cuda runtime error code to cudasuccess on runtime failure.
diff --git a/modules/cudev/include/opencv2/cudev/common.hpp b/modules/cudev/include/opencv2/cudev/common.hpp
@@ -69,8 +69,10 @@ using namespace cv::cuda;
 
 __host__ __forceinline__ void checkCudaError(cudaError_t err, const char* file, const int line, const char* func)
 {
-    if (cudaSuccess != err)
+    if (cudaSuccess != err) {
+        cudaGetLastError(); // reset the last stored error to cudaSuccess
         cv::error(cv::Error::GpuApiCallError, cudaGetErrorString(err), func, file, line);
+    }
 }
 
 #define CV_CUDEV_SAFE_CALL(expr) cv::cudev::checkCudaError((expr), __FILE__, __LINE__, CV_Func)

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,10 @@ using namespace cv::cuda;`
`69`	`69`
`70`	`70`	`__host__ __forceinline__ void checkCudaError(cudaError_t err, const char* file, const int line, const char* func)`
`71`	`71`	`{`
`72`		`- if (cudaSuccess != err)`
	`72`	`+ if (cudaSuccess != err) {`
	`73`	`+ cudaGetLastError(); // reset the last stored error to cudaSuccess`
`73`	`74`	`cv::error(cv::Error::GpuApiCallError, cudaGetErrorString(err), func, file, line);`
	`75`	`+ }`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`#define CV_CUDEV_SAFE_CALL(expr) cv::cudev::checkCudaError((expr), __FILE__, __LINE__, CV_Func)`