replaced GPU -> CUDA
This commit is contained in:
@@ -61,7 +61,7 @@ struct TransformPoints : testing::TestWithParam<cv::cuda::DeviceInfo>
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(TransformPoints, Accuracy)
|
||||
CUDA_TEST_P(TransformPoints, Accuracy)
|
||||
{
|
||||
cv::Mat src = randomMat(cv::Size(1000, 1), CV_32FC3, 0, 10);
|
||||
cv::Mat rvec = randomMat(cv::Size(3, 1), CV_32F, 0, 1);
|
||||
@@ -92,7 +92,7 @@ GPU_TEST_P(TransformPoints, Accuracy)
|
||||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_Calib3D, TransformPoints, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_Calib3D, TransformPoints, ALL_DEVICES);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// ProjectPoints
|
||||
@@ -109,7 +109,7 @@ struct ProjectPoints : testing::TestWithParam<cv::cuda::DeviceInfo>
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(ProjectPoints, Accuracy)
|
||||
CUDA_TEST_P(ProjectPoints, Accuracy)
|
||||
{
|
||||
cv::Mat src = randomMat(cv::Size(1000, 1), CV_32FC3, 0, 10);
|
||||
cv::Mat rvec = randomMat(cv::Size(3, 1), CV_32F, 0, 1);
|
||||
@@ -142,7 +142,7 @@ GPU_TEST_P(ProjectPoints, Accuracy)
|
||||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_Calib3D, ProjectPoints, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_Calib3D, ProjectPoints, ALL_DEVICES);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// SolvePnPRansac
|
||||
@@ -159,7 +159,7 @@ struct SolvePnPRansac : testing::TestWithParam<cv::cuda::DeviceInfo>
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(SolvePnPRansac, Accuracy)
|
||||
CUDA_TEST_P(SolvePnPRansac, Accuracy)
|
||||
{
|
||||
cv::Mat object = randomMat(cv::Size(5000, 1), CV_32FC3, 0, 100);
|
||||
cv::Mat camera_mat = randomMat(cv::Size(3, 3), CV_32F, 0.5, 1);
|
||||
@@ -185,6 +185,6 @@ GPU_TEST_P(SolvePnPRansac, Accuracy)
|
||||
ASSERT_LE(cv::norm(tvec - tvec_gold), 1e-3);
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_Calib3D, SolvePnPRansac, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_Calib3D, SolvePnPRansac, ALL_DEVICES);
|
||||
|
||||
#endif // HAVE_CUDA
|
||||
|
@@ -52,7 +52,7 @@ struct CompactPoints : testing::TestWithParam<cuda::DeviceInfo>
|
||||
virtual void SetUp() { cuda::setDevice(GetParam().deviceID()); }
|
||||
};
|
||||
|
||||
GPU_TEST_P(CompactPoints, CanCompactizeSmallInput)
|
||||
CUDA_TEST_P(CompactPoints, CanCompactizeSmallInput)
|
||||
{
|
||||
Mat src0(1, 3, CV_32FC2);
|
||||
src0.at<Point2f>(0,0) = Point2f(0,0);
|
||||
@@ -85,6 +85,6 @@ GPU_TEST_P(CompactPoints, CanCompactizeSmallInput)
|
||||
ASSERT_TRUE(src1.at<Point2f>(0,1) == Point2f(1,2));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_GlobalMotion, CompactPoints, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_GlobalMotion, CompactPoints, ALL_DEVICES);
|
||||
|
||||
#endif // HAVE_CUDA
|
||||
|
@@ -67,7 +67,7 @@ PARAM_TEST_CASE(SetTo, cv::cuda::DeviceInfo, cv::Size, MatType, UseRoi)
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(SetTo, Zero)
|
||||
CUDA_TEST_P(SetTo, Zero)
|
||||
{
|
||||
cv::Scalar zero = cv::Scalar::all(0);
|
||||
|
||||
@@ -77,7 +77,7 @@ GPU_TEST_P(SetTo, Zero)
|
||||
EXPECT_MAT_NEAR(cv::Mat::zeros(size, type), mat, 0.0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(SetTo, SameVal)
|
||||
CUDA_TEST_P(SetTo, SameVal)
|
||||
{
|
||||
cv::Scalar val = cv::Scalar::all(randomDouble(0.0, 255.0));
|
||||
|
||||
@@ -102,7 +102,7 @@ GPU_TEST_P(SetTo, SameVal)
|
||||
}
|
||||
}
|
||||
|
||||
GPU_TEST_P(SetTo, DifferentVal)
|
||||
CUDA_TEST_P(SetTo, DifferentVal)
|
||||
{
|
||||
cv::Scalar val = randomScalar(0.0, 255.0);
|
||||
|
||||
@@ -127,7 +127,7 @@ GPU_TEST_P(SetTo, DifferentVal)
|
||||
}
|
||||
}
|
||||
|
||||
GPU_TEST_P(SetTo, Masked)
|
||||
CUDA_TEST_P(SetTo, Masked)
|
||||
{
|
||||
cv::Scalar val = randomScalar(0.0, 255.0);
|
||||
cv::Mat mat_gold = randomMat(size, type);
|
||||
@@ -156,7 +156,7 @@ GPU_TEST_P(SetTo, Masked)
|
||||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_GpuMat, SetTo, testing::Combine(
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_GpuMat, SetTo, testing::Combine(
|
||||
ALL_DEVICES,
|
||||
DIFFERENT_SIZES,
|
||||
ALL_TYPES,
|
||||
@@ -184,7 +184,7 @@ PARAM_TEST_CASE(CopyTo, cv::cuda::DeviceInfo, cv::Size, MatType, UseRoi)
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(CopyTo, WithOutMask)
|
||||
CUDA_TEST_P(CopyTo, WithOutMask)
|
||||
{
|
||||
cv::Mat src = randomMat(size, type);
|
||||
|
||||
@@ -195,7 +195,7 @@ GPU_TEST_P(CopyTo, WithOutMask)
|
||||
EXPECT_MAT_NEAR(src, dst, 0.0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(CopyTo, Masked)
|
||||
CUDA_TEST_P(CopyTo, Masked)
|
||||
{
|
||||
cv::Mat src = randomMat(size, type);
|
||||
cv::Mat mask = randomMat(size, CV_8UC1, 0.0, 2.0);
|
||||
@@ -226,7 +226,7 @@ GPU_TEST_P(CopyTo, Masked)
|
||||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_GpuMat, CopyTo, testing::Combine(
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_GpuMat, CopyTo, testing::Combine(
|
||||
ALL_DEVICES,
|
||||
DIFFERENT_SIZES,
|
||||
ALL_TYPES,
|
||||
@@ -255,7 +255,7 @@ PARAM_TEST_CASE(ConvertTo, cv::cuda::DeviceInfo, cv::Size, MatDepth, MatDepth, U
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(ConvertTo, WithOutScaling)
|
||||
CUDA_TEST_P(ConvertTo, WithOutScaling)
|
||||
{
|
||||
cv::Mat src = randomMat(size, depth1);
|
||||
|
||||
@@ -285,7 +285,7 @@ GPU_TEST_P(ConvertTo, WithOutScaling)
|
||||
}
|
||||
}
|
||||
|
||||
GPU_TEST_P(ConvertTo, WithScaling)
|
||||
CUDA_TEST_P(ConvertTo, WithScaling)
|
||||
{
|
||||
cv::Mat src = randomMat(size, depth1);
|
||||
double a = randomDouble(0.0, 1.0);
|
||||
@@ -317,7 +317,7 @@ GPU_TEST_P(ConvertTo, WithScaling)
|
||||
}
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_GpuMat, ConvertTo, testing::Combine(
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_GpuMat, ConvertTo, testing::Combine(
|
||||
ALL_DEVICES,
|
||||
DIFFERENT_SIZES,
|
||||
ALL_DEPTH,
|
||||
@@ -336,7 +336,7 @@ struct EnsureSizeIsEnough : testing::TestWithParam<cv::cuda::DeviceInfo>
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(EnsureSizeIsEnough, BufferReuse)
|
||||
CUDA_TEST_P(EnsureSizeIsEnough, BufferReuse)
|
||||
{
|
||||
cv::cuda::GpuMat buffer(100, 100, CV_8U);
|
||||
cv::cuda::GpuMat old = buffer;
|
||||
@@ -356,6 +356,6 @@ GPU_TEST_P(EnsureSizeIsEnough, BufferReuse)
|
||||
EXPECT_EQ(reinterpret_cast<intptr_t>(old.data), reinterpret_cast<intptr_t>(buffer.data));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_GpuMat, EnsureSizeIsEnough, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_GpuMat, EnsureSizeIsEnough, ALL_DEVICES);
|
||||
|
||||
#endif // HAVE_CUDA
|
||||
|
@@ -167,7 +167,7 @@ struct Labeling : testing::TestWithParam<cv::cuda::DeviceInfo>
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(Labeling, DISABLED_ConnectedComponents)
|
||||
CUDA_TEST_P(Labeling, DISABLED_ConnectedComponents)
|
||||
{
|
||||
cv::Mat image;
|
||||
cvtColor(loat_image(), image, cv::COLOR_BGR2GRAY);
|
||||
@@ -192,6 +192,6 @@ GPU_TEST_P(Labeling, DISABLED_ConnectedComponents)
|
||||
host.checkCorrectness(cv::Mat(components));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_ConnectedComponents, Labeling, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_ConnectedComponents, Labeling, ALL_DEVICES);
|
||||
|
||||
#endif // HAVE_CUDA
|
||||
|
@@ -42,4 +42,4 @@
|
||||
|
||||
#include "test_precomp.hpp"
|
||||
|
||||
CV_GPU_TEST_MAIN("gpu")
|
||||
CV_CUDA_TEST_MAIN("gpu")
|
||||
|
@@ -177,7 +177,7 @@ struct HOG : testing::TestWithParam<cv::cuda::DeviceInfo>, cv::cuda::HOGDescript
|
||||
};
|
||||
|
||||
// desabled while resize does not fixed
|
||||
GPU_TEST_P(HOG, Detect)
|
||||
CUDA_TEST_P(HOG, Detect)
|
||||
{
|
||||
cv::Mat img_rgb = readImage("hog/road.png");
|
||||
ASSERT_FALSE(img_rgb.empty());
|
||||
@@ -202,7 +202,7 @@ GPU_TEST_P(HOG, Detect)
|
||||
f.close();
|
||||
}
|
||||
|
||||
GPU_TEST_P(HOG, GetDescriptors)
|
||||
CUDA_TEST_P(HOG, GetDescriptors)
|
||||
{
|
||||
// Load image (e.g. train data, composed from windows)
|
||||
cv::Mat img_rgb = readImage("hog/train_data.png");
|
||||
@@ -286,7 +286,7 @@ GPU_TEST_P(HOG, GetDescriptors)
|
||||
compare_inner_parts(cv::Mat(block_hists), cv::Mat(descriptors.rowRange(5, 6)));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_ObjDetect, HOG, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_ObjDetect, HOG, ALL_DEVICES);
|
||||
|
||||
//============== caltech hog tests =====================//
|
||||
|
||||
@@ -305,7 +305,7 @@ struct CalTech : public ::testing::TestWithParam<std::tr1::tuple<cv::cuda::Devic
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(CalTech, HOG)
|
||||
CUDA_TEST_P(CalTech, HOG)
|
||||
{
|
||||
cv::cuda::GpuMat d_img(img);
|
||||
cv::Mat markedImage(img.clone());
|
||||
@@ -352,14 +352,14 @@ PARAM_TEST_CASE(LBP_Read_classifier, cv::cuda::DeviceInfo, int)
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(LBP_Read_classifier, Accuracy)
|
||||
CUDA_TEST_P(LBP_Read_classifier, Accuracy)
|
||||
{
|
||||
cv::cuda::CascadeClassifier_GPU classifier;
|
||||
cv::cuda::CascadeClassifier_CUDA classifier;
|
||||
std::string classifierXmlPath = std::string(cvtest::TS::ptr()->get_data_path()) + "lbpcascade/lbpcascade_frontalface.xml";
|
||||
ASSERT_TRUE(classifier.load(classifierXmlPath));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_ObjDetect, LBP_Read_classifier,
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_ObjDetect, LBP_Read_classifier,
|
||||
testing::Combine(ALL_DEVICES, testing::Values<int>(0)));
|
||||
|
||||
|
||||
@@ -374,7 +374,7 @@ PARAM_TEST_CASE(LBP_classify, cv::cuda::DeviceInfo, int)
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(LBP_classify, Accuracy)
|
||||
CUDA_TEST_P(LBP_classify, Accuracy)
|
||||
{
|
||||
std::string classifierXmlPath = std::string(cvtest::TS::ptr()->get_data_path()) + "lbpcascade/lbpcascade_frontalface.xml";
|
||||
std::string imagePath = std::string(cvtest::TS::ptr()->get_data_path()) + "lbpcascade/er.png";
|
||||
@@ -396,7 +396,7 @@ GPU_TEST_P(LBP_classify, Accuracy)
|
||||
for (; it != rects.end(); ++it)
|
||||
cv::rectangle(markedImage, *it, cv::Scalar(255, 0, 0));
|
||||
|
||||
cv::cuda::CascadeClassifier_GPU gpuClassifier;
|
||||
cv::cuda::CascadeClassifier_CUDA gpuClassifier;
|
||||
ASSERT_TRUE(gpuClassifier.load(classifierXmlPath));
|
||||
|
||||
cv::cuda::GpuMat gpu_rects;
|
||||
@@ -421,7 +421,7 @@ GPU_TEST_P(LBP_classify, Accuracy)
|
||||
(void)count;
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_ObjDetect, LBP_classify,
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_ObjDetect, LBP_classify,
|
||||
testing::Combine(ALL_DEVICES, testing::Values<int>(0)));
|
||||
|
||||
#endif // HAVE_CUDA
|
||||
|
@@ -71,7 +71,7 @@ PARAM_TEST_CASE(Buffer, cv::Size, MatType)
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(Buffer, Constructor1)
|
||||
CUDA_TEST_P(Buffer, Constructor1)
|
||||
{
|
||||
cv::ogl::Buffer buf(size.height, size.width, type, cv::ogl::Buffer::ARRAY_BUFFER, true);
|
||||
|
||||
@@ -80,7 +80,7 @@ GPU_TEST_P(Buffer, Constructor1)
|
||||
EXPECT_EQ(type, buf.type());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, Constructor2)
|
||||
CUDA_TEST_P(Buffer, Constructor2)
|
||||
{
|
||||
cv::ogl::Buffer buf(size, type, cv::ogl::Buffer::ARRAY_BUFFER, true);
|
||||
|
||||
@@ -89,7 +89,7 @@ GPU_TEST_P(Buffer, Constructor2)
|
||||
EXPECT_EQ(type, buf.type());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, ConstructorFromMat)
|
||||
CUDA_TEST_P(Buffer, ConstructorFromMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -101,7 +101,7 @@ GPU_TEST_P(Buffer, ConstructorFromMat)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, ConstructorFromGpuMat)
|
||||
CUDA_TEST_P(Buffer, ConstructorFromGpuMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
cv::cuda::GpuMat d_gold(gold);
|
||||
@@ -114,7 +114,7 @@ GPU_TEST_P(Buffer, ConstructorFromGpuMat)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, ConstructorFromBuffer)
|
||||
CUDA_TEST_P(Buffer, ConstructorFromBuffer)
|
||||
{
|
||||
cv::ogl::Buffer buf_gold(size, type, cv::ogl::Buffer::ARRAY_BUFFER, true);
|
||||
|
||||
@@ -126,7 +126,7 @@ GPU_TEST_P(Buffer, ConstructorFromBuffer)
|
||||
EXPECT_EQ(buf_gold.type(), buf.type());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, Create)
|
||||
CUDA_TEST_P(Buffer, Create)
|
||||
{
|
||||
cv::ogl::Buffer buf;
|
||||
buf.create(size.height, size.width, type, cv::ogl::Buffer::ARRAY_BUFFER, true);
|
||||
@@ -136,7 +136,7 @@ GPU_TEST_P(Buffer, Create)
|
||||
EXPECT_EQ(type, buf.type());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, CopyFromMat)
|
||||
CUDA_TEST_P(Buffer, CopyFromMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -149,7 +149,7 @@ GPU_TEST_P(Buffer, CopyFromMat)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, CopyFromGpuMat)
|
||||
CUDA_TEST_P(Buffer, CopyFromGpuMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
cv::cuda::GpuMat d_gold(gold);
|
||||
@@ -163,7 +163,7 @@ GPU_TEST_P(Buffer, CopyFromGpuMat)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, CopyFromBuffer)
|
||||
CUDA_TEST_P(Buffer, CopyFromBuffer)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
cv::ogl::Buffer buf_gold(gold, cv::ogl::Buffer::ARRAY_BUFFER, true);
|
||||
@@ -179,7 +179,7 @@ GPU_TEST_P(Buffer, CopyFromBuffer)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, CopyToGpuMat)
|
||||
CUDA_TEST_P(Buffer, CopyToGpuMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -191,7 +191,7 @@ GPU_TEST_P(Buffer, CopyToGpuMat)
|
||||
EXPECT_MAT_NEAR(gold, dst, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, CopyToBuffer)
|
||||
CUDA_TEST_P(Buffer, CopyToBuffer)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -209,7 +209,7 @@ GPU_TEST_P(Buffer, CopyToBuffer)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, Clone)
|
||||
CUDA_TEST_P(Buffer, Clone)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -225,7 +225,7 @@ GPU_TEST_P(Buffer, Clone)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, MapHostRead)
|
||||
CUDA_TEST_P(Buffer, MapHostRead)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -238,7 +238,7 @@ GPU_TEST_P(Buffer, MapHostRead)
|
||||
buf.unmapHost();
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, MapHostWrite)
|
||||
CUDA_TEST_P(Buffer, MapHostWrite)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -255,7 +255,7 @@ GPU_TEST_P(Buffer, MapHostWrite)
|
||||
EXPECT_MAT_NEAR(gold, bufData, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Buffer, MapDevice)
|
||||
CUDA_TEST_P(Buffer, MapDevice)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type);
|
||||
|
||||
@@ -302,7 +302,7 @@ PARAM_TEST_CASE(Texture2D, cv::Size, MatType)
|
||||
}
|
||||
};
|
||||
|
||||
GPU_TEST_P(Texture2D, Constructor1)
|
||||
CUDA_TEST_P(Texture2D, Constructor1)
|
||||
{
|
||||
cv::ogl::Texture2D tex(size.height, size.width, format, true);
|
||||
|
||||
@@ -311,7 +311,7 @@ GPU_TEST_P(Texture2D, Constructor1)
|
||||
EXPECT_EQ(format, tex.format());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, Constructor2)
|
||||
CUDA_TEST_P(Texture2D, Constructor2)
|
||||
{
|
||||
cv::ogl::Texture2D tex(size, format, true);
|
||||
|
||||
@@ -320,7 +320,7 @@ GPU_TEST_P(Texture2D, Constructor2)
|
||||
EXPECT_EQ(format, tex.format());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, ConstructorFromMat)
|
||||
CUDA_TEST_P(Texture2D, ConstructorFromMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
|
||||
@@ -332,7 +332,7 @@ GPU_TEST_P(Texture2D, ConstructorFromMat)
|
||||
EXPECT_MAT_NEAR(gold, texData, 1e-2);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, ConstructorFromGpuMat)
|
||||
CUDA_TEST_P(Texture2D, ConstructorFromGpuMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
cv::cuda::GpuMat d_gold(gold);
|
||||
@@ -345,7 +345,7 @@ GPU_TEST_P(Texture2D, ConstructorFromGpuMat)
|
||||
EXPECT_MAT_NEAR(gold, texData, 1e-2);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, ConstructorFromBuffer)
|
||||
CUDA_TEST_P(Texture2D, ConstructorFromBuffer)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
cv::ogl::Buffer buf_gold(gold, cv::ogl::Buffer::PIXEL_UNPACK_BUFFER, true);
|
||||
@@ -358,7 +358,7 @@ GPU_TEST_P(Texture2D, ConstructorFromBuffer)
|
||||
EXPECT_MAT_NEAR(gold, texData, 1e-2);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, ConstructorFromTexture2D)
|
||||
CUDA_TEST_P(Texture2D, ConstructorFromTexture2D)
|
||||
{
|
||||
cv::ogl::Texture2D tex_gold(size, format, true);
|
||||
cv::ogl::Texture2D tex(tex_gold);
|
||||
@@ -369,7 +369,7 @@ GPU_TEST_P(Texture2D, ConstructorFromTexture2D)
|
||||
EXPECT_EQ(tex_gold.format(), tex.format());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, Create)
|
||||
CUDA_TEST_P(Texture2D, Create)
|
||||
{
|
||||
cv::ogl::Texture2D tex;
|
||||
tex.create(size.height, size.width, format, true);
|
||||
@@ -379,7 +379,7 @@ GPU_TEST_P(Texture2D, Create)
|
||||
EXPECT_EQ(format, tex.format());
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, CopyFromMat)
|
||||
CUDA_TEST_P(Texture2D, CopyFromMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
|
||||
@@ -392,7 +392,7 @@ GPU_TEST_P(Texture2D, CopyFromMat)
|
||||
EXPECT_MAT_NEAR(gold, texData, 1e-2);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, CopyFromGpuMat)
|
||||
CUDA_TEST_P(Texture2D, CopyFromGpuMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
cv::cuda::GpuMat d_gold(gold);
|
||||
@@ -406,7 +406,7 @@ GPU_TEST_P(Texture2D, CopyFromGpuMat)
|
||||
EXPECT_MAT_NEAR(gold, texData, 1e-2);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, CopyFromBuffer)
|
||||
CUDA_TEST_P(Texture2D, CopyFromBuffer)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
cv::ogl::Buffer buf_gold(gold, cv::ogl::Buffer::PIXEL_UNPACK_BUFFER, true);
|
||||
@@ -420,7 +420,7 @@ GPU_TEST_P(Texture2D, CopyFromBuffer)
|
||||
EXPECT_MAT_NEAR(gold, texData, 1e-2);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, CopyToGpuMat)
|
||||
CUDA_TEST_P(Texture2D, CopyToGpuMat)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
|
||||
@@ -432,7 +432,7 @@ GPU_TEST_P(Texture2D, CopyToGpuMat)
|
||||
EXPECT_MAT_NEAR(gold, dst, 1e-2);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Texture2D, CopyToBuffer)
|
||||
CUDA_TEST_P(Texture2D, CopyToBuffer)
|
||||
{
|
||||
cv::Mat gold = randomMat(size, type, 0, depth == CV_8U ? 255 : 1);
|
||||
|
||||
|
@@ -84,7 +84,7 @@ void checkMemSet(int status, void* userData)
|
||||
ASSERT_MAT_NEAR(dst_gold, dst, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Async, MemSet)
|
||||
CUDA_TEST_P(Async, MemSet)
|
||||
{
|
||||
cv::cuda::Stream stream;
|
||||
|
||||
@@ -114,7 +114,7 @@ void checkConvert(int status, void* userData)
|
||||
ASSERT_MAT_NEAR(dst_gold, dst, 0);
|
||||
}
|
||||
|
||||
GPU_TEST_P(Async, Convert)
|
||||
CUDA_TEST_P(Async, Convert)
|
||||
{
|
||||
cv::cuda::Stream stream;
|
||||
|
||||
@@ -128,7 +128,7 @@ GPU_TEST_P(Async, Convert)
|
||||
stream.waitForCompletion();
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(GPU_Stream, Async, ALL_DEVICES);
|
||||
INSTANTIATE_TEST_CASE_P(CUDA_Stream, Async, ALL_DEVICES);
|
||||
|
||||
#endif // CUDART_VERSION >= 5000
|
||||
|
||||
|
Reference in New Issue
Block a user