]> rtime.felk.cvut.cz Git - hercules2020/kcf.git/log
hercules2020/kcf.git
6 years agoDo not delete OpenCV_DIR example from toplevel Makefile
Michal Sojka [Mon, 9 Apr 2018 11:14:25 +0000 (13:14 +0200)]
Do not delete OpenCV_DIR example from toplevel Makefile

6 years agoModified Makefile to build all the current working options.
Shanigen [Fri, 6 Apr 2018 09:54:38 +0000 (11:54 +0200)]
Modified Makefile to build all the current working options.

6 years agoCompleted implementation of cufft and complexmat cuda implementation with custom...
Shanigen [Wed, 4 Apr 2018 18:12:44 +0000 (20:12 +0200)]
Completed implementation of cufft and complexmat cuda implementation with custom kernels. Also added big batch variable to ffts.

6 years agoSqr norm in complexmat now returns array.
Shanigen [Thu, 29 Mar 2018 11:08:36 +0000 (13:08 +0200)]
Sqr norm in complexmat now returns array.

6 years agoDeleted obsolete code.
Shanigen [Wed, 28 Mar 2018 14:54:11 +0000 (16:54 +0200)]
Deleted obsolete code.

6 years agoRemoved custom allocator in favor of thrust.
Shanigen [Wed, 28 Mar 2018 13:03:05 +0000 (15:03 +0200)]
Removed custom allocator in favor of thrust.

6 years agoAdded custom allocator for vectors in ComplexMat when using cuFFT.
Shanigen [Wed, 28 Mar 2018 08:37:56 +0000 (10:37 +0200)]
Added custom allocator for vectors in ComplexMat when using cuFFT.

6 years agoCorrected init in OpenCV FFT version
Shanigen [Wed, 28 Mar 2018 08:14:27 +0000 (10:14 +0200)]
Corrected init in OpenCV FFT version

6 years agoAdded compatibility for Opencv 3 in cuFFT.
Shanigen [Mon, 26 Mar 2018 15:41:42 +0000 (17:41 +0200)]
Added compatibility for Opencv 3 in cuFFT.

6 years agoAdded cmake support for cufft, also copied fftw functions to cufft and changed the...
Shanigen [Mon, 26 Mar 2018 14:10:26 +0000 (16:10 +0200)]
Added cmake support for cufft, also copied fftw functions to cufft and changed the to support cufft(in progress).

6 years agocuFFT use preparation correction
Shanigen [Mon, 26 Mar 2018 11:20:39 +0000 (13:20 +0200)]
cuFFT use preparation correction

6 years agoPrepare using cuFFT
Shanigen [Mon, 26 Mar 2018 11:17:11 +0000 (13:17 +0200)]
Prepare using cuFFT

6 years agoCorrected small mistake with OpenMP support for big batch mode.
Shanigen [Mon, 26 Mar 2018 08:34:34 +0000 (10:34 +0200)]
Corrected small mistake with OpenMP support for big batch mode.

6 years agoAdded support for OMP in big batch mode.
Shanigen [Mon, 26 Mar 2018 08:35:50 +0000 (10:35 +0200)]
Added support for OMP in big batch mode.

6 years agoBig batch mode is now working correctly.
Shanigen [Sun, 25 Mar 2018 16:51:50 +0000 (18:51 +0200)]
Big batch mode is now working correctly.

6 years agoBig batch update 2 (not finished)
Shanigen [Sun, 25 Mar 2018 15:27:32 +0000 (17:27 +0200)]
Big batch update 2 (not finished)
Problem with scaling.

6 years agoBig batch update (not finished)
Shanigen [Wed, 21 Mar 2018 18:52:09 +0000 (19:52 +0100)]
Big batch update (not finished)

6 years agoAdded number of scales to FFT init.
Shanigen [Tue, 20 Mar 2018 15:26:34 +0000 (16:26 +0100)]
Added number of scales to FFT init.

6 years agoAdded number of features to FFT init.
Shanigen [Tue, 20 Mar 2018 15:18:12 +0000 (16:18 +0100)]
Added number of features to FFT init.

6 years agoFFTW plans use FFTW_MEASURE now
Shanigen [Tue, 20 Mar 2018 09:29:15 +0000 (10:29 +0100)]
FFTW plans use FFTW_MEASURE now

