From 6187b97199a701ae8da7122a1f005315b123cdb9 Mon Sep 17 00:00:00 2001
From: Alexey Spizhevoy <no@email>
Date: Thu, 20 Jan 2011 10:15:44 +0000
Subject: [PATCH] fixed GPU switchable tests, changed default CC's for gpu
 module

---
 CMakeLists.txt                   |  4 ++--
 tests/gpu/src/meanshift.cpp      | 12 ++++++------
 tests/gpu/src/mssegmentation.cpp |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f065ee6ee..23b79ec2b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -707,8 +707,8 @@ if(WITH_CUDA)
         set(HAVE_CUDA 1)
         message(STATUS "CUDA detected: " ${CUDA_VERSION})
 
-        set(CUDA_ARCH_GPU "1.1 1.2 1.3 2.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for")
-        set(CUDA_ARCH_PTX "1.1 1.3 2.0" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")       
+        set(CUDA_ARCH_GPU "1.3 2.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for")
+        set(CUDA_ARCH_PTX "1.1 1.3" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")       
         
         # Architectures to be searched for in user's input
         set (CUDA_ARCH_ALL 1.0 1.1 1.2 1.3 2.0 2.1)
diff --git a/tests/gpu/src/meanshift.cpp b/tests/gpu/src/meanshift.cpp
index b655da6109..a6338f98a0 100644
--- a/tests/gpu/src/meanshift.cpp
+++ b/tests/gpu/src/meanshift.cpp
@@ -59,10 +59,10 @@ struct CV_GpuMeanShiftTest : public CvTest
         int major, minor;
         cv::gpu::getComputeCapability(cv::gpu::getDevice(), major, minor);
         
-        if (major == 1)
-            img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result_CC1X.png");
-        else
+        if (cv::gpu::hasGreaterOrEqualVersion(2, 0) && major >= 2)
             img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result.png");
+        else
+            img_template = cv::imread(std::string(ts->get_data_path()) + "meanshift/con_result_CC1X.png");
 
         if (img.empty() || img_template.empty())
         {
@@ -205,10 +205,10 @@ struct CV_GpuMeanShiftProcTest : public CvTest
             int major, minor;
             cv::gpu::getComputeCapability(cv::gpu::getDevice(), major, minor);
 
-            if (major == 1)
-                fs.open(std::string(ts->get_data_path()) + "meanshift/spmap_CC1X.yaml", cv::FileStorage::READ);
-            else
+            if (cv::gpu::hasGreaterOrEqualVersion(2, 0) && major >= 2)
                 fs.open(std::string(ts->get_data_path()) + "meanshift/spmap.yaml", cv::FileStorage::READ);
+            else
+                fs.open(std::string(ts->get_data_path()) + "meanshift/spmap_CC1X.yaml", cv::FileStorage::READ);
             fs["spmap"] >> spmap_template;
 
             for (int y = 0; y < spmap.rows; ++y) {
diff --git a/tests/gpu/src/mssegmentation.cpp b/tests/gpu/src/mssegmentation.cpp
index 8a5bde43b2..70093c6446 100644
--- a/tests/gpu/src/mssegmentation.cpp
+++ b/tests/gpu/src/mssegmentation.cpp
@@ -71,10 +71,10 @@ struct CV_GpuMeanShiftSegmentationTest : public CvTest {
             {
                 stringstream path;
                 path << ts->get_data_path() << "meanshift/cones_segmented_sp10_sr10_minsize" << minsize;
-                if (major == 1)
-                    path << "_CC1X.png";
-                else
+                if (cv::gpu::hasGreaterOrEqualVersion(2, 0) && major >= 2)
                     path << ".png";
+                else
+                    path << "_CC1X.png";
 
                 Mat dst;
                 meanShiftSegmentation((GpuMat)img, dst, 10, 10, minsize);