updated performance sample

diff --git a/samples/gpu/performance/performance.cpp b/samples/gpu/performance/performance.cpp
index ebf9889..f8a0fbe 100644 (file)
--- a/samples/gpu/performance/performance.cpp
+++ b/samples/gpu/performance/performance.cpp
@@ -139,13 +139,9 @@ int CV_CDECL cvErrorCallback(int /*status*/, const char* /*func_name*/,
 int main(int argc, char** argv)\r
 {\r
     if (argc < 2)\r
-    {\r
         cout << "Usage: performance_gpu <working_dir_with_slash>\n\n";\r
-    }\r
     else\r
-    {\r
         TestSystem::instance().setWorkingDir(argv[1]);\r
-    }\r
 \r
     redirectError(cvErrorCallback);\r
     TestSystem::instance().run();\r

diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index 304f606..6d7e93c 100644 (file)
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -167,32 +167,32 @@ TEST(cornerHarris)
 }\r
 \r
 \r
-TEST(integral)\r
-{\r
-    Mat src, sum;\r
-    gpu::GpuMat d_src, d_sum, d_buf;\r
-\r
-    int size = 4000;\r
-\r
-    gen(src, size, size, CV_8U, 0, 256);\r
-    sum.create(size + 1, size + 1, CV_32S);\r
-\r
-    d_src = src;\r
-    d_sum.create(size + 1, size + 1, CV_32S);\r
-\r
-    for (int i = 0; i < 5; ++i)\r
-    {\r
-        SUBTEST << "size " << size << ", 8U";\r
-\r
-        CPU_ON;\r
-        integral(src, sum);\r
-        CPU_OFF;\r
-\r
-        GPU_ON;\r
-        gpu::integralBuffered(d_src, d_sum, d_buf);\r
-        GPU_OFF;\r
-    }\r
-}\r
+//TEST(integral)\r
+//{\r
+//    Mat src, sum;\r
+//    gpu::GpuMat d_src, d_sum, d_buf;\r
+//\r
+//    int size = 4000;\r
+//\r
+//    gen(src, size, size, CV_8U, 0, 256);\r
+//    sum.create(size + 1, size + 1, CV_32S);\r
+//\r
+//    d_src = src;\r
+//    d_sum.create(size + 1, size + 1, CV_32S);\r
+//\r
+//    for (int i = 0; i < 5; ++i)\r
+//    {\r
+//        SUBTEST << "size " << size << ", 8U";\r
+//\r
+//        CPU_ON;\r
+//        integral(src, sum);\r
+//        CPU_OFF;\r
+//\r
+//        GPU_ON;\r
+//        gpu::integralBuffered(d_src, d_sum, d_buf);\r
+//        GPU_OFF;\r
+//    }\r
+//}\r
 \r
 \r
 TEST(norm)\r
@@ -202,20 +202,20 @@ TEST(norm)
 \r
     for (int size = 2000; size <= 4000; size += 1000)\r
     {\r
-        SUBTEST << "size " << size << ", 32FC4";\r
+        SUBTEST << "size " << size << ", 32FC4, NORM_INF";\r
 \r
         gen(src, size, size, CV_32FC4, Scalar::all(0), Scalar::all(1));\r
 \r
         CPU_ON;\r
         for (int i = 0; i < 5; ++i)\r
-            norm(src, NORM_L2);\r
+            norm(src, NORM_INF);\r
         CPU_OFF;\r
 \r
         d_src = src;\r
 \r
         GPU_ON;\r
         for (int i = 0; i < 5; ++i)\r
-            gpu::norm(d_src, NORM_L2, d_buf);\r
+            gpu::norm(d_src, NORM_INF, d_buf);\r
         GPU_OFF;\r
     }\r
 }\r