6 years agoFFTW cleanup version 1. done.
Shanigen [Tue, 20 Mar 2018 08:57:58 +0000 (09:57 +0100)]
FFTW cleanup version 1. done.

6 years agofftw cleanup (not finished)
Michal Sojka [Mon, 19 Mar 2018 14:09:10 +0000 (15:09 +0100)]
fftw cleanup (not finished)

6 years agoRemoved debug couts.
Shanigen [Mon, 19 Mar 2018 10:19:38 +0000 (11:19 +0100)]
Removed debug couts.

6 years agoComplexMat is now output of forward_window fft.
Shanigen [Mon, 19 Mar 2018 10:17:13 +0000 (11:17 +0100)]
ComplexMat is now output of forward_window fft.

6 years agoChanged p_data in ComplexMat to mutable so it can be modified using the get_p_data...
Shanigen [Sun, 18 Mar 2018 12:39:55 +0000 (13:39 +0100)]
Changed p_data in ComplexMat to mutable so it can be modified using the get_p_data const function.

6 years agoAdded Big Batch mode for forward_window, which enables to transforming all features...
Shanigen [Fri, 16 Mar 2018 13:41:05 +0000 (14:41 +0100)]
Added Big Batch mode for forward_window, which enables to transforming all features from all scales together.

6 years agoAdded simpler cufftw fix also to the 1 channel iFFT.
Shanigen [Thu, 15 Mar 2018 16:16:27 +0000 (17:16 +0100)]
Added simpler cufftw fix also to the 1 channel iFFT.

6 years agoMerge branch 'master' of github.com:Shanigen/kcf
Shanigen [Thu, 15 Mar 2018 09:38:09 +0000 (10:38 +0100)]
Merge branch 'master' of github.com:Shanigen/kcf

6 years agoChanged ComplexMat p_data from vector of vectors of complex numbers to vector of...
Shanigen [Thu, 15 Mar 2018 09:37:15 +0000 (10:37 +0100)]
Changed ComplexMat p_data from vector of vectors of complex numbers to vector of complex numbers.

6 years agoMerge branch 'master' of github.com:Shanigen/kcf
Michal Sojka [Wed, 14 Mar 2018 22:07:50 +0000 (23:07 +0100)]
Merge branch 'master' of github.com:Shanigen/kcf

6 years agoCorrected small mistake.
Shanigen [Tue, 13 Mar 2018 10:47:06 +0000 (11:47 +0100)]
Corrected small mistake.

6 years agoAdded New-array Execute function support for FFTW.
Shanigen [Tue, 13 Mar 2018 10:43:18 +0000 (11:43 +0100)]
Added New-array Execute function support for FFTW.

6 years agoFFTW OpenMP support restored.
Shanigen [Tue, 13 Mar 2018 08:24:29 +0000 (09:24 +0100)]
FFTW OpenMP support restored.

6 years agoSimplify cufftw fix
Michal Sojka [Mon, 12 Mar 2018 23:43:35 +0000 (00:43 +0100)]
Simplify cufftw fix

There is no need to special-case cuda and non-cuda versions.

6 years agoAdded cmake modification for fftw async.
Shanigen [Mon, 12 Mar 2018 22:35:05 +0000 (23:35 +0100)]
Added cmake modification for fftw async.

6 years agoFFTW async support with multi threaded plans restored.
Shanigen [Mon, 12 Mar 2018 13:45:22 +0000 (14:45 +0100)]
FFTW async support with multi threaded plans restored.

6 years agoCorrected cuFFTW inverse FFT.
Shanigen [Mon, 12 Mar 2018 13:08:12 +0000 (14:08 +0100)]
Corrected cuFFTW inverse FFT.

6 years agoFinish conversion
Michal Sojka [Sun, 11 Mar 2018 22:55:19 +0000 (23:55 +0100)]
Finish conversion

There seems to be some bug in this commit. On TX2, tracking
performance is bad. "Native FFTW" seems to be OK.

6 years agoStart converting fftw version to "plan_many"
Michal Sojka [Sun, 11 Mar 2018 20:22:58 +0000 (21:22 +0100)]
Start converting fftw version to "plan_many"

6 years agoAdd DEBUG_PRINTF macro
Michal Sojka [Sun, 11 Mar 2018 08:09:53 +0000 (09:09 +0100)]
Add DEBUG_PRINTF macro

6 years agoDo not expect that size of fourier transform input and output is the same
Michal Sojka [Sun, 11 Mar 2018 13:42:20 +0000 (14:42 +0100)]
Do not expect that size of fourier transform input and output is the same

