Commit Graph

6471 Commits

Author SHA1 Message Date
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 e28768eafa Fixed uninitialized variable in test that caused unreliable test results. 2017-05-17 16:43:32 -04:00
Davis King 537864f6b7 Cleanup and also fixed a cmake error when building dlib outside a project. 2017-05-16 21:14:09 -04:00
Davis King 5515d9cf82 merged 2017-05-16 20:51:44 -04:00
Davis King 4c4376722d yet more print statements 2017-05-16 20:50:34 -04:00
tschw f154fa76d7 Fix installed CMake targets when DLIB_ISO_CPP_ONLY (#595) (#597) 2017-05-16 14:47:53 -04:00
Davis King cb6777422f A test to see more info about what's going weird on appveyor. 2017-05-16 09:55:34 -04:00
Davis King 23332d6852 More logging messages 2017-05-15 07:12:18 -04:00
Davis King 334ba38ec6 A minor change to hopefully reduce inane warnings from visual studio. 2017-05-14 20:07:16 -04:00
Davis King fa94cdfa96 Removed references to old smart pointers from the docs. 2017-05-14 19:59:37 -04:00
Davis King 65aad55748 removed cruft 2017-05-14 19:55:01 -04:00
elelel b57b8b20aa Migrate from dlib::scoped_ptr to std::unique_ptr (#593)
* Convert unique_ptr

* Fix passing unique_ptr as copy by value

* Remove scoped_ptr implementation

* Fix missed files

* Move bool cast into tester macro

* Reexport scoped_ptr alias from sockets
2017-05-14 19:52:34 -04:00
Davis King 31f02b00eb merged 2017-05-14 19:40:32 -04:00
Davis King 77b051bef0 Don't use parallel builds since it makes appveyor run out of ram. Also
simplified script a little.
2017-05-14 19:40:10 -04:00
elelel ca60cf8aea Change type traits from inherited to explicit (#591) 2017-05-13 18:05:52 -04:00
Davis King a1c3b0672a Added more outputs to unit test error message. 2017-05-13 14:23:24 -04:00
elelel 32a96ddb75 Replace shared_ptr_thread_safe with std::shared_ptr (#590)
* Replace shared_ptr/weak_ptr with stdlib counterparts

* Fix ptr usage through tests compilation

* Bring back dlib smart ptrs as legacy

* Include scoped_ptr directly

* Add explanation about smart_ptr deprecation

* Replace shared_ptr_thread_safe

* Fix missed old include

* Removed missed old include
2017-05-13 14:05:23 -04:00
elelel 74f9f2fb2a Replace shared_ptr/weak_ptr with STL's versions (#588)
* Replace shared_ptr/weak_ptr with stdlib counterparts

* Fix ptr usage through tests compilation

* Bring back dlib smart ptrs as legacy

* Include scoped_ptr directly

* Add explanation about smart_ptr deprecation
2017-05-12 16:40:59 -04:00
Davis King fe3e86a186 Fixed spelling error 2017-05-07 19:40:42 -04:00
Davis King 70b885eb0b Added a note about exporting to XML. 2017-05-07 19:12:12 -04:00
Davis King 482c2db7ba Changed the location of the set_synchronization_file() call so that rerunning
the example restarts correctly.
2017-05-07 19:11:52 -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 0f6ddb6471 merged 2017-05-07 17:32:42 -04:00
Davis King 6e6a7cfe7f Added an overload of net_to_xml() that takes a string filename. 2017-05-07 17:32:15 -04:00
Davis King 87bc664bb9 Changed the XML format output by net_to_xml(). Specifically, the XML tag for
affine layers was changed so to use the same conventions as other layers that
support convolutional vs fully connected modes.
2017-05-07 17:19:26 -04:00
Davis King 917ea27bde Made net_to_xml() output floating point numbers with more digits. 2017-05-07 17:17:56 -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 4b2eea202c Made the attribute_list of the xml parser a little more friendly by allowing
you to ask for attributes that don't exist and get a defined behavior (an
exception being thrown) rather than it being a contract violation.
2017-05-06 12:46:19 -04:00
Davis King a1eea964b6 Added more comments 2017-05-05 05:42:13 -04:00
Andy Li 2dd2c92e38 Appveyor for Windows CI (#574)
* added basic AppVeyor config

* [AppVeyor] /verbosity:minimal
2017-05-04 21:08:53 -04:00
Jim61C 9e781781e6 remove enum in function signature to avoid cblas declaration conflicts (#571) 2017-05-03 05:40:04 -04:00
Evgeniy Fominov 09b4dc82b4 Multiarch installation fix (#567)
* fix multiarch install

* fix include dir

* cleaned up stuff and removed things we don't need anymore
2017-05-01 11:31:36 -04:00
cclough 5fa4533b9a Update CMakeLists.txt (#566) 2017-04-30 20:48:51 -04:00
Evgeniy Fominov 5f0c1a1c0d ARM NEON SIMD support (#564)
* added neon functions

* TK1 tests passed

* code cleanup

* Re-tested on TK1

* improve simd4i

* fixed simd4f_bool neon

* fix simd8i sse operator <=

* restored rsqrt/VSX

* fixed simd4f/neon/reciprocal_sqrt
2017-04-29 13:39:35 -04:00
Davis King 63f4f73b21 Added tt::log(), tt::exp(), and tt::log10() 2017-04-21 10:45:02 -04:00
Davis King dd4850b5bc Fixed tabbing 2017-04-21 10:15:27 -04:00
Davis King 70e767bfa1 merged 2017-04-21 09:51:08 -04:00
Davis King 6d636ffb7e Added python requirements.txt file for scikit-image 2017-04-19 22:19:17 -04:00
David Seifert 802fc36d27 CMake improvements (#539)
* Use GNUInstallDirs to allow changing target directories

* Multi-lib distributions need to change the libdir
  which is only portably possible with `GNUInstallDirs`.
  The current `LIB_INSTALL_DIR` solution is not portable
  and not supported upstream by Kitware.
* Multi-arch distributions such as Debian and Exherbo
  need to be able to change the bindir.

* Do not install LICENSE.txt

* Most distributions do not install license files, as they
  have all licenses stored in a central repository, in order
  not to duplicate the same file over and over.
* License files do not need to be installed for a piece of
  software to be licensed under that license.
2017-04-16 12:14:21 -04:00
Roy Macdonald b5cf3e3b54 Fixes issue with object named nil that collide with apple's definition. (#537)
* Fixes issue with object named nil that collide with apple's definition.

* fix nil named objects: changed name to no_parent
2017-04-14 20:41:22 -04:00
ernestotapiar a23d726bab Corrected typo that generated an erroneus Hessian of Brown's function. (#534) 2017-04-14 09:41:25 -04:00
Joost van Amersfoort 664ef39806 Add support for Python3.6 lib search with Cmake (#527)
* Add support for Python3.6 lib search with Cmake

A recent commit added support for python3.5 lib search with Cmake. This PR extends that to python 3.6.

Relevant old commit: 17a2c75ddf

* Turn python versions into a list
2017-04-07 11:02:37 -04:00
Davis King 99ee80d7f3 Tweak assert enable/disable behavior so the asserts still come on or off as a
function of the release/debug drop down menu when using visual studio's IDE.
2017-04-06 20:28:08 -04:00
Martijn Courteaux 18a54dbcc8 Fix asserts, super clean! (#526)
* Wether asserts are enabled or not, is now only suggested by dlib, and not longer imposed. The user can override using SET(CACHE FORCE) or command line -DDLIB_ENABLE_ASSERT=ON/OFF anytime.

* Fixed missing line in cmake for asserts.
2017-04-06 19:41:20 -04:00