potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-01-20 10:15:44 +00:00
parent 3c1227ac65
commit 6187b97199
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -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)
tests/gpu/src/meanshift.cpp
+6 -6
View File
@@ -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) {
tests/gpu/src/mssegmentation.cpp
+3 -3
View File
@@ -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);