FFTW computes only a half of the full result, because is other half is
complex conjugate of the first half.

6 years agoAdd fftw-based FFT implementation
Michal Sojka [Sun, 11 Mar 2018 12:45:02 +0000 (13:45 +0100)]
Add fftw-based FFT implementation

6 years agoIntroduce FFT abstraction and move implementation to separate files
Michal Sojka [Sun, 11 Mar 2018 12:15:09 +0000 (13:15 +0100)]
Introduce FFT abstraction and move implementation to separate files

Also move cmake FFT logic from root directory to KCF library in src.

6 years agoMake downscaling configurable
Michal Sojka [Sun, 11 Mar 2018 08:03:18 +0000 (09:03 +0100)]
Make downscaling configurable

This is useful for debugging - smaller images are easier to print on
terminal.

6 years agocmake: Make it easy to override -O3 with CMAKE_BUILD_TYPE
Michal Sojka [Sun, 11 Mar 2018 07:59:31 +0000 (08:59 +0100)]
cmake: Make it easy to override -O3 with CMAKE_BUILD_TYPE

6 years agoRemove profiling code
Michal Sojka [Fri, 9 Mar 2018 23:53:31 +0000 (00:53 +0100)]
Remove profiling code

In its current form, it complicates understanding of the rest of the
code.

6 years agocmake: Use Ninja generator rather than Makefile
Michal Sojka [Wed, 7 Mar 2018 18:25:59 +0000 (19:25 +0100)]
cmake: Use Ninja generator rather than Makefile

Ninja is able to better paralelize the build and thus saves time when
experimenting with builds.

6 years agocmake: Move big part of cmake logic to src/
Michal Sojka [Wed, 7 Mar 2018 18:08:31 +0000 (19:08 +0100)]
cmake: Move big part of cmake logic to src/

The reason is that it is the KCF library (in src/), which needs this logic,
not the main program using the library.

6 years agoMerge branch 'master' of https://github.com/Shanigen/kcf
Shanigen [Tue, 6 Mar 2018 16:04:45 +0000 (17:04 +0100)]
Merge branch 'master' of https://github.com/Shanigen/kcf

6 years agoCorrected "corrected" fftw implementation, also made it in-place.
Shanigen [Tue, 6 Mar 2018 15:47:39 +0000 (16:47 +0100)]
Corrected "corrected" fftw implementation, also made it in-place.

6 years agoRemove wrong call to cv::dft in fftw version
Michal Sojka [Tue, 6 Mar 2018 11:24:15 +0000 (12:24 +0100)]
Remove wrong call to cv::dft in fftw version

6 years agoMake debug run-time option rather than compile time
Michal Sojka [Tue, 6 Mar 2018 10:09:02 +0000 (11:09 +0100)]
Make debug run-time option rather than compile time

6 years agoCorrected scaling issue in inverse fftw.
Shanigen [Tue, 6 Mar 2018 10:29:57 +0000 (11:29 +0100)]
Corrected scaling issue in inverse fftw.

6 years agocmake: Find CUDA before OpenCV
Michal Sojka [Tue, 6 Mar 2018 07:46:02 +0000 (08:46 +0100)]
cmake: Find CUDA before OpenCV

This way, CUDA is searched only once. OpenCV seems to not search it again, if
it is already found.

6 years agoMakefile: Add shortcut targets
Michal Sojka [Tue, 6 Mar 2018 07:41:01 +0000 (08:41 +0100)]
Makefile: Add shortcut targets

Now, one can run just 'make cufftw' to compile the particular variant.

6 years agocmake: Find CUDA before going into src
Michal Sojka [Tue, 6 Mar 2018 07:40:39 +0000 (08:40 +0100)]
cmake: Find CUDA before going into src

This fixes few compilation issues on TX2

6 years agoAdded support for cuFFTW and corrected wrong usage of OpenMP in FFTW.
Shanigen [Mon, 5 Mar 2018 17:15:03 +0000 (18:15 +0100)]
Added support for cuFFTW and corrected wrong usage of OpenMP in FFTW.

6 years agoFix linking of cufftw library
Michal Sojka [Mon, 5 Mar 2018 16:09:34 +0000 (17:09 +0100)]
Fix linking of cufftw library

