platform/upstream/caffe.git
9 years agoMerge pull request #973 from shelhamer/tutorial-docs
Evan Shelhamer [Wed, 3 Sep 2014 20:27:48 +0000 (13:27 -0700)]
Merge pull request #973 from shelhamer/tutorial-docs

Document Caffe by a tour of key subjects + doxygen dev documentation

9 years ago[docs] configure doxygen + docs script for docs/doxygen site output
Evan Shelhamer [Wed, 3 Sep 2014 20:22:09 +0000 (13:22 -0700)]
[docs] configure doxygen + docs script for docs/doxygen site output

9 years agoupdate doxygen config to stop warnings
Evan Shelhamer [Wed, 3 Sep 2014 19:59:55 +0000 (12:59 -0700)]
update doxygen config to stop warnings

9 years ago[docs] suggest the CVPR14 deep learning tutorial for nice contrast
Evan Shelhamer [Wed, 3 Sep 2014 19:46:47 +0000 (12:46 -0700)]
[docs] suggest the CVPR14 deep learning tutorial for nice contrast

9 years ago[docs] draft data
Evan Shelhamer [Wed, 3 Sep 2014 19:25:52 +0000 (12:25 -0700)]
[docs] draft data

9 years agowrap up solver.md -- add update info for all solvers with citations;
Jeff Donahue [Wed, 3 Sep 2014 07:44:23 +0000 (00:44 -0700)]
wrap up solver.md -- add update info for all solvers with citations;
rules of thumb for SGD

9 years agonet.hpp: Doxygen-format docs
Jeff Donahue [Sat, 30 Aug 2014 22:30:48 +0000 (15:30 -0700)]
net.hpp: Doxygen-format docs

9 years agosolver.hpp: add \briefs
Jeff Donahue [Sat, 30 Aug 2014 22:12:39 +0000 (15:12 -0700)]
solver.hpp: add \briefs

9 years agosyncedmem.hpp: \brief and todo
Jeff Donahue [Sat, 30 Aug 2014 22:06:16 +0000 (15:06 -0700)]
syncedmem.hpp: \brief and todo

9 years agoblob.hpp: a little Doxygen-style documentation
Jeff Donahue [Sat, 30 Aug 2014 22:02:22 +0000 (15:02 -0700)]
blob.hpp: a little Doxygen-style documentation

9 years agofiller.hpp: add brief filler descriptions
Jeff Donahue [Sat, 30 Aug 2014 21:46:13 +0000 (14:46 -0700)]
filler.hpp: add brief filler descriptions

9 years agovision_layers.hpp: Doxygen \brief & TODO stubs.
Jeff Donahue [Sat, 30 Aug 2014 05:57:27 +0000 (22:57 -0700)]
vision_layers.hpp: Doxygen \brief & TODO stubs.

9 years agodata_layers: Doxygen \brief & TODO stubs.
Jeff Donahue [Sat, 30 Aug 2014 05:48:11 +0000 (22:48 -0700)]
data_layers: Doxygen \brief & TODO stubs.

9 years agocommon_layers.hpp: Doxygen \brief & TODO stubs.
Jeff Donahue [Sat, 30 Aug 2014 04:53:12 +0000 (21:53 -0700)]
common_layers.hpp: Doxygen \brief & TODO stubs.

9 years agoneuron_layers.hpp: Doxygen-style documentation
Jeff Donahue [Thu, 28 Aug 2014 09:36:35 +0000 (02:36 -0700)]
neuron_layers.hpp: Doxygen-style documentation

9 years agoloss_layers.hpp: Doxygen-style documentation
Jeff Donahue [Thu, 28 Aug 2014 11:17:43 +0000 (04:17 -0700)]
loss_layers.hpp: Doxygen-style documentation

9 years agolayer.hpp: Doxygen-style documentation
Jeff Donahue [Thu, 28 Aug 2014 07:24:12 +0000 (00:24 -0700)]
layer.hpp: Doxygen-style documentation

