diff options
Diffstat (limited to 'SD-VBS/benchmarks/mser')
-rw-r--r-- | SD-VBS/benchmarks/mser/data/cif/12345.txt | 20 | ||||
-rw-r--r-- | SD-VBS/benchmarks/mser/data/fullhd/12345.txt | 5 | ||||
-rw-r--r-- | SD-VBS/benchmarks/mser/src/c/script_mser.c | 15 |
3 files changed, 6 insertions, 34 deletions
diff --git a/SD-VBS/benchmarks/mser/data/cif/12345.txt b/SD-VBS/benchmarks/mser/data/cif/12345.txt deleted file mode 100644 index 7b52a90..0000000 --- a/SD-VBS/benchmarks/mser/data/cif/12345.txt +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | mser-cif none 23 none 5 12891520 12345 0 0 0 | ||
2 | mser-cif none 23 none 5 11434520 12345 1 0 0 | ||
3 | mser-cif none 23 none 5 11921369 12345 2 0 0 | ||
4 | mser-cif none 23 none 5 11482610 12345 3 0 0 | ||
5 | mser-cif none 23 none 5 11647417 12345 4 0 0 | ||
6 | mser-cif none 24 none 5 11807215 12345 0 0 0 | ||
7 | mser-cif none 24 none 5 10360304 12345 1 0 0 | ||
8 | mser-cif none 24 none 5 11100626 12345 2 0 0 | ||
9 | mser-cif none 24 none 5 11111977 12345 3 0 0 | ||
10 | mser-cif none 24 none 5 10997935 12345 4 0 0 | ||
11 | mser-cif none 7 none 5 10835612 12345 0 0 0 | ||
12 | mser-cif none 7 none 5 10002626 12345 1 0 0 | ||
13 | mser-cif none 7 none 5 9990102 12345 2 0 0 | ||
14 | mser-cif none 7 none 5 10055976 12345 3 0 0 | ||
15 | mser-cif none 7 none 5 10037691 12345 4 0 0 | ||
16 | mser-cif none 13 none 5 26715692 12345 0 0 0 | ||
17 | mser-cif none 13 none 5 21470796 12345 1 0 0 | ||
18 | mser-cif none 13 none 5 17807620 12345 2 0 0 | ||
19 | mser-cif none 13 none 5 12195560 12345 3 0 0 | ||
20 | mser-cif none 13 none 5 12070256 12345 4 0 0 | ||
diff --git a/SD-VBS/benchmarks/mser/data/fullhd/12345.txt b/SD-VBS/benchmarks/mser/data/fullhd/12345.txt deleted file mode 100644 index b5b5ffc..0000000 --- a/SD-VBS/benchmarks/mser/data/fullhd/12345.txt +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | mser-fullhd none 24 none 5 322513728 12345 0 0 0 | ||
2 | mser-fullhd none 24 none 5 314226400 12345 1 0 0 | ||
3 | mser-fullhd none 24 none 5 312716224 12345 2 0 0 | ||
4 | mser-fullhd none 24 none 5 314495680 12345 3 0 0 | ||
5 | mser-fullhd none 24 none 5 292962400 12345 4 0 0 | ||
diff --git a/SD-VBS/benchmarks/mser/src/c/script_mser.c b/SD-VBS/benchmarks/mser/src/c/script_mser.c index d4a98cd..3e98f86 100644 --- a/SD-VBS/benchmarks/mser/src/c/script_mser.c +++ b/SD-VBS/benchmarks/mser/src/c/script_mser.c | |||
@@ -33,7 +33,6 @@ int main(int argc, char* argv[]) | |||
33 | 33 | ||
34 | int ndims, nel, gdl, nmer; | 34 | int ndims, nel, gdl, nmer; |
35 | 35 | ||
36 | printf("Input Image: "); | ||
37 | scanf("%s", im1); | 36 | scanf("%s", im1); |
38 | 37 | ||
39 | I = readImage(im1); | 38 | I = readImage(im1); |
@@ -74,19 +73,17 @@ int main(int argc, char* argv[]) | |||
74 | 73 | ||
75 | 74 | ||
76 | out = iMallocHandle(1, nmer); | 75 | out = iMallocHandle(1, nmer); |
77 | printf("start\n"); | 76 | for_each_job { |
78 | for_each_job{ | ||
79 | idx = mser(It, 2, subs_pt, nsubs_pt, strides_pt, visited_pt, dims, | 77 | idx = mser(It, 2, subs_pt, nsubs_pt, strides_pt, visited_pt, dims, |
80 | joins_pt, | 78 | joins_pt, |
81 | regions_pt, | 79 | regions_pt, |
82 | pairs_pt, | 80 | pairs_pt, |
83 | forest_pt, | 81 | forest_pt, |
84 | acc_pt, ell_pt, | 82 | acc_pt, ell_pt, |
85 | out); | 83 | out); |
86 | } | 84 | } |
87 | printf("end..\n"); | 85 | |
88 | 86 | #ifdef CHECK | |
89 | #ifdef CHECK | ||
90 | /** Self checking - use expected.txt from data directory **/ | 87 | /** Self checking - use expected.txt from data directory **/ |
91 | { | 88 | { |
92 | int tol, ret=0; | 89 | int tol, ret=0; |