mirror of
https://github.com/opencv/opencv_contrib.git
synced 2025-10-24 11:33:26 +08:00
Author: Vitaliy Lyudvichenko Mentor: Anatoly Baksheev Squashed commits are: commit2f6d743Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sun May 31 00:05:31 2015 +0300 Added dnn module with draft interface. commitcfb9cfaAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 3 17:54:13 2015 +0300 Added libprotobuf to CMake. Added some Caffe files. commita6963b4Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 3 22:28:12 2015 +0300 Updated CMakeLists.txt to support protobuf Messages auto generation. commit6e23d93Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Jun 6 19:08:12 2015 +0300 Added simple .prototxt Caffe importer. commit77321e3Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Jun 8 16:59:27 2015 +0300 Added binary .caffemodel import support. Some changes in API. Caffe source files was cleared from unnecessary code. commit24a9effMerge:77321e3844c30eAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Jun 8 17:01:54 2015 +0300 Merge branch 'master' of https://github.com/Itseez/opencv_contrib commit62feeecAuthor: Anatoly Baksheev <no@email> Date: Mon Jun 8 19:41:11 2015 +0300 fixed compilation witn C++11 compiler commit42b36fbAuthor: Anatoly Baksheev <no@email> Date: Mon Jun 8 19:48:32 2015 +0300 more compilation commit10c3a13Author: Anatoly Baksheev <no@email> Date: Mon Jun 8 20:00:37 2015 +0300 umbrealla header commiteb95846Author: Anatoly Baksheev <no@email> Date: Mon Jun 8 20:26:47 2015 +0300 some warnings disabled commit1fd9304Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 9 13:58:35 2015 +0300 Dnn API changes (removed NetConfiguration, added LayerRegister, improved Blob). commitcae0bd4Merge:1fd9304eb95846Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 9 14:25:35 2015 +0300 Merge branch 'master' of github.com:ludv1x/opencv_contrib Conflicts: modules/dnn/include/opencv2/dnn.hpp commitee837c1Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 9 21:36:18 2015 +0300 Updated CMakeLists.txt commit194271dAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sun Jun 14 22:20:01 2015 +0300 Implemented allocation of DAG and it's forward pass. Added wrappers for basic layers. commited1c569Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 16 19:31:15 2015 +0300 [Bomb commit] Implemented 4 main layers. Changes in API. Added worked classification example from GTSRB into tests. commit51df95dAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 16 19:31:38 2015 +0300 Added GSTRB test data. commit2638433Merge:51df95d2a199bcAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 16 22:55:35 2015 +0300 Merge branch 'master' of https://github.com/Itseez/opencv_contrib commiteba62d5Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jun 18 16:58:57 2015 +0300 Layers implementations divided onto separated files. commit383715dAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jun 18 23:55:16 2015 +0300 libprotobuf is optional dependency now commit2c501f3Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Fri Jun 19 00:01:53 2015 +0300 Replace CMake WARNING onto STATUS commit29966eeAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Fri Jun 19 16:50:25 2015 +0300 added HAVE_PROTOBUF macro commit48ab440Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Jun 20 01:59:56 2015 +0300 Changed default parameter commit09ffc43Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Jun 20 11:58:56 2015 +0300 Fixed CMake and CPP build errors commiteef4d1dAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Jun 22 23:49:54 2015 +0300 Added LRN and SoftMax layers, some fixes commit22272e8Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 23 14:27:30 2015 +0300 Many fixes. commit9cddccfAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 23 14:29:42 2015 +0300 Added AlexNet sample. Removed big .caffemodel files from repo. commit66fa1e1Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jun 23 17:33:48 2015 +0300 Random changes in matlab/* module was reverted commitd80c272Author: Anatoly Baksheev <no@email> Date: Wed Jun 24 11:48:44 2015 +0300 fixed stand alone link errors commit0cd5459Author: Anatoly Baksheev <no@email> Date: Wed Jun 24 12:25:19 2015 +0300 added incdes to project so that it could be visible in some IDEs (ex. qtcreator) commit13edaaaAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 24 18:25:34 2015 +0300 Added group param to convolution_layer.cpp commit49b5e5eMerge:13edaaa0cd5459Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 24 18:25:50 2015 +0300 Merge branch 'master' of github.com:ludv1x/opencv_contrib commit99b8dacMerge:49b5e5e8a05bdbAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 24 18:26:10 2015 +0300 Merge branch 'master' of https://github.com/Itseez/opencv_contrib commit0f7907dAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 24 19:28:55 2015 +0300 updated example commit2717765Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 24 20:02:31 2015 +0300 Fixed some warnings commitd117983Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jun 24 22:18:05 2015 +0300 Deleted trailing whitespaces commitcfdf060Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jun 25 12:16:11 2015 +0300 Fixed more warnings. Updated glog_emulator.hpp: commit761b037Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Fri Jun 26 17:57:55 2015 +0300 Fixed critical bug in dnn::Dict. Fixed LRN layer implementation. Added layers test. commit6fd67d4Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jul 1 12:12:49 2015 +0300 Updated test. Added and successfuly passed AlexNet reproducibility test. Small fixes. commit9838234Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jul 2 12:25:30 2015 +0300 Some layer fixes. Added concat layer and avg. pooling to sucesfully run GoogLeNet. Added concat layer, implemented average pooling to run GoogLeNet. Fixed transpose error in FullyConnected layer (hotfix in softmax layer). Added GoogleNet test and updated AlexNet test (both nets now work fine). commit6f8a73bAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jul 2 12:31:48 2015 +0300 Replaced CMake if() condition for standalone build. commit0ebe30aAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Jul 4 22:41:55 2015 +0300 Blob class was significantly refactored commitd02bcedAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sun Jul 5 22:52:34 2015 +0300 More refactoring over Blob. More refactoring over Blob. Fix warnings and eliminated zlib dependency in cnpy.h commit85ad43dAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Jul 6 14:51:10 2015 +0300 Generalized Blob constructor and added vector of images support. AlexNet and GoogLeNet tests updated. commit75e09fdAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jul 8 19:05:36 2015 +0300 Implement ambiguous blobs naming scheme like: "layerName[.OutputName]". Old Caffe-like blob naming scheme was deleted. commitb9e85edAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Jul 8 19:15:51 2015 +0300 fixed sign type mismatch warnings in cnpy commit9783bbaMerge:b9e85ed6f8a73bAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jul 9 18:26:08 2015 +0300 Merge branch 'master' into work commitde4d800Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sun Jul 12 23:19:07 2015 +0300 Added .caffemodel files downloader for tests on post-build step. commitec74678Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jul 16 20:24:12 2015 +0300 Added element-wise layers. Fixed downloader and ConcatLayer. commit0362da9Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Fri Jul 17 17:24:59 2015 +0300 Added array support for Dict. commit3aa37d2Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Jul 18 01:12:08 2015 +0300 Array of parmaters support into caffe_importer.cpp commit172419eAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sun Jul 19 21:31:22 2015 +0300 Added Reshape layer and altered importer to correctly handle its params. commit71cfae4Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Jul 20 23:29:42 2015 +0300 Added Split and Slice layer. commit527fa65Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jul 21 16:10:29 2015 +0300 Rewrited concat_layer.cpp in OpenCV-style. Fixed slice layer, added test for slice, split and reshape layers. commit9b1e28eAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jul 23 00:09:15 2015 +0300 Refactored ConvolutionLayer, added Deconvolution. commitff45c22Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jul 23 21:19:25 2015 +0300 Fixed gcc build errors. commit6548839Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Jul 25 12:24:54 2015 +0300 Added testdata images. Fixed Dict copy constructor. commitdb4ff21Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Jul 25 22:26:29 2015 +0300 Updated classification example commit4da1046Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Jul 28 16:00:07 2015 +0300 Implemented draft Torch importer commit7d795afAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Jul 30 15:43:47 2015 +0300 Fixed Torch parser commit5e5cc96Merge:6f8a73bf9d4288Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 3 20:18:01 2015 +0300 Merge branch 'master' of https://github.com/Itseez/opencv_contrib commitdd15521Merge:5e5cc96db4ff21Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 3 20:18:28 2015 +0300 Merge branch 'master' of github.com:ludv1x/opencv_contrib commitc1f4410Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 3 20:20:00 2015 +0300 cnpy warns fix commit2905c03Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 4 19:16:34 2015 +0300 Multiple layers support added into Torch importer. Also DictValue was refactored. commit8df8936Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 5 13:14:52 2015 +0300 Added Torch blob reader and torch convolution test. commit1c220cfAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 6 13:29:45 2015 +0300 Added simple tests for Torch importer, fixed some importing issues. commit436d929Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 6 14:37:56 2015 +0300 Resolve reference counting problem in Torch importer. commitb2f4ba3Merge:c1f4410172fdb3Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Fri Aug 7 13:27:45 2015 +0300 Merge branch 'master' of https://github.com/Itseez/opencv_contrib commit5b08053Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 10 12:53:44 2015 +0300 Added ability to remove singleton dimensions in Reshape layer. Updated torch importer commitd0875b1Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 11 01:49:27 2015 +0300 Fixed average pooling error commitf8119eaAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 11 22:12:48 2015 +0300 Fixed Deconvolution layer. Added more wide layers test coverage. commitdf5eec6Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 12 16:54:44 2015 +0300 Added MVN layer. Renamed layer test data. commitf28effbAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 12 19:49:54 2015 +0300 Cleaned caffe dependencies commitb3dcc39Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 12 20:04:23 2015 +0300 Moved caffe.proto commit7d2e745Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 13 00:53:50 2015 +0300 Minor test changes commitc65d032Merge:7d2e745b2f4ba3Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 13 01:25:00 2015 +0300 Merge branch 'master' of https://github.com/ludv1x/opencv_contrib commit160d864Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 13 11:45:40 2015 +0300 Fixed small warn and example error commit06f949aAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 13 17:52:46 2015 +0300 Added initModule() procedure to explicitly init builtin layers commit23d3edeAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 17 15:10:04 2015 +0300 Added OpenCL im2col commit7acfda2Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 18 01:40:41 2015 +0300 Fixed im2col_ocl bug caused non-zero UMat offset commit9d932afAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 18 01:55:05 2015 +0300 Add new method to Net commit0903d79Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 19 01:28:44 2015 +0300 Added libprotobuf 2.5 as thridparty library commit4929177Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 19 01:32:51 2015 +0300 Add compiled caffe protobuf files commitfc9795bAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 19 18:57:12 2015 +0300 libprotobuf is a separate 3rdparty lib now commit93a372fAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 19 19:53:52 2015 +0300 Try fix msvc error and cmake error on android commit44e52a0Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 20 01:34:05 2015 +0300 Try fix msvc warnings commit519167eAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 20 18:51:44 2015 +0300 Refactored cmake and disabled AlexNet test commite644b5aAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 20 21:52:41 2015 +0300 Changed Blob::ptr and Blob::offset methods commitf07c564Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 20 22:53:02 2015 +0300 Add test data for layers commitfb66acbAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Fri Aug 21 01:59:17 2015 +0300 API refactoring renamed learnedParams blobs field added new fields: name and type for Layer commitf8715f3Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sat Aug 22 18:31:53 2015 +0300 Added licence headers commit945094bAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Sun Aug 23 03:06:24 2015 +0300 Update doc, small changes in Blob methods commitc681508Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 24 01:45:32 2015 +0300 Add more docs commitbd242d1Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 24 20:44:34 2015 +0300 Add docs for remaning functions commiteced23cAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Mon Aug 24 20:44:56 2015 +0300 Updated dnn example commit57a2194Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 25 15:18:21 2015 +0300 Add tutorial_dnn_build commitefde664Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 25 17:09:00 2015 +0300 Move binary testdata from opencv_contrib to opencv_extra commite52a7eeAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Tue Aug 25 19:01:05 2015 +0300 Add bvlc_googlenet.prototxt to samples commit3154fc0Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 26 01:43:53 2015 +0300 Add googlenet tutorial commit467cd96Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 26 13:32:27 2015 +0300 Updated dnn build tutorial commit83e39a9Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Wed Aug 26 19:56:36 2015 +0300 Fix typos commit0a64a9dAuthor: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 27 02:30:20 2015 +0300 Changed Caffe googlenet tutorial commitd2b6011Author: Vitaliy Lyudvichenko <ludv1x@yandex.ru> Date: Thu Aug 27 14:01:40 2015 +0300 Fix documentation warning commit248577aAuthor: Anatoly Baksheev <no@email> Date: Thu Sep 3 18:33:26 2015 +0300 fixed signed/unsigned cast warning
65 lines
2.9 KiB
C++
65 lines
2.9 KiB
C++
/*M///////////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
|
//
|
|
// By downloading, copying, installing or using the software you agree to this license.
|
|
// If you do not agree to this license, do not download, install,
|
|
// copy or use the software.
|
|
//
|
|
//
|
|
// License Agreement
|
|
// For Open Source Computer Vision Library
|
|
//
|
|
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
|
|
// Third party copyrights are property of their respective owners.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without modification,
|
|
// are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistribution's of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
//
|
|
// * Redistribution's in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other materials provided with the distribution.
|
|
//
|
|
// * The name of the copyright holders may not be used to endorse or promote products
|
|
// derived from this software without specific prior written permission.
|
|
//
|
|
// This software is provided by the copyright holders and contributors "as is" and
|
|
// any express or implied warranties, including, but not limited to, the implied
|
|
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
|
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
|
// indirect, incidental, special, exemplary, or consequential damages
|
|
// (including, but not limited to, procurement of substitute goods or services;
|
|
// loss of use, data, or profits; or business interruption) however caused
|
|
// and on any theory of liability, whether in contract, strict liability,
|
|
// or tort (including negligence or otherwise) arising in any way out of
|
|
// the use of this software, even if advised of the possibility of such damage.
|
|
//
|
|
//M*/
|
|
|
|
#ifndef __OPENCV_DNN_HPP__
|
|
#define __OPENCV_DNN_HPP__
|
|
|
|
// This is an umbrealla header to include into you project.
|
|
// We are free to change headers layout in dnn subfolder, so please include
|
|
// this header for future compartibility
|
|
|
|
|
|
/** @defgroup dnn Deep Neural Network module
|
|
@{
|
|
This module contains:
|
|
- API for new layers creation, layers are building bricks of neural networks;
|
|
- set of built-in most-useful Layers;
|
|
- API to constuct and modify comprehensive neural networks from layers;
|
|
- functionality for loading serialized networks models from differnet frameworks.
|
|
|
|
Functionality of this module is designed only for forward pass computations (i. e. network testing).
|
|
A network training is in principle not supported.
|
|
@}
|
|
*/
|
|
#include <opencv2/dnn/dnn.hpp>
|
|
|
|
#endif /* __OPENCV_DNN_HPP__ */
|