9 years ago.Doxyfile: don't warn if undocumented (maybe someday...)
Jeff Donahue [Fri, 29 Aug 2014 10:31:08 +0000 (03:31 -0700)]
.Doxyfile: don't warn if undocumented (maybe someday...)

9 years ago.Doxyfile: modify to generate C++ docs, excluding tests
Jeff Donahue [Thu, 28 Aug 2014 05:39:51 +0000 (22:39 -0700)]
.Doxyfile: modify to generate C++ docs, excluding tests

9 years ago.gitignore doxygen-generated documentation
Jeff Donahue [Thu, 28 Aug 2014 08:48:49 +0000 (01:48 -0700)]
.gitignore doxygen-generated documentation

9 years agoadd "make {docs,doxygen}" targets to build doxygen-generated docs
Jeff Donahue [Thu, 28 Aug 2014 08:44:02 +0000 (01:44 -0700)]
add "make {docs,doxygen}" targets to build doxygen-generated docs

9 years agoadd .Doxyfile: the default Doxygen config file from `doxygen -g`
Jeff Donahue [Thu, 28 Aug 2014 05:21:49 +0000 (22:21 -0700)]
add .Doxyfile: the default Doxygen config file from `doxygen -g`

9 years ago[wip] vision layers, start convolution
Jeff Donahue [Thu, 28 Aug 2014 02:38:13 +0000 (19:38 -0700)]
[wip] vision layers, start convolution

9 years agouse kramdown for markdown syntax; add mathjax
Jeff Donahue [Thu, 28 Aug 2014 04:16:18 +0000 (21:16 -0700)]
use kramdown for markdown syntax; add mathjax

9 years ago[docs] add note on Caffe convolution
Evan Shelhamer [Wed, 3 Sep 2014 17:58:25 +0000 (10:58 -0700)]
[docs] add note on Caffe convolution

9 years ago[docs] draft tutorial subjects
Evan Shelhamer [Sun, 24 Aug 2014 02:22:09 +0000 (19:22 -0700)]
[docs] draft tutorial subjects

9 years ago[docs] skeleton documentation subjects
Evan Shelhamer [Sun, 24 Aug 2014 01:19:10 +0000 (18:19 -0700)]
[docs] skeleton documentation subjects

9 years agoMerge pull request #1025 from mohomran/minor_fix_to_mnist_solver_prototxt
Evan Shelhamer [Tue, 2 Sep 2014 15:38:07 +0000 (08:38 -0700)]
Merge pull request #1025 from mohomran/minor_fix_to_mnist_solver_prototxt

Snapshot naming issue in mnist_autoencoder_solver_adagrad.prototxt

9 years agofixed relative path and prefix for adagrad-optimised autoencoder snapshots
Mohamed Omran [Tue, 2 Sep 2014 11:01:13 +0000 (13:01 +0200)]
fixed relative path and prefix for adagrad-optimised autoencoder snapshots

9 years agoMerge pull request #1023 from longjon/unbreak-pycaffe
Evan Shelhamer [Tue, 2 Sep 2014 03:05:57 +0000 (20:05 -0700)]
Merge pull request #1023 from longjon/unbreak-pycaffe

Fix pycaffe break due to dropping {blob,layer}.name

9 years ago[pycaffe] use _blob_names, _layer_names instead of removed .name
Jonathan L Long [Tue, 2 Sep 2014 02:32:24 +0000 (19:32 -0700)]
[pycaffe] use _blob_names, _layer_names instead of removed .name

9 years ago[pycaffe] expose Net.blob_names and Net.layer_names
Jonathan L Long [Tue, 2 Sep 2014 02:26:02 +0000 (19:26 -0700)]
[pycaffe] expose Net.blob_names and Net.layer_names

9 years ago[pycaffe] add converter for vector<string> used by _*_names
Jonathan L Long [Tue, 2 Sep 2014 02:36:49 +0000 (19:36 -0700)]
[pycaffe] add converter for vector<string> used by _*_names

