Commit Graph

307 Commits

Author SHA1 Message Date
Davis King
a88f1bd8f2 Made the converter add zero padding layers when needed by Eltwise to replicate
the behavior of dlib's add_prev layers.
2017-05-24 07:24:12 -04:00
Davis King
984b694962 Made error message slightly better. 2017-05-22 19:11:00 -04:00
Davis King
cbda2b9e33 Changed caffe converter to require the user to specify the input tensor size
when the converter is run.
2017-05-22 19:06:55 -04:00
Davis King
10d3f93333 Dlib and caffe actually do use max pooling layers with padding in the same way.
So I just removed the error check that was preventing the conversion from
proceeding in that case.  I also added more useful output messages about
setting input tensor dimensions.
2017-05-19 20:16:40 -04:00
Davis King
fe3e86a186 Fixed spelling error 2017-05-07 19:40:42 -04:00
Davis King
c479219811 Renamed file 2017-05-07 19:08:41 -04:00
Davis King
2f74b3a03a Improved example python script 2017-05-07 19:07:18 -04:00
Davis King
84d54e2ff4 Added more comments 2017-05-07 17:16:08 -04:00
Davis King
16cd104b1d Fixed affine_fc and clarified error message. 2017-05-07 16:57:34 -04:00
Davis King
c41b30a8e6 Added missing sig and prelu layer support. 2017-05-07 16:23:35 -04:00
Davis King
af40aa1b0a Cleaned up how the output is output. 2017-05-07 15:49:19 -04:00
Davis King
7494f51d9a Added support for all the other dlib layers that make sense. 2017-05-07 15:26:18 -04:00
Davis King
99b06476c9 Added a simple tool to convert dlib model files, which are saved as XML files,
to caffe models.  Not all layers are supported yet, but it works on the net
from the first dlib dnn example program.  Will add the rest of the layers soon.
2017-05-06 15:02:38 -04:00
Davis King
e0a1437670 Made the title bar show the current image's number. 2017-03-30 10:43:49 -04:00
Davis King
e73b9e3aa9 Changed from ctrl to alt because otherwise it's easy to accidentally hit ctrl up and jump when you don't meant to while pruning an image list. 2017-03-27 21:00:37 -04:00
Davis King
a1d42b2552 Changed to ctrl+d since it's easier to press. 2017-03-27 20:13:39 -04:00
Davis King
fad836df23 Made it so you can remove images by pressing ctrl+r. 2017-03-27 20:11:04 -04:00
Davis King
072c9d9d4d Fixed cmake file to correctly enable C++11 by default. 2017-03-09 20:14:42 -05:00
Davis King
84cd330c70 Upped imglab version number 2017-03-04 07:58:55 -05:00
Davis King
cf66f6b1b0 clarified documentation 2017-03-01 05:26:22 -05:00
Davis King
655b7f7fd1 Switched cmake link names to dlib::dlib 2017-02-28 05:05:25 -05:00
Alain Vaucher
b41455fd26 Change minimum CMake version that supports the introduced features 2017-02-27 18:23:28 +01:00
Davis King
c182adbf4b Added a python interface to the face recognition DNN model. 2017-02-12 20:37:18 -05:00
Davis King
bdbf7bb8da Fixed documentation 2017-01-25 06:59:08 -05:00
Frank
7ef7ba84b3 Fix imglab readme typo in cd path (#400) 2017-01-16 11:47:06 -05:00
Avi Haiat
23785d5342 Expose python binding for running multiple detectors at once (#328)
* Expose python binding for running multiple detectors at once

* Remove unwanted typedef
2016-11-12 07:54:48 -05:00
Avi Haiat
85e2bcce02 Add option --rm-other-labels to imglab (#323)
* Add option --rm-other-labels to imglab

* Add support for comma separated list of labels
2016-11-09 20:36:52 -05:00
Davis King
85d421c356 Added --rmignore 2016-10-16 19:51:19 -04:00
Davis King
0848616d99 Improved xml logging for --resample 2016-10-16 16:21:28 -04:00
Davis King
f8fcfcd0b4 removed --extract-chips 2016-10-16 16:19:24 -04:00
Davis King
968322bcf8 Fixed confusing -h docs 2016-10-16 16:10:44 -04:00
Davis King
ae88702ba6 Added --jpg and --one-object-per-image. 2016-10-16 16:09:06 -04:00
Davis King
740f5753ce Removing mltool since I'm pretty sure no one uses it and it might even cause
user confusion.
2016-10-09 23:29:20 -04:00
Eugene
2a0b461926 fixed warning about unsigned-signed comparison in imgtool (#258) 2016-09-28 21:15:25 -04:00
Davis King
d41613d7cb Added --sort-num-objects and cleaned up code slightly. 2016-09-28 21:01:49 -04:00
Davis King
55a74bbaac merged 2016-09-28 09:30:48 -04:00
Davis King
0614700358 Fixed --cluster not working with relative paths. 2016-09-28 09:28:40 -04:00
Davis King
28a5512b64 Added --rmlabel and --rm-if-overlaps. Also changed the behavior of --split so that
it simply partitions the data and is an invertible operation.
2016-09-26 20:50:54 -04:00
Davis King
a2c152e8f1 Made --cluster skip empty images 2016-09-18 11:54:12 -04:00
Davis King
b040e65414 Improved CLI for --resample 2016-09-18 09:37:23 -04:00
Davis King
5940c7169c Fixed a bug in --cluster where it would output xml files with empty entries
if the input xml file contained unannotated images.
2016-09-18 09:09:39 -04:00
Davis King
863fa38439 Fixed getting cli warning message when gui closed. 2016-09-17 15:19:52 -04:00
Davis King
55c4ba531e Made imglab's --resample not skip objects near the edge of the image. 2016-09-17 09:12:33 -04:00
Davis King
f761ad5885 Added message about -h 2016-09-16 19:45:06 -04:00
Davis King
59d7df9ab4 Added --rmempty to imglab 2016-09-16 06:46:35 -04:00
Davis King
29467871b0 Made this script more robust 2016-09-12 20:00:37 -04:00
Davis King
f81359f160 Added --min-object-size option to imglab. 2016-09-07 21:12:01 -04:00
Davis King
1842d866ed Changed imglab --resample so that it never changes the aspect ratio of an
image.
2016-09-04 12:01:49 -04:00
Davis King
285bba7646 Fixed dlib.range's iterator interface to work in python 3. 2016-08-14 09:12:51 -04:00
Davis King
70eecbd6b0 Fixed compiler error on ubuntu 16.04 2016-08-13 09:03:16 -04:00
Davis King
48507ab590 Fixed grammar. 2016-08-13 09:02:57 -04:00
Davis King
bc4b2814af Fixed silly typo in script 2016-07-31 09:49:21 -04:00
Davis King
f2088e832b removed excessive error checking 2016-07-31 09:46:10 -04:00
Davis King
6402a37458 Made --resample use a 64bit hash of the image data
in the file names to make it so there won't ever be any name conflicts
in the cropped images.
2016-07-31 09:11:52 -04:00
Davis King
7c828d0812 Added some scripts that help with imglab XML file management. 2016-07-30 18:33:50 -04:00
Davis King
f77ca0c754 Added --files 2016-07-30 17:19:20 -04:00
Davis King
26c727c79e Added --ignore option. Also improved how scale jittering happens in --resample,
now the output images are always the same dimensions but the objects scale changes.
2016-07-30 14:34:53 -04:00
Davis King
5f48afc5b8 Improved --extract-chips and --resample a bit. 2016-07-21 22:32:25 -04:00
Davis King
0997460820 Added --extract-chips option to imglab. 2016-07-04 12:19:50 -04:00
Davis King
27440b6cbb Fixed bugs in the new --resample option 2016-07-04 08:35:45 -04:00
Davis King
1e50156ea1 Added the --resample option 2016-07-03 19:26:49 -04:00
Davis King
4de8678b57 Moved the auxiliary cmake into a common folder.
--HG--
rename : dlib/add_global_compiler_switch.cmake => dlib/cmake_utils/add_global_compiler_switch.cmake
rename : dlib/add_python_module => dlib/cmake_utils/add_python_module
rename : dlib/cmake_find_blas.txt => dlib/cmake_utils/cmake_find_blas.txt
rename : dlib/dlib.pc.in => dlib/cmake_utils/dlib.pc.in
rename : dlib/dlibConfig.cmake.in => dlib/cmake_utils/dlibConfig.cmake.in
rename : dlib/release_build_by_default => dlib/cmake_utils/release_build_by_default
rename : dlib/tell_visual_studio_to_use_static_runtime.cmake => dlib/cmake_utils/tell_visual_studio_to_use_static_runtime.cmake
rename : dlib/dnn/test_for_cpp11/CMakeLists.txt => dlib/cmake_utils/test_for_cpp11/CMakeLists.txt
rename : dlib/dnn/test_for_cpp11/cpp11_test.cpp => dlib/cmake_utils/test_for_cpp11/cpp11_test.cpp
rename : dlib/dnn/test_for_cuda/CMakeLists.txt => dlib/cmake_utils/test_for_cuda/CMakeLists.txt
rename : dlib/dnn/test_for_cuda/cuda_test.cu => dlib/cmake_utils/test_for_cuda/cuda_test.cu
rename : dlib/dnn/test_for_cudnn/CMakeLists.txt => dlib/cmake_utils/test_for_cudnn/CMakeLists.txt
rename : dlib/dnn/test_for_cudnn/find_cudnn.txt => dlib/cmake_utils/test_for_cudnn/find_cudnn.txt
rename : dlib/use_cpp_11.cmake => dlib/cmake_utils/use_cpp_11.cmake
2016-06-28 20:17:03 -04:00
nxwhite-str
b53e9cf010 Add detection threshold adjustment to object detection python interface (#140)
* Add cmake option to use external libjpeg on Mac OS

* Add adjust_threshold to python object detector

* Add cmake option to use external libjpeg on Mac OS

* Add adjust_threshold to python object detector

* Revert "Add cmake option to use external libjpeg on Mac OS"

This reverts commit 01f7fd13ea.

* Update detector example to set adjust_threshold
2016-06-22 21:17:16 -04:00
Davis King
32d6211052 Made imglab assign a random color to boxes with labels. 2016-06-10 20:52:10 -04:00
Davis King
738b4d36af Made imglab show the name of the current image in the title bar. 2016-05-31 06:45:02 -04:00
Davis King
58496f9f8a Added Johannes Huber's natvis file for visual studio. 2016-05-20 08:29:39 -04:00
Davis King
bf7fdb6394 merged 2016-03-30 06:44:25 -04:00
Evgeniy Fominov
2e002ac2da Python/Simple object detector trainer. Added upsample_limit option 2016-03-30 10:37:03 +03:00
Davis King
f169133b6c Made imglab look for gif files when scanning folders for images. 2016-02-13 05:26:56 -05:00
Davis King
6b064d3584 Made the python __version__ field come from the DLIB_VERSION macro set by
CMake.
2016-02-03 08:32:59 -05:00
Davis King
fcf80e1dd0 merged 2016-02-03 08:24:37 -05:00
Davis King
96e9129105 Made the python build get a DLIB_VERSION macro defined. Also cleaned up cmake
a little bit.
2016-02-03 08:24:11 -05:00
Patrick Snape
86e93291a0 Add __version__ to dlib module
Only issue is that the strong is hardcoded - otherwise
this is actually technically required by PEP 396
2016-02-03 10:59:04 +00:00
Patrick Snape
d7cac78757 Allow serilization and printing of shape_predictor_training_options
Add a simple print and serialization scheme for
shape_predictor_training_options. This enables you to serialize
your training options.
2016-02-03 10:58:21 +00:00
Patrick Snape
ad882c4a31 Propagate equality operators through to Python
Easy change to allow comparisons on the Python side for
both rectangle and drectangle
2016-02-03 10:57:39 +00:00
Davis King
fbd1178047 Made the python modules use SSE4 instructions by default. 2015-09-28 21:47:44 -04:00
Davis King
ecdfdea677 Fixed build error due to messed up includes. 2015-08-12 20:15:18 -04:00
Davis King
95887df088 Gave imglab the ability to jump to a specific image via a keyboard command. 2015-07-12 13:50:40 -04:00
Davis King
dbc1ea4ddd Added --rmdupes. 2015-07-05 14:36:39 -04:00
Davis King
11e0382238 Added --rmtrunc, made --rmdiff mark a box as ignored rather than
totally removing it, and also made --stats print the number of non-ignored
boxes.
2015-07-04 20:45:07 -04:00
Davis King
d6cd6a2ade Fixed a bug that crashed imglab when trying to cluster datasets with empty or
really small boxes.
2015-07-04 20:28:52 -04:00
Davis King
2651becf91 fixed bad input validation 2015-07-04 09:41:34 -04:00
Davis King
0b8e2a99af Added the --rotate option to imglab. 2015-07-04 09:37:02 -04:00
Davis King
aa4e230db0 Removed conditional compilation regarding jpeg and png support. It's just
always going to be required for imglab.
2015-07-04 09:15:02 -04:00
Davis King
7aed6b3a84 Added the --cluster option to imglab. 2015-07-03 11:58:59 -04:00
Davis King
ad9a9e6efa A minor optimization 2015-07-02 08:27:51 -04:00
Davis King
a8568a351b Added the --tile option to imglab. 2015-07-02 08:24:41 -04:00
Davis King
c9c3fa17b5 Made max_cost_assignment() give an error if you incorrectly give it a
non-square matrix.
2015-06-18 17:42:43 -04:00
Davis King
5cfff271a1 minor change to avoid compiler warning 2015-05-25 17:32:37 -07:00
Patrick Snape
23343f3de6 Add overlay overload for drectangle
This is useful for visualizing the tracking results.
2015-05-20 12:24:42 +01:00
Patrick Snape
60475dda9b Update docs on corr tracker, return side lobe
Added the missing documentation for the correlation tracker.
Didn't realise that the tracker returned the side lobe ratio,
so fixed the API to return it properly.
2015-05-20 11:52:29 +01:00
Patrick Snape
e3c3d39ab1 Add an API for the correlation tracker
This aids an API for the correlation based tracker that Davis
recently added to Dlib. I've made sure to allow overrides for
passing normal rectangles rather than drectangles (which isn't
currently supported in the Dlib C++ API). This is mostly
because I imagine people might initialize the tracking using
something like a bounding box from a detector (e.g.
load_frontal_face_detector).
2015-05-20 11:29:14 +01:00
Patrick Snape
c4cf31a746 Preparing for correlation tracker - add drectangle
The correlation tracker deals with the drectangle
(double rectangle) class which currently isn't wrapped. Therefore,
I add the drectangle class and refactor rectangles into their
own file. I also added a load of methods on rectangle that might
be useful such as intersection/contains/area etc.
2015-05-20 10:46:01 +01:00
Patrick Snape
8568c262e9 Incorrect IFDEF name for shape predictor
The word detector didn't make much sense!
2015-05-20 09:37:33 +01:00
Davis King
805aec8d00 updated README 2015-03-29 16:49:00 -04:00
Davis King
03b6fb0b7e updated version number and about docs 2015-03-29 16:44:31 -04:00
Davis King
0209f51a39 clarified documentation 2015-03-29 16:35:23 -04:00
Davis King
d1a5815cb9 Added default upsampling amount to detector.run(). Also moved the
new example code into face_detector.py and added some comments.
2015-03-28 23:16:54 -04:00
Davis King
216eb3f30f Merge branch 'py_det_conf_and_idx' of https://github.com/jackculpepper/dlib into jackculpepper-py_det_conf_and_idx 2015-03-28 22:48:19 -04:00
Davis King
2e2a14879b Renamed the lambda variable since it clashes with a python keyword. 2015-03-25 17:45:12 -04:00