Commit Graph

6749 Commits

Author SHA1 Message Date
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
Joachim 22164e5dd4 Merge remote-tracking branch 'upstream/master' 2017-04-10 13:17:54 +01: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
Davis King f9acbf1fde Stopped using CMAKE_CXX_FLAGS to set dlib's preprocessor switches and instead
now use target_compile_options().  This should avoid weird configuration
errors that happen in rare instances on some platforms.
2017-04-06 17:07:07 -04:00
Davis King 39cbea3f71 Fixed cmake so openmp is handled properly in visual studio. The change yesterday
messed it up and effectively disabled cuda in visual studio.  This fixes that.
2017-04-05 20:02:26 -04:00
Davis King 88946d1222 Minor CMake cleanup 2017-04-05 11:50:20 -04:00
Davis King 6b6e7de92d Don't try to use any CUDA stuff when making matlab mex files. 2017-04-05 11:19:00 -04:00
Davis King 327de62cc2 Fixed bad results when using CUDA and the Intel MKL at the same time. This
was because of a bug introduced yesterday in the CMake scripts which would
accidentally pull in two versions of the OpenMP libraries, the GNU one and the
Intel one, but you can't mix them together at the same time.
2017-04-05 11:08:32 -04:00
goodloop 5b7b8bcda1 fix unneeded reference for cblas_strsm and cblas_dtrsm when DLIB_USE_BLAS is not defined (#519) 2017-04-05 10:58:15 -04:00
Davis King 72645edf31 Fixed visual studio errors about openmp compiler flags not being right. 2017-04-05 06:15:39 -04:00
Davis King 85a817da74 Added missing quotes so that cmake works on windows. 2017-04-05 05:47:06 -04:00
Davis King 1a46b1ba74 Fixed code not compiling when cuda is disabled. 2017-04-04 21:37:38 -04:00
Davis King a8384d39c5 merged 2017-04-04 21:30:18 -04:00
Davis King 373cbb57ec Added a tt::inv() for computing matrix inversions on the GPU. 2017-04-04 21:18:30 -04:00
Davis King b3dc81694f removed cruft 2017-04-04 15:56:58 -04:00
Davis King b2efd4e1d8 Moved the cuda_data class into its own file, renamed it to cuda_data_ptr, and
also pushed all the cuda #includes into a .cpp file.
2017-04-04 15:21:19 -04:00
Davis King be7531966f Added cusolver_error class. 2017-04-04 14:30:06 -04:00
Davis King 7d8d7fe402 Added cuda_data, a templated container for GPU memory. 2017-04-04 14:29:41 -04:00
sigbjorn 9dad00ec2c Provide cleanup for timer_global_clock singleton, issue #505 (#512)
* temporary workaround for python hanging on dlib::shared_ptr_thread_safe<global_clock> when extension-module using dlib is unloaded on windows platform

* added some more doc and tests for the new delete_global_clock function. Minor adjustment to singleton pattern to allow easy access to singleton shared ptr

* alternate _WIN32 specific solution, with no extra functions nor user-actions needed

* removed floating/obsolete delete_global_clock, tab to space

* leaving linux code unchanged in static desctructor

* cleanup not modified files

* align formatting
2017-04-04 14:28:19 -04:00
Davis King c1bc27c5ee Added support for cuDNN 6 2017-04-03 06:10:19 -04:00
Davis King 5d2edfe811 fixed spelling error in comment 2017-04-02 16:31:55 -04:00
Davis King 6717033829 Added a version of tt::affine_transform() that operates on a sub-rectangle
rather than the entire tensor.
2017-04-02 14:03:51 -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 a0990563db merged 2017-03-30 07:33:31 -04:00
Davis King 6d721e5cbe Fixed the visit_layers_backwards() and visit_layers_backwards_range() routines
so they visit layers in the correct order.
2017-03-30 07:32:42 -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