9 years agoadd CUDA 6.5 error CUBLAS_STATUS_LICENSE_ERROR to cublasGetErrorString
Jeff Donahue [Mon, 1 Sep 2014 23:45:20 +0000 (16:45 -0700)]
add CUDA 6.5 error CUBLAS_STATUS_LICENSE_ERROR to cublasGetErrorString
enum

9 years agorevert tools/train_net.cpp to previous, depecated version
Jeff Donahue [Mon, 1 Sep 2014 21:51:59 +0000 (14:51 -0700)]
revert tools/train_net.cpp to previous, depecated version

9 years agoMerge branch 'qipeng-solvers' into dev
Jeff Donahue [Mon, 1 Sep 2014 21:13:56 +0000 (14:13 -0700)]
Merge branch 'qipeng-solvers' into dev

9 years agomake MNIST autoencoder solvers start from base_lr 0.01 and step (much
Jeff Donahue [Mon, 1 Sep 2014 19:35:03 +0000 (12:35 -0700)]
make MNIST autoencoder solvers start from base_lr 0.01 and step (much
better performance) and terminate at iter 65K

9 years agomake adagrad/nesterov train scripts follow new "run-from-root"
Jeff Donahue [Mon, 1 Sep 2014 19:32:54 +0000 (12:32 -0700)]
make adagrad/nesterov train scripts follow new "run-from-root"
convention

9 years agoAdd "test-on-train" stage to test accuracy on the training data; correct
Jeff Donahue [Mon, 1 Sep 2014 19:04:31 +0000 (12:04 -0700)]
Add "test-on-train" stage to test accuracy on the training data; correct
test_iter (should be 100 instead of 50)

9 years agomnist_autoencoder: always compute both cross-entropy loss and L2
Jeff Donahue [Mon, 1 Sep 2014 18:39:39 +0000 (11:39 -0700)]
mnist_autoencoder: always compute both cross-entropy loss and L2
(euclidean) error

9 years agohot fix for warning
qipeng [Tue, 26 Aug 2014 19:21:06 +0000 (12:21 -0700)]
hot fix for warning

9 years agolint
qipeng [Tue, 26 Aug 2014 19:02:20 +0000 (12:02 -0700)]
lint

9 years agoRe-added solver switch into the new caffe main excutable; fixed AdaGrad MNIST example
qipeng [Tue, 26 Aug 2014 19:01:26 +0000 (12:01 -0700)]
Re-added solver switch into the new caffe main excutable; fixed AdaGrad MNIST example

9 years agolint
qipeng [Tue, 26 Aug 2014 06:17:51 +0000 (23:17 -0700)]
lint

9 years agoAdded sanity check for AdaGradSolver; added MNIST examples for solvers
qipeng [Tue, 26 Aug 2014 06:02:56 +0000 (23:02 -0700)]
Added sanity check for AdaGradSolver; added MNIST examples for solvers

9 years agoMerge Test{SGD,AdaGrad,Nesterov}Solver; they become subclasses of
Jeff Donahue [Fri, 22 Aug 2014 18:51:16 +0000 (11:51 -0700)]
Merge Test{SGD,AdaGrad,Nesterov}Solver; they become subclasses of
TestGradientBasedSolver

9 years agocleanup caffe.proto
Jeff Donahue [Fri, 22 Aug 2014 18:51:29 +0000 (11:51 -0700)]
cleanup caffe.proto

9 years agoadded unit test for solvers and fixed solver bugs
qipeng [Thu, 21 Aug 2014 03:07:53 +0000 (20:07 -0700)]
added unit test for solvers and fixed solver bugs

9 years agoproto conflit, lint, and math_functions (compiler complaint)
qipeng [Wed, 20 Aug 2014 22:19:30 +0000 (15:19 -0700)]
proto conflit, lint, and math_functions (compiler complaint)

9 years agofixes after rebase
qipeng [Wed, 30 Jul 2014 02:56:36 +0000 (19:56 -0700)]
fixes after rebase

9 years agoAddressed Yangqing's comments
qipeng [Wed, 30 Jul 2014 02:46:37 +0000 (19:46 -0700)]
Addressed Yangqing's comments

9 years agofixed caffe.proto after a mistaken rebase
qipeng [Tue, 29 Jul 2014 17:06:32 +0000 (10:06 -0700)]
fixed caffe.proto after a mistaken rebase

9 years agoAdded L1 regularization support for the weights
qipeng [Thu, 24 Jul 2014 20:09:28 +0000 (13:09 -0700)]
Added L1 regularization support for the weights

9 years agobugfixes for AdaGrad
qipeng [Wed, 23 Jul 2014 17:25:44 +0000 (10:25 -0700)]
bugfixes for AdaGrad

9 years agoimproved numerical stability for AdaGrad
qipeng [Wed, 23 Jul 2014 04:17:19 +0000 (21:17 -0700)]
improved numerical stability for AdaGrad

9 years agofixed solver constructor in train_net.cpp
qipeng [Mon, 21 Jul 2014 17:47:55 +0000 (10:47 -0700)]
fixed solver constructor in train_net.cpp

9 years agoconverted pointers to shared_ptr
qipeng [Sun, 20 Jul 2014 15:57:33 +0000 (08:57 -0700)]
converted pointers to shared_ptr

9 years agorestored vituals in solver.hpp
qipeng [Sun, 20 Jul 2014 00:33:35 +0000 (17:33 -0700)]
restored vituals in solver.hpp

9 years agoSolver switching support & implementation of Nesterov's accelerated gradient and...
qipeng [Sat, 19 Jul 2014 21:14:21 +0000 (14:14 -0700)]
Solver switching support & implementation of Nesterov's accelerated gradient and AdaGrad

9 years agouse LMDB in mnist autoencoder examples
Jeff Donahue [Mon, 1 Sep 2014 18:32:12 +0000 (11:32 -0700)]
use LMDB in mnist autoencoder examples

9 years agomake no GPU error in CPU-only mode a little clearer
Evan Shelhamer [Mon, 1 Sep 2014 06:28:28 +0000 (23:28 -0700)]
make no GPU error in CPU-only mode a little clearer

9 years agoinclude comment on CPU mode fine-tuning for Flickr example
Evan Shelhamer [Mon, 1 Sep 2014 06:25:31 +0000 (23:25 -0700)]
include comment on CPU mode fine-tuning for Flickr example

9 years agoMerge pull request #1014 from longjon/cleaner-pycaffe
Evan Shelhamer [Mon, 1 Sep 2014 06:22:21 +0000 (23:22 -0700)]
Merge pull request #1014 from longjon/cleaner-pycaffe

Clean up pycaffe core

9 years agoMerge pull request #1008 from mohomran/mnist_with_lmdb
Evan Shelhamer [Sun, 31 Aug 2014 18:02:45 +0000 (11:02 -0700)]
Merge pull request #1008 from mohomran/mnist_with_lmdb

convert MNIST demo to lmdb, fixes

9 years agoMerge pull request #1015 from mohomran/fixing_parse_log_script
Evan Shelhamer [Sun, 31 Aug 2014 18:00:48 +0000 (11:00 -0700)]
Merge pull request #1015 from mohomran/fixing_parse_log_script

fix for tools/extra/parse_log.sh

9 years agoparse_log.sh adapted to new training log format + fixed typos and updated description
Mohamed Omran [Sun, 31 Aug 2014 13:00:09 +0000 (15:00 +0200)]
parse_log.sh adapted to new training log format + fixed typos and updated description

9 years agoupdated lenet_train_test.prototxt + minor correction to create_mnist.sh
Mohamed Omran [Sun, 31 Aug 2014 12:27:33 +0000 (14:27 +0200)]
updated lenet_train_test.prototxt + minor correction to create_mnist.sh

9 years agominor changes to variable names and error messages + set default backed in convert_mn...
Mohamed Omran [Fri, 29 Aug 2014 15:16:41 +0000 (17:16 +0200)]
minor changes to variable names and error messages + set default backed in convert_mnist_data.cpp to lmdb

9 years agodata now written to backend in batches
Mohamed Omran [Fri, 29 Aug 2014 15:04:25 +0000 (17:04 +0200)]
data now written to backend in batches

9 years agomnist demo now works with lmdb and leveldb (set parameter in create_mnist.sh), switch...
Mohamed Omran [Fri, 29 Aug 2014 14:04:24 +0000 (16:04 +0200)]
mnist demo now works with lmdb and leveldb (set parameter in create_mnist.sh), switched around includes

9 years ago[pycaffe] expose Blob.Reshape
Jonathan L Long [Sun, 31 Aug 2014 08:14:58 +0000 (01:14 -0700)]
[pycaffe] expose Blob.Reshape

While this function should never be called in the current interface, it
will be necessary to have when embedding Python.

9 years ago[pycaffe] remove name property from PyBlob and PyLayer
Jonathan L Long [Sun, 31 Aug 2014 07:45:06 +0000 (00:45 -0700)]
[pycaffe] remove name property from PyBlob and PyLayer

Attaching names to pycaffe Blobs and Layers isn't necessary anymore,
since they are now accessed by name. This change brings PyBlob and
PyLayer closer to their C++ counterparts, and makes it easier to pass
around blobs without knowing their names, e.g., when embedding Python
in a layer.

9 years ago[pycaffe] declare the _caffe module init function
Jonathan L Long [Sun, 31 Aug 2014 07:36:26 +0000 (00:36 -0700)]
[pycaffe] declare the _caffe module init function

9 years ago[pycaffe] split _caffe into source and header files
Jonathan L Long [Sun, 31 Aug 2014 07:26:12 +0000 (00:26 -0700)]
[pycaffe] split _caffe into source and header files

This brings pycaffe more in line with usual C++ style, and will allow
the wrapper classes to be used within caffe when embedding Python.

9 years ago[pycaffe] make PyBlob a template over Dtype
Jonathan L Long [Sun, 31 Aug 2014 07:07:43 +0000 (00:07 -0700)]
[pycaffe] make PyBlob a template over Dtype

We will not actually support double nets in Python with this commit, but
this change will be necessary to create layers that embed Python.

9 years ago[pycaffe] make PyNet a class, not a struct
Jonathan L Long [Sun, 31 Aug 2014 07:01:20 +0000 (00:01 -0700)]
[pycaffe] make PyNet a class, not a struct

9 years ago[pycaffe] use a namespace alias instead of using directives for boost::python
Jonathan L Long [Sun, 31 Aug 2014 06:55:57 +0000 (23:55 -0700)]
[pycaffe] use a namespace alias instead of using directives for boost::python

9 years ago[pycaffe] live in caffe namespace instead of opening it
Jonathan L Long [Sun, 31 Aug 2014 06:49:44 +0000 (23:49 -0700)]
[pycaffe] live in caffe namespace instead of opening it

9 years ago[pycaffe] use class names of the form Py* instead of Caffe*
Jonathan L Long [Sun, 31 Aug 2014 06:48:41 +0000 (23:48 -0700)]
[pycaffe] use class names of the form Py* instead of Caffe*

9 years agoremove residual pthread references, but restore in build for gtest
Evan Shelhamer [Sun, 31 Aug 2014 04:37:12 +0000 (21:37 -0700)]
remove residual pthread references, but restore in build for gtest

gtest depends on pthread in Ubuntu 14.04

9 years agoignore leveldb extension: ldb
Evan Shelhamer [Sun, 31 Aug 2014 04:32:21 +0000 (21:32 -0700)]
ignore leveldb extension: ldb

9 years agoMerge pull request #1004 from kloudkl/ignore
Evan Shelhamer [Sat, 30 Aug 2014 23:59:21 +0000 (16:59 -0700)]
Merge pull request #1004 from kloudkl/ignore

Ignore leveldb more thoroughly

9 years agofix up leveldb ignore
Evan Shelhamer [Sat, 30 Aug 2014 23:59:02 +0000 (16:59 -0700)]
fix up leveldb ignore

9 years agoMerge pull request #1010 from qipeng/boost-thread-with-nvcc
Evan Shelhamer [Sat, 30 Aug 2014 23:41:46 +0000 (16:41 -0700)]
Merge pull request #1010 from qipeng/boost-thread-with-nvcc

Fix boost-CUDA trouble in OS X build.

9 years agoMakefile: fix boost::thread linking, drop pthread, sort
Evan Shelhamer [Sat, 30 Aug 2014 23:41:01 +0000 (16:41 -0700)]
Makefile: fix boost::thread linking, drop pthread, sort

9 years agofix up renaming
Evan Shelhamer [Sat, 30 Aug 2014 23:37:51 +0000 (16:37 -0700)]
fix up renaming

9 years agorenaming && typo fix
qipeng [Sat, 30 Aug 2014 23:31:33 +0000 (16:31 -0700)]
renaming && typo fix

9 years agoMerge pull request #1012 from shelhamer/pr-policy
Evan Shelhamer [Sat, 30 Aug 2014 23:10:38 +0000 (16:10 -0700)]
Merge pull request #1012 from shelhamer/pr-policy

new PR policy: send master fixes + docs to master

9 years ago[docs] new PR policy: send master fixes + docs to master
Evan Shelhamer [Sat, 30 Aug 2014 23:06:17 +0000 (16:06 -0700)]
[docs] new PR policy: send master fixes + docs to master

To address fixes and documentation updates to master between official
releases from `dev` to `master` PRs will be accepted to `master`.

All new development must still branch off and PR to `dev`.

9 years agofix data_transformer param_name
Jeff Donahue [Fri, 29 Aug 2014 10:31:33 +0000 (03:31 -0700)]
fix data_transformer param_name

9 years agoMerge pull request #1011 from YS-L/dev
Evan Shelhamer [Sat, 30 Aug 2014 22:37:37 +0000 (15:37 -0700)]
Merge pull request #1011 from YS-L/dev

Fix norm_region param in cifar10 deployment net

9 years agoxcode compiler complaints (warnings)...
qipeng [Sat, 30 Aug 2014 17:38:33 +0000 (10:38 -0700)]
xcode compiler complaints (warnings)...

9 years agopatch MacOS NVCC boost::thread issue
qipeng [Sat, 30 Aug 2014 17:28:15 +0000 (10:28 -0700)]
patch MacOS NVCC boost::thread issue

9 years agoFix norm_region param in cifar10 deployment net
Yung Siang Liau [Sat, 30 Aug 2014 17:22:04 +0000 (01:22 +0800)]
Fix norm_region param in cifar10 deployment net

9 years agoback-merge
Evan Shelhamer [Sat, 30 Aug 2014 16:38:13 +0000 (09:38 -0700)]
back-merge

  [docs] Several documentation fixes
  Explain how to fix homebrew to allow updates after editing formulae

9 years agoMerge pull request #997 from ozancaglayn/dev
Evan Shelhamer [Sat, 30 Aug 2014 16:37:49 +0000 (09:37 -0700)]
Merge pull request #997 from ozancaglayn/dev

  [docs] Several documentation fixes

9 years ago[docs] Several documentation fixes
Ozan Çağlayan [Thu, 28 Aug 2014 11:05:09 +0000 (14:05 +0300)]
[docs] Several documentation fixes

- Fix a typo and a path in MNIST tutorial
- Rework instructions about Fedora installation

9 years agoMerge pull request #1001 from drdan14/homebrew-git-repair
Evan Shelhamer [Sat, 30 Aug 2014 16:35:07 +0000 (09:35 -0700)]
Merge pull request #1001 from drdan14/homebrew-git-repair

  Explain how to fix homebrew to allow updates after editing formulae

9 years agoExplain how to fix homebrew to allow updates after editing formulae
Daniel Golden [Wed, 27 Aug 2014 16:25:10 +0000 (09:25 -0700)]
Explain how to fix homebrew to allow updates after editing formulae

9 years agoIgnore LevelDB files
Kai Li [Fri, 29 Aug 2014 06:14:32 +0000 (14:14 +0800)]
Ignore LevelDB files