Skip to content

O
opencv
Commit 09ba133d authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

prepared GpuMat for moving to core module

parent 0b4e7d60
Expand all Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
modules/gpu/include/opencv2/gpu/gpumat.hpp
View file @ 09ba133d
This diff is collapsed.
modules/gpu/src/gpumat.cpp
View file @ 09ba133d
This diff is collapsed.
modules/stitching/src/blenders.cpp
View file @ 09ba133d
...@@ -387,7 +387,7 @@ void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr) ...@@ -387,7 +387,7 @@ void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr)
pyr.resize(num_levels + 1); pyr.resize(num_levels + 1);
vector<gpu::GpuMat> gpu_pyr(num_levels + 1); vector<gpu::GpuMat> gpu_pyr(num_levels + 1);
gpu_pyr[0] = img; gpu_pyr[0].upload(img);
for (int i = 0; i < num_levels; ++i) for (int i = 0; i < num_levels; ++i)
gpu::pyrDown(gpu_pyr[i], gpu_pyr[i + 1]); gpu::pyrDown(gpu_pyr[i], gpu_pyr[i + 1]);
...@@ -396,10 +396,10 @@ void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr) ...@@ -396,10 +396,10 @@ void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr)
{ {
gpu::pyrUp(gpu_pyr[i + 1], tmp); gpu::pyrUp(gpu_pyr[i + 1], tmp);
gpu::subtract(gpu_pyr[i], tmp, gpu_pyr[i]); gpu::subtract(gpu_pyr[i], tmp, gpu_pyr[i]);
pyr[i] = gpu_pyr[i]; gpu_pyr[i].download(pyr[i]);
} }
pyr[num_levels] = gpu_pyr[num_levels]; gpu_pyr[num_levels].download(pyr[num_levels]);
#endif #endif
} }
...@@ -425,7 +425,7 @@ void restoreImageFromLaplacePyrGpu(vector<Mat> &pyr) ...@@ -425,7 +425,7 @@ void restoreImageFromLaplacePyrGpu(vector<Mat> &pyr)
vector<gpu::GpuMat> gpu_pyr(pyr.size()); vector<gpu::GpuMat> gpu_pyr(pyr.size());
for (size_t i = 0; i < pyr.size(); ++i) for (size_t i = 0; i < pyr.size(); ++i)
gpu_pyr[i] = pyr[i]; gpu_pyr[i].upload(pyr[i]);
gpu::GpuMat tmp; gpu::GpuMat tmp;
for (size_t i = pyr.size() - 1; i > 0; --i) for (size_t i = pyr.size() - 1; i > 0; --i)
...@@ -434,7 +434,7 @@ void restoreImageFromLaplacePyrGpu(vector<Mat> &pyr) ...@@ -434,7 +434,7 @@ void restoreImageFromLaplacePyrGpu(vector<Mat> &pyr)
gpu::add(tmp, gpu_pyr[i - 1], gpu_pyr[i - 1]); gpu::add(tmp, gpu_pyr[i - 1], gpu_pyr[i - 1]);
} }
pyr[0] = gpu_pyr[0]; gpu_pyr[0].download(pyr[0]);
#endif #endif
} }
......
samples/gpu/performance/tests.cpp
View file @ 09ba133d
...@@ -37,7 +37,7 @@ TEST(matchTemplate) ...@@ -37,7 +37,7 @@ TEST(matchTemplate)
matchTemplate(src, templ, dst, CV_TM_CCORR); matchTemplate(src, templ, dst, CV_TM_CCORR);
CPU_OFF; CPU_OFF;
d_templ = templ; d_templ.upload(templ);
d_dst.create(d_src.rows - d_templ.rows + 1, d_src.cols - d_templ.cols + 1, CV_32F); d_dst.create(d_src.rows - d_templ.rows + 1, d_src.cols - d_templ.cols + 1, CV_32F);
GPU_ON; GPU_ON;
...@@ -65,7 +65,7 @@ TEST(minMaxLoc) ...@@ -65,7 +65,7 @@ TEST(minMaxLoc)
minMaxLoc(src, &min_val, &max_val, &min_loc, &max_loc); minMaxLoc(src, &min_val, &max_val, &min_loc, &max_loc);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
GPU_ON; GPU_ON;
gpu::minMaxLoc(d_src, &min_val, &max_val, &min_loc, &max_loc); gpu::minMaxLoc(d_src, &min_val, &max_val, &min_loc, &max_loc);
...@@ -107,9 +107,9 @@ TEST(remap) ...@@ -107,9 +107,9 @@ TEST(remap)
remap(src, dst, xmap, ymap, interpolation, borderMode); remap(src, dst, xmap, ymap, interpolation, borderMode);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_xmap = xmap; d_xmap.upload(xmap);
d_ymap = ymap; d_ymap.upload(ymap);
d_dst.create(d_xmap.size(), d_src.type()); d_dst.create(d_xmap.size(), d_src.type());
GPU_ON; GPU_ON;
...@@ -142,9 +142,9 @@ TEST(remap) ...@@ -142,9 +142,9 @@ TEST(remap)
remap(src, dst, xmap, ymap, interpolation, borderMode); remap(src, dst, xmap, ymap, interpolation, borderMode);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_xmap = xmap; d_xmap.upload(xmap);
d_ymap = ymap; d_ymap.upload(ymap);
d_dst.create(d_xmap.size(), d_src.type()); d_dst.create(d_xmap.size(), d_src.type());
GPU_ON; GPU_ON;
...@@ -177,9 +177,9 @@ TEST(remap) ...@@ -177,9 +177,9 @@ TEST(remap)
remap(src, dst, xmap, ymap, interpolation, borderMode); remap(src, dst, xmap, ymap, interpolation, borderMode);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_xmap = xmap; d_xmap.upload(xmap);
d_ymap = ymap; d_ymap.upload(ymap);
d_dst.create(d_xmap.size(), d_src.type()); d_dst.create(d_xmap.size(), d_src.type());
GPU_ON; GPU_ON;
...@@ -212,9 +212,9 @@ TEST(remap) ...@@ -212,9 +212,9 @@ TEST(remap)
remap(src, dst, xmap, ymap, interpolation, borderMode); remap(src, dst, xmap, ymap, interpolation, borderMode);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_xmap = xmap; d_xmap.upload(xmap);
d_ymap = ymap; d_ymap.upload(ymap);
d_dst.create(d_xmap.size(), d_src.type()); d_dst.create(d_xmap.size(), d_src.type());
GPU_ON; GPU_ON;
...@@ -240,7 +240,7 @@ TEST(dft) ...@@ -240,7 +240,7 @@ TEST(dft)
dft(src, dst); dft(src, dst);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(d_src.size(), d_src.type()); d_dst.create(d_src.size(), d_src.type());
GPU_ON; GPU_ON;
...@@ -266,7 +266,7 @@ TEST(cornerHarris) ...@@ -266,7 +266,7 @@ TEST(cornerHarris)
cornerHarris(src, dst, 5, 7, 0.1, BORDER_REFLECT101); cornerHarris(src, dst, 5, 7, 0.1, BORDER_REFLECT101);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(src.size(), src.type()); d_dst.create(src.size(), src.type());
GPU_ON; GPU_ON;
...@@ -286,7 +286,7 @@ TEST(integral) ...@@ -286,7 +286,7 @@ TEST(integral)
gen(src, size, size, CV_8U, 0, 256); gen(src, size, size, CV_8U, 0, 256);
sum.create(size + 1, size + 1, CV_32S); sum.create(size + 1, size + 1, CV_32S);
d_src = src; d_src.upload(src);
d_sum.create(size + 1, size + 1, CV_32S); d_sum.create(size + 1, size + 1, CV_32S);
for (int i = 0; i < 5; ++i) for (int i = 0; i < 5; ++i)
...@@ -320,7 +320,7 @@ TEST(norm) ...@@ -320,7 +320,7 @@ TEST(norm)
norm(src, NORM_INF); norm(src, NORM_INF);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
GPU_ON; GPU_ON;
for (int i = 0; i < 5; ++i) for (int i = 0; i < 5; ++i)
...@@ -350,7 +350,7 @@ TEST(meanShift) ...@@ -350,7 +350,7 @@ TEST(meanShift)
gen(src, size, size, CV_8UC4, Scalar::all(0), Scalar::all(256)); gen(src, size, size, CV_8UC4, Scalar::all(0), Scalar::all(256));
d_src = src; d_src.upload(src);
d_dst.create(d_src.size(), d_src.type()); d_dst.create(d_src.size(), d_src.type());
GPU_ON; GPU_ON;
...@@ -483,8 +483,8 @@ TEST(magnitude) ...@@ -483,8 +483,8 @@ TEST(magnitude)
magnitude(x, y, mag); magnitude(x, y, mag);
CPU_OFF; CPU_OFF;
d_x = x; d_x.upload(x);
d_y = y; d_y.upload(y);
d_mag.create(size, size, CV_32F); d_mag.create(size, size, CV_32F);
GPU_ON; GPU_ON;
...@@ -511,8 +511,8 @@ TEST(add) ...@@ -511,8 +511,8 @@ TEST(add)
add(src1, src2, dst); add(src1, src2, dst);
CPU_OFF; CPU_OFF;
d_src1 = src1; d_src1.upload(src1);
d_src2 = src2; d_src2.upload(src2);
d_dst.create(size, size, CV_32F); d_dst.create(size, size, CV_32F);
GPU_ON; GPU_ON;
...@@ -538,7 +538,7 @@ TEST(log) ...@@ -538,7 +538,7 @@ TEST(log)
log(src, dst); log(src, dst);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size, size, CV_32F); d_dst.create(size, size, CV_32F);
GPU_ON; GPU_ON;
...@@ -564,7 +564,7 @@ TEST(exp) ...@@ -564,7 +564,7 @@ TEST(exp)
exp(src, dst); exp(src, dst);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size, size, CV_32F); d_dst.create(size, size, CV_32F);
GPU_ON; GPU_ON;
...@@ -591,8 +591,8 @@ TEST(mulSpectrums) ...@@ -591,8 +591,8 @@ TEST(mulSpectrums)
mulSpectrums(src1, src2, dst, 0, true); mulSpectrums(src1, src2, dst, 0, true);
CPU_OFF; CPU_OFF;
d_src1 = src1; d_src1.upload(src1);
d_src2 = src2; d_src2.upload(src2);
d_dst.create(size, size, CV_32FC2); d_dst.create(size, size, CV_32FC2);
GPU_ON; GPU_ON;
...@@ -618,7 +618,7 @@ TEST(resize) ...@@ -618,7 +618,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size * 2, size * 2, CV_8U); d_dst.create(size * 2, size * 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -636,7 +636,7 @@ TEST(resize) ...@@ -636,7 +636,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size / 2, size / 2, CV_8U); d_dst.create(size / 2, size / 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -654,7 +654,7 @@ TEST(resize) ...@@ -654,7 +654,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size * 2, size * 2, CV_8U); d_dst.create(size * 2, size * 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -672,7 +672,7 @@ TEST(resize) ...@@ -672,7 +672,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size / 2, size / 2, CV_8U); d_dst.create(size / 2, size / 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -690,7 +690,7 @@ TEST(resize) ...@@ -690,7 +690,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size * 2, size * 2, CV_8U); d_dst.create(size * 2, size * 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -708,7 +708,7 @@ TEST(resize) ...@@ -708,7 +708,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size / 2, size / 2, CV_8U); d_dst.create(size / 2, size / 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -726,7 +726,7 @@ TEST(resize) ...@@ -726,7 +726,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size * 2, size * 2, CV_8U); d_dst.create(size * 2, size * 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -744,7 +744,7 @@ TEST(resize) ...@@ -744,7 +744,7 @@ TEST(resize)
resize(src, dst, dst.size()); resize(src, dst, dst.size());
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size / 2, size / 2, CV_8U); d_dst.create(size / 2, size / 2, CV_8U);
GPU_ON; GPU_ON;
...@@ -900,7 +900,7 @@ TEST(erode) ...@@ -900,7 +900,7 @@ TEST(erode)
erode(src, dst, ker); erode(src, dst, ker);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(d_src.size(), d_src.type()); d_dst.create(d_src.size(), d_src.type());
GPU_ON; GPU_ON;
...@@ -925,7 +925,7 @@ TEST(threshold) ...@@ -925,7 +925,7 @@ TEST(threshold)
threshold(src, dst, 50.0, 0.0, THRESH_BINARY); threshold(src, dst, 50.0, 0.0, THRESH_BINARY);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size, size, CV_8U); d_dst.create(size, size, CV_8U);
GPU_ON; GPU_ON;
...@@ -944,7 +944,7 @@ TEST(threshold) ...@@ -944,7 +944,7 @@ TEST(threshold)
threshold(src, dst, 50.0, 0.0, THRESH_BINARY); threshold(src, dst, 50.0, 0.0, THRESH_BINARY);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size, size, CV_32F); d_dst.create(size, size, CV_32F);
GPU_ON; GPU_ON;
...@@ -969,7 +969,7 @@ TEST(pow) ...@@ -969,7 +969,7 @@ TEST(pow)
pow(src, -2.0, dst); pow(src, -2.0, dst);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(size, size, CV_32F); d_dst.create(size, size, CV_32F);
GPU_ON; GPU_ON;
...@@ -1004,7 +1004,7 @@ TEST(projectPoints) ...@@ -1004,7 +1004,7 @@ TEST(projectPoints)
projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 8, CV_32F), dst); projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 8, CV_32F), dst);
CPU_OFF; CPU_OFF;
d_src = src; d_src.upload(src);
d_dst.create(1, size, CV_32FC2); d_dst.create(1, size, CV_32FC2);
GPU_ON; GPU_ON;
...@@ -1491,9 +1491,9 @@ TEST(gemm) ...@@ -1491,9 +1491,9 @@ TEST(gemm)
gemm(src1, src2, 1.0, src3, 1.0, dst); gemm(src1, src2, 1.0, src3, 1.0, dst);
CPU_OFF; CPU_OFF;
d_src1 = src1; d_src1.upload(src1);
d_src2 = src2; d_src2.upload(src2);
d_src3 = src3; d_src3.upload(src3);
d_dst.create(d_src1.size(), d_src1.type()); d_dst.create(d_src1.size(), d_src1.type());
GPU_ON; GPU_ON;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment