From 0efc775370d2ff91927d1b383a99eab78dc5538f Mon Sep 17 00:00:00 2001 From: leochanj Date: Wed, 21 Oct 2020 01:52:54 -0400 Subject: debug libextra and remove matlab FLUSH_CACHES --- SD-VBS/benchmarks/disparity/data/cif/12345.txt | 30 ------------ SD-VBS/benchmarks/disparity/data/fullhd/12345.txt | 20 -------- .../benchmarks/disparity/src/matlab/getDisparity.m | 54 ---------------------- .../disparity/src/matlab/refineDisparity.m | 31 ------------- .../disparity/src/matlab/script_run_profile.m | 43 ----------------- 5 files changed, 178 deletions(-) delete mode 100644 SD-VBS/benchmarks/disparity/data/cif/12345.txt delete mode 100644 SD-VBS/benchmarks/disparity/data/fullhd/12345.txt delete mode 100755 SD-VBS/benchmarks/disparity/src/matlab/getDisparity.m delete mode 100755 SD-VBS/benchmarks/disparity/src/matlab/refineDisparity.m delete mode 100755 SD-VBS/benchmarks/disparity/src/matlab/script_run_profile.m (limited to 'SD-VBS/benchmarks/disparity') diff --git a/SD-VBS/benchmarks/disparity/data/cif/12345.txt b/SD-VBS/benchmarks/disparity/data/cif/12345.txt deleted file mode 100644 index 3dd9ffe..0000000 --- a/SD-VBS/benchmarks/disparity/data/cif/12345.txt +++ /dev/null @@ -1,30 +0,0 @@ -disparity-cif none 20 none 20 35311220 12345 0 0 0 -disparity-cif none 20 none 20 35151832 12345 1 0 0 -disparity-cif none 20 none 20 34643104 12345 2 0 0 -disparity-cif none 20 none 20 34641288 12345 3 0 0 -disparity-cif none 20 none 20 34671336 12345 4 0 0 -disparity-cif none 20 none 20 34709616 12345 5 0 0 -disparity-cif none 20 none 20 34779264 12345 6 0 0 -disparity-cif none 20 none 20 35022352 12345 7 0 0 -disparity-cif none 20 none 20 34799464 12345 8 0 0 -disparity-cif none 20 none 20 34794384 12345 9 0 0 -disparity-cif none 20 none 20 34796992 12345 10 0 0 -disparity-cif none 20 none 20 34681564 12345 11 0 0 -disparity-cif none 20 none 20 34667428 12345 12 0 0 -disparity-cif none 20 none 20 34687324 12345 13 0 0 -disparity-cif none 20 none 20 34694040 12345 14 0 0 -disparity-cif none 20 none 20 34672856 12345 15 0 0 -disparity-cif none 20 none 20 34699520 12345 16 0 0 -disparity-cif none 20 none 20 34716672 12345 17 0 0 -disparity-cif none 20 none 20 34686432 12345 18 0 0 -disparity-cif none 20 none 20 34692112 12345 19 0 0 -disparity-cif none 21 none 5 34821504 12345 0 0 0 -disparity-cif none 21 none 5 34748320 12345 1 0 0 -disparity-cif none 21 none 5 34746756 12345 2 0 0 -disparity-cif none 21 none 5 34736224 12345 3 0 0 -disparity-cif none 21 none 5 34877768 12345 4 0 0 -disparity-cif none 16 none 5 34706256 12345 0 0 0 -disparity-cif none 16 none 5 33841040 12345 1 0 0 -disparity-cif none 16 none 5 33794244 12345 2 0 0 -disparity-cif none 16 none 5 34052544 12345 3 0 0 -disparity-cif none 16 none 5 34092180 12345 4 0 0 diff --git a/SD-VBS/benchmarks/disparity/data/fullhd/12345.txt b/SD-VBS/benchmarks/disparity/data/fullhd/12345.txt deleted file mode 100644 index dd9af28..0000000 --- a/SD-VBS/benchmarks/disparity/data/fullhd/12345.txt +++ /dev/null @@ -1,20 +0,0 @@ -disparity-fullhd none 7 none 20 963629056 12345 0 0 0 -disparity-fullhd none 7 none 20 967578880 12345 1 0 0 -disparity-fullhd none 7 none 20 968594368 12345 2 0 0 -disparity-fullhd none 7 none 20 964075264 12345 3 0 0 -disparity-fullhd none 7 none 20 966877696 12345 4 0 0 -disparity-fullhd none 7 none 20 968793728 12345 5 0 0 -disparity-fullhd none 7 none 20 968632064 12345 6 0 0 -disparity-fullhd none 7 none 20 964562432 12345 7 0 0 -disparity-fullhd none 7 none 20 968084800 12345 8 0 0 -disparity-fullhd none 7 none 20 964557120 12345 9 0 0 -disparity-fullhd none 7 none 20 967762496 12345 10 0 0 -disparity-fullhd none 7 none 20 967815040 12345 11 0 0 -disparity-fullhd none 7 none 20 967683328 12345 12 0 0 -disparity-fullhd none 7 none 20 967838912 12345 13 0 0 -disparity-fullhd none 7 none 20 964496384 12345 14 0 0 -disparity-fullhd none 7 none 20 967954432 12345 15 0 0 -disparity-fullhd none 7 none 20 965618496 12345 16 0 0 -disparity-fullhd none 7 none 20 968003008 12345 17 0 0 -disparity-fullhd none 7 none 20 967080000 12345 18 0 0 -disparity-fullhd none 7 none 20 965547456 12345 19 0 0 diff --git a/SD-VBS/benchmarks/disparity/src/matlab/getDisparity.m b/SD-VBS/benchmarks/disparity/src/matlab/getDisparity.m deleted file mode 100755 index db64cac..0000000 --- a/SD-VBS/benchmarks/disparity/src/matlab/getDisparity.m +++ /dev/null @@ -1,54 +0,0 @@ -function [retDisparity retSAD minSAD]=getDisparity(Ileft, Iright, win_sz, max_shift) -Ileft=double(Ileft); -Iright=double(Iright); -[nr,nc,nb]=size(Ileft); -retSAD=zeros(nr, nc, max_shift); - -if(win_sz > 1) - half_win_sz=win_sz/2; - IleftPadded=padarray(Ileft, [half_win_sz, half_win_sz]); - IrightPadded=padarray(Iright, [half_win_sz, half_win_sz]); - for i=1:max_shift - retSAD(:,:,i)=correlateSAD(IleftPadded,IrightPadded, win_sz, i-1); - end - [minSAD retDisparity]=min(retSAD,[],3); -else - IleftPadded = Ileft; - IrightPadded = Iright; - retSAD=correlateSAD(IleftPadded,IrightPadded, win_sz, 0); - [minSAD retDisparity]=min(retSAD,[],3); -end -end - -function retSAD=correlateSAD(Ileft, Iright, win_sz, disparity) - -Iright_moved=padarray(Iright, [0,disparity], 'pre'); -Iright_moved=Iright_moved(:, 1:end-disparity,:); - -[rows, cols] = size(Ileft); -for i=1:rows - for j=1:cols - diff = Ileft(i,j) - Iright_moved(i,j); - SAD(i,j) = diff * diff; - end -end - -%2D scan. -integralImg=integralImage2D(SAD); -retSAD=integralImg(win_sz+1:end,win_sz+1:end,:) +integralImg(2:end-win_sz+1,2:end-win_sz+1,:)-integralImg(2:end-win_sz+1,win_sz+1:end,:)-integralImg(win_sz+1:end,2:end-win_sz+1,:); - -end - -function retImg=integralImage2D(I) -[nr,nc,nb]=size(I); -retImg=zeros(nr,nc,nb); -retImg(1,:,:)=I(1,:,:); -for i=2:nr - retImg(i,:,:)=retImg(i-1,:,:)+I(i,:,:); -end -%vtuneResumeMex; -for j=2:nc - retImg(:,j,:)=retImg(:,j-1,:)+retImg (:,j,:); -end -%vtunePauseMex; -end diff --git a/SD-VBS/benchmarks/disparity/src/matlab/refineDisparity.m b/SD-VBS/benchmarks/disparity/src/matlab/refineDisparity.m deleted file mode 100755 index f303236..0000000 --- a/SD-VBS/benchmarks/disparity/src/matlab/refineDisparity.m +++ /dev/null @@ -1,31 +0,0 @@ -function retDisparity=refineDisparity(Idisp, DispSAD, Ileft, Iright) -[nr nc ndist]=size(DispSAD); -retDisparity=zeros(nr, nc); - -IdispNext=padarray(Idisp, [0 1], 'replicate', 'post'); -IdispNext=IdispNext(:,2:end); - - -IdispDiff=abs(Idisp-IdispNext); -idx=find(IdispDiff>1); -[idxI idxJ]=ind2sub([nr, nc], idx); - -%if(Idisp(idx) -%sideFlag= -checkedResult= (abs( DispSAD(sub2ind( [nr, nc, ndist], idxI, idxJ, Idisp(idx))) - ... -DispSAD(sub2ind( [nr, nc, ndist], idxI, idxJ+1, Idisp(idx))) ) < 1 )+1; -checkedResult= checkedResult + (abs( DispSAD(sub2ind( [nr, nc, ndist], idxI, idxJ, Idisp(idx+nr))) - ... -DispSAD(sub2ind( [nr, nc, ndist], idxI, idxJ+1, Idisp(idx+nr))) ) < 1 ); -retDisparity(idx)=checkedResult; - - -% IdispDiff=(Idisp-IdispNext); -% idx=find(IdispDiff<-1); -% [idxI idxJ]=ind2sub([nr, nc], idx); -% -% checkedResult= abs( DispSAD(sub2ind( [nr, nc, ndist], idxI, idxJ, Idisp(idx+nr))) - ... -% DispSAD(sub2ind( [nr, nc, ndist], idxI, idxJ+1, Idisp(idx+nr))) ) < 0.5; -% retDisparity(idx)=checkedResult; - - - diff --git a/SD-VBS/benchmarks/disparity/src/matlab/script_run_profile.m b/SD-VBS/benchmarks/disparity/src/matlab/script_run_profile.m deleted file mode 100755 index 6e0386d..0000000 --- a/SD-VBS/benchmarks/disparity/src/matlab/script_run_profile.m +++ /dev/null @@ -1,43 +0,0 @@ -function script_run_profile(dataDir, resultDir, type, common, tooldir) - -path(path,common); - -tol = 2; -elapsed = [0, 0]; - -WIN_SZ = 8; -SHIFT = 64; - -if(strcmp(type,'test')) - WIN_SZ = 2; - SHIFT = 1; -elseif(strcmp(type, 'sim_fast')) - WIN_SZ = 4; - SHIFT = 4; -elseif(strcmp(type,'sim')) - WIN_SZ = 4; - SHIFT = 8; -end - - outFile = [resultDir, '/', 'out', '.bmp']; - - file = [dataDir, '/1.bmp']; - imleft = readImage(file); - imright = readImage([dataDir, '/2.bmp']); - [rows, cols] = size(imright); - - fprintf(1,'Input size\t\t- (%dx%d)\n', rows, cols); - - start = photonStartTiming; - [imDispOwn, DispSAD, minSAD]=getDisparity(double(imleft), double(imright), WIN_SZ, SHIFT); - stop = photonEndTiming; - elapsed = photonReportTiming(start, stop); - - writeMatrix(imDispOwn, dataDir); - imwrite(uint8(minSAD), outFile, 'bmp'); - - photonPrintTiming(elapsed); - - - - -- cgit v1.2.2