fixed GPU switchable tests, changed default CC's for gpu module

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f065ee..23b79ec 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -707,8 +707,8 @@ if(WITH_CUDA)
         set(HAVE_CUDA 1)\r
         message(STATUS "CUDA detected: " ${CUDA_VERSION})\r
 \r
-        set(CUDA_ARCH_GPU "1.1 1.2 1.3 2.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for")\r
-        set(CUDA_ARCH_PTX "1.1 1.3 2.0" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")       \r
+        set(CUDA_ARCH_GPU "1.3 2.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for")\r
+        set(CUDA_ARCH_PTX "1.1 1.3" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")       \r
         \r
         # Architectures to be searched for in user's input\r
         set (CUDA_ARCH_ALL 1.0 1.1 1.2 1.3 2.0 2.1)\r

diff --git a/tests/gpu/src/meanshift.cpp b/tests/gpu/src/meanshift.cpp
index b655da6..a6338f9 100644 (file)
--- a/tests/gpu/src/meanshift.cpp
+++ b/tests/gpu/src/meanshift.cpp
@@ -59,10 +59,10 @@ struct CV_GpuMeanShiftTest : public CvTest
         int major, minor;\r
         cv::gpu::getComputeCapability(cv::gpu::getDevice(), major, minor);\r
         \r
-        if (major == 1)\r
-            img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result_CC1X.png");\r
-        else\r
+        if (cv::gpu::hasGreaterOrEqualVersion(2, 0) && major >= 2)\r
             img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result.png");\r
+        else\r
+            img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result_CC1X.png");\r
 \r
         if (img.empty() || img_template.empty())\r
         {\r
@@ -205,10 +205,10 @@ struct CV_GpuMeanShiftProcTest : public CvTest
             int major, minor;\r
             cv::gpu::getComputeCapability(cv::gpu::getDevice(), major, minor);\r
 \r
-            if (major == 1)\r
-                fs.open(std::string(ts->get_data_path()) + "meanshift/spmap_CC1X.yaml", cv::FileStorage::READ);\r
-            else\r
+            if (cv::gpu::hasGreaterOrEqualVersion(2, 0) && major >= 2)\r
                 fs.open(std::string(ts->get_data_path()) + "meanshift/spmap.yaml", cv::FileStorage::READ);\r
+            else\r
+                fs.open(std::string(ts->get_data_path()) + "meanshift/spmap_CC1X.yaml", cv::FileStorage::READ);\r
             fs["spmap"] >> spmap_template;\r
 \r
             for (int y = 0; y < spmap.rows; ++y) {\r

diff --git a/tests/gpu/src/mssegmentation.cpp b/tests/gpu/src/mssegmentation.cpp
index 8a5bde4..70093c6 100644 (file)
--- a/tests/gpu/src/mssegmentation.cpp
+++ b/tests/gpu/src/mssegmentation.cpp
@@ -71,10 +71,10 @@ struct CV_GpuMeanShiftSegmentationTest : public CvTest {
             {\r
                 stringstream path;\r
                 path << ts->get_data_path() << "meanshift/cones_segmented_sp10_sr10_minsize" << minsize;\r
-                if (major == 1)\r
-                    path << "_CC1X.png";\r
-                else\r
+                if (cv::gpu::hasGreaterOrEqualVersion(2, 0) && major >= 2)\r
                     path << ".png";\r
+                else\r
+                    path << "_CC1X.png";\r
 \r
                 Mat dst;\r
                 meanShiftSegmentation((GpuMat)img, dst, 10, 10, minsize);\r