6 years agoPass proper compiler options for cufftw compilation
Michal Sojka [Mon, 5 Mar 2018 15:43:53 +0000 (16:43 +0100)]
Pass proper compiler options for cufftw compilation

6 years agoDo not use external project for libpfm
Michal Sojka [Mon, 5 Mar 2018 15:18:39 +0000 (16:18 +0100)]
Do not use external project for libpfm

It's simpler to run 'apt install libpfm4-dev' and everything works.

6 years agoAdded profiling option to the project using perf_event_open and libpfm4. Also correct...
Shanigen [Sun, 4 Mar 2018 18:26:23 +0000 (19:26 +0100)]
Added profiling option to the project using perf_event_open and libpfm4. Also corrected some mistakes in README and corrected possible issue if FFTW async version.

6 years agoAdded async support to fftw and deleted some obsolete code in fhog.hpp.
Shanigen [Fri, 2 Mar 2018 22:37:26 +0000 (23:37 +0100)]
Added async support to fftw and deleted some obsolete code in fhog.hpp.

6 years agoPrepare for using cuFFTW
Michal Sojka [Fri, 2 Mar 2018 14:06:58 +0000 (15:06 +0100)]
Prepare for using cuFFTW

This does not work yet, as we currently use cuFFTW unsupported functions
such as fftw_alloc_real.

6 years agoFix placement of omp critical
Michal Sojka [Fri, 2 Mar 2018 14:05:23 +0000 (15:05 +0100)]
Fix placement of omp critical

6 years agoBetter way to not warn about omp pragmas when compiling without omp
Michal Sojka [Fri, 2 Mar 2018 13:49:27 +0000 (14:49 +0100)]
Better way to not warn about omp pragmas when compiling without omp

6 years agoAdd --output parameter
Michal Sojka [Fri, 2 Mar 2018 13:02:23 +0000 (14:02 +0100)]
Add --output parameter

6 years agoAutomatically use groundtruth.txt when it exists (with zero or one arguments)
Michal Sojka [Fri, 2 Mar 2018 12:55:03 +0000 (13:55 +0100)]
Automatically use groundtruth.txt when it exists (with zero or one arguments)

6 years agoSilence warnings when compiled without OpenMP
Michal Sojka [Tue, 27 Feb 2018 16:18:00 +0000 (17:18 +0100)]
Silence warnings when compiled without OpenMP

6 years agoUpdate README to include -v option
Michal Sojka [Tue, 27 Feb 2018 15:33:18 +0000 (16:33 +0100)]
Update README to include -v option

6 years agoSimplify CMake configuration - use just one variable for FFT implementation selection
Michal Sojka [Tue, 27 Feb 2018 15:26:26 +0000 (16:26 +0100)]
Simplify CMake configuration - use just one variable for FFT implementation selection

6 years agoAdd example CMAKE option to set OpenCV location
Michal Sojka [Tue, 27 Feb 2018 12:30:07 +0000 (13:30 +0100)]
Add example CMAKE option to set OpenCV location

6 years agoMake visualization configurable at run-time rather than at compile time
Michal Sojka [Tue, 27 Feb 2018 12:28:02 +0000 (13:28 +0100)]
Make visualization configurable at run-time rather than at compile time

6 years agoAdde support for OpenMP now original OpenCV implementatio and FFTW implementation...
Shanigen [Sat, 24 Feb 2018 01:21:29 +0000 (02:21 +0100)]
Adde support for OpenMP now original OpenCV implementatio and FFTW implementation is working with OpenMP. Also added some minor changes to CMake options and to README.

6 years agoVisualize result by default and do not wait for a key
Michal Sojka [Thu, 22 Feb 2018 15:13:38 +0000 (16:13 +0100)]
Visualize result by default and do not wait for a key

6 years agoAdd Makefile that compiles all the available variants
Michal Sojka [Thu, 22 Feb 2018 14:46:17 +0000 (15:46 +0100)]
Add Makefile that compiles all the available variants

6 years agoAdd simple command line argument parsing
Michal Sojka [Thu, 22 Feb 2018 13:19:22 +0000 (14:19 +0100)]
Add simple command line argument parsing

6 years agoprofiling: Remove absolute paths
Michal Sojka [Thu, 22 Feb 2018 11:34:54 +0000 (12:34 +0100)]
profiling: Remove absolute paths

6 years agoFix "misleading indentation" warnings
Michal Sojka [Thu, 22 Feb 2018 11:15:53 +0000 (12:15 +0100)]
Fix "misleading indentation" warnings

6 years agoFixes in README
Michal Sojka [Thu, 22 Feb 2018 09:59:39 +0000 (10:59 +0100)]
Fixes in README

6 years agoReindent and replace tabs with spaces
Michal Sojka [Thu, 22 Feb 2018 09:53:58 +0000 (10:53 +0100)]
Reindent and replace tabs with spaces

6 years agoWhitespace cleanup
Michal Sojka [Thu, 22 Feb 2018 09:44:50 +0000 (10:44 +0100)]
Whitespace cleanup

6 years agoUpdate README.md
Shanigen [Tue, 20 Feb 2018 09:58:38 +0000 (10:58 +0100)]
Update README.md

6 years agoUpdate README.md
Shanigen [Tue, 20 Feb 2018 09:54:19 +0000 (10:54 +0100)]
Update README.md

6 years agoAdded some basic compability for FFTW with OpenMP. (WIP)
Shanigen [Tue, 20 Feb 2018 07:47:56 +0000 (08:47 +0100)]
Added some basic compability for FFTW with OpenMP. (WIP)

6 years agoUpdate README.md
Shanigen [Mon, 19 Feb 2018 15:10:09 +0000 (16:10 +0100)]
Update README.md

6 years agoMerge pull request #1 from Shanigen/FFTW
Shanigen [Mon, 19 Feb 2018 15:07:56 +0000 (16:07 +0100)]
Merge pull request #1 from Shanigen/FFTW

Fftw

6 years agoUpdate README.md
Shanigen [Mon, 19 Feb 2018 11:31:54 +0000 (12:31 +0100)]
Update README.md

6 years agoUpdate README.md
Shanigen [Mon, 19 Feb 2018 11:30:43 +0000 (12:30 +0100)]
Update README.md

6 years agoUpdate README.md
Shanigen [Mon, 19 Feb 2018 11:28:39 +0000 (12:28 +0100)]
Update README.md

6 years agoUpdate README.md
Shanigen [Sun, 18 Feb 2018 16:35:07 +0000 (17:35 +0100)]
Update README.md

6 years agoAdded FFTW support
Shanigen [Sun, 7 Jan 2018 17:48:18 +0000 (18:48 +0100)]
Added FFTW support

Adde FFTW support and also more Cmake options. FFTW has also option to enable threads using FFTW library but OpenMP FFTW is not implemented yet.

6 years agoFFTs are working but IFFT is not. Also added some more options into the cmake
Shanigen [Sun, 31 Dec 2017 14:03:16 +0000 (15:03 +0100)]
FFTs are working but IFFT is not. Also added some more options into the cmake

6 years agoAdded some control macros.
Shanigen [Sun, 17 Dec 2017 14:35:49 +0000 (15:35 +0100)]
Added some control macros.

6 years agoUpdated cmake. Now you can enable visualization of results, opecv cufft implementatio...
Shanigen [Fri, 15 Dec 2017 13:54:40 +0000 (14:54 +0100)]
Updated cmake. Now you can enable visualization of results, opecv cufft implementation(not complete) and opencv fft cpu async or serial version.

6 years agoShould be able to compile the program everywhere now. Also deleted some useless bits...
Shanigen [Thu, 14 Dec 2017 14:49:10 +0000 (15:49 +0100)]
Should be able to compile the program everywhere now. Also deleted some useless bits of code. fft2(const cv::Mat &input) should now work correctly with hostmem.

6 years agoDeleting automaticaly generated files by TEX
Shanigen [Sun, 10 Dec 2017 15:38:10 +0000 (16:38 +0100)]
Deleting automaticaly generated files by TEX

6 years agoAttempt to compile it on my computer
Michal Sojka [Fri, 1 Dec 2017 13:16:07 +0000 (14:16 +0100)]
Attempt to compile it on my computer

Not finished.

6 years agoAdd sse2neon submodule
Michal Sojka [Fri, 1 Dec 2017 12:53:41 +0000 (13:53 +0100)]
Add sse2neon submodule

6 years agoLast changes from @Shanigen
Michal Sojka [Fri, 1 Dec 2017 12:28:52 +0000 (13:28 +0100)]
Last changes from @Shanigen

6 years agoWork I have done so far
Shanigen [Sun, 26 Nov 2017 17:52:11 +0000 (18:52 +0100)]
Work I have done so far