diff --git a/modules/dnn/src/layers/slice2_layer.cpp b/modules/dnn/src/layers/slice2_layer.cpp index b135068509..f43d1bddb2 100644 --- a/modules/dnn/src/layers/slice2_layer.cpp +++ b/modules/dnn/src/layers/slice2_layer.cpp @@ -115,13 +115,16 @@ public: std::min(end, inpsz); if (allStarts) allStarts[axis] = start; - if (allEnds) - allEnds[axis] = end; if (allSteps) allSteps[axis] = step; int outsz = step > 0 ? (end - start + step-1)/step : (start - end - step-1)/(-step); - CV_Assert(outsz >= 0); + if (outsz < 0) { + outsz = 0; + end = start; + } + if (allEnds) + allEnds[axis] = end; outShape[axis] = outsz; } diff --git a/modules/dnn/test/test_model.cpp b/modules/dnn/test/test_model.cpp index fc79306206..d3ce2e81e6 100644 --- a/modules/dnn/test/test_model.cpp +++ b/modules/dnn/test/test_model.cpp @@ -1533,4 +1533,48 @@ TEST_P(Reproducibility_FacePaint_ONNX, Accuracy) INSTANTIATE_TEST_CASE_P(/**/, Reproducibility_FacePaint_ONNX, testing::ValuesIn(getAvailableTargets(DNN_BACKEND_OPENCV))); +typedef testing::TestWithParam Reproducibility_SwinIR_ONNX; +TEST_P(Reproducibility_SwinIR_ONNX, Accuracy) +{ + Target targetId = GetParam(); + applyTestTag(CV_TEST_TAG_MEMORY_512MB, CV_TEST_TAG_LONG); + + auto engine_forced = static_cast( + cv::utils::getConfigurationParameterSizeT("OPENCV_FORCE_DNN_ENGINE", ENGINE_AUTO)); + if (engine_forced == ENGINE_CLASSIC) + { + applyTestTag(CV_TEST_TAG_DNN_SKIP_PARSER); + return; + } + + std::string modelname = _tf("onnx/models/swinir_x4_gan.onnx", false); + Net net = readNetFromONNX(modelname, ENGINE_NEW); + ASSERT_FALSE(net.empty()); + + net.setPreferableBackend(DNN_BACKEND_OPENCV); + net.setPreferableTarget(targetId); + + std::string imgname = findDataFile("cv/dnn_superres/butterfly.png"); + Mat image = imread(imgname); + ASSERT_FALSE(image.empty()); + + Mat input = blobFromImage(image, 1.0 / 255.0, Size(64, 64), + Scalar(0, 0, 0), true, false, CV_32F); + net.setInput(input); + Mat out = net.forward(); + + ASSERT_EQ(out.dims, 4); + EXPECT_EQ(out.size[0], 1); + EXPECT_EQ(out.size[1], 3); + EXPECT_EQ(out.size[2], 256); + EXPECT_EQ(out.size[3], 256); + + double minVal, maxVal; + cv::minMaxLoc(out.reshape(1, 1), &minVal, &maxVal); + EXPECT_GE(minVal, -0.2); + EXPECT_LE(maxVal, 1.2); +} +INSTANTIATE_TEST_CASE_P(/**/, Reproducibility_SwinIR_ONNX, + testing::ValuesIn(getAvailableTargets(DNN_BACKEND_OPENCV))); + }} // namespace