platform/upstream/caffe.git
10 years agoMerge pull request #142 from shelhamer/data-aux
Evan Shelhamer [Wed, 26 Feb 2014 03:35:51 +0000 (19:35 -0800)]
Merge pull request #142 from shelhamer/data-aux

Sort out models, data, examples, and tools

10 years agobring imagenet docs back to reality
Evan Shelhamer [Wed, 26 Feb 2014 01:47:34 +0000 (17:47 -0800)]
bring imagenet docs back to reality

- fix paths
- replace shell command blocks with scripts
- file ipython notebooks in examples
- proofread

10 years agobring mnist docs back to reality
Evan Shelhamer [Wed, 26 Feb 2014 00:59:50 +0000 (16:59 -0800)]
bring mnist docs back to reality

10 years agofix + rename lenet training script
Evan Shelhamer [Wed, 26 Feb 2014 00:55:17 +0000 (16:55 -0800)]
fix + rename lenet training script

10 years agoharmonize imagenet example, name caffe reference model CaffeNet
Evan Shelhamer [Wed, 26 Feb 2014 00:42:10 +0000 (16:42 -0800)]
harmonize imagenet example, name caffe reference model CaffeNet

10 years agofix mnist, add deploy net example
Evan Shelhamer [Wed, 26 Feb 2014 00:00:50 +0000 (16:00 -0800)]
fix mnist, add deploy net example

10 years agoTODO cifar example
Evan Shelhamer [Tue, 25 Feb 2014 23:59:49 +0000 (15:59 -0800)]
TODO cifar example

10 years agoeverything in its right place
Evan Shelhamer [Tue, 25 Feb 2014 23:46:08 +0000 (15:46 -0800)]
everything in its right place

10 years agoinclude model checksum, you never know these days
Evan Shelhamer [Tue, 25 Feb 2014 10:02:31 +0000 (02:02 -0800)]
include model checksum, you never know these days

10 years agofetch caffe_reference_imagenet_model
Evan Shelhamer [Tue, 25 Feb 2014 09:57:19 +0000 (01:57 -0800)]
fetch caffe_reference_imagenet_model

10 years agoswap ilsvrc data with fetch script
Evan Shelhamer [Tue, 25 Feb 2014 09:53:16 +0000 (01:53 -0800)]
swap ilsvrc data with fetch script

10 years agoexplain ignore, and ignore data, models, and examples
Evan Shelhamer [Tue, 25 Feb 2014 07:44:04 +0000 (23:44 -0800)]
explain ignore, and ignore data, models, and examples

Data, models, and examples should not be versioned by default. Reference
versions of these are not to be casually committed.

Plus this makes for a better playground in examples without having to
worry about data, intermediate files, or experiments being accidentally
tracked.

10 years agofile models
Evan Shelhamer [Tue, 25 Feb 2014 07:43:47 +0000 (23:43 -0800)]
file models

10 years agofix mnist comments in cifar example
Evan Shelhamer [Tue, 25 Feb 2014 07:00:35 +0000 (23:00 -0800)]
fix mnist comments in cifar example

10 years agoMake tools/ for core binaries, stow scripts/ in tools/extra
Evan Shelhamer [Tue, 25 Feb 2014 06:45:29 +0000 (22:45 -0800)]
Make tools/ for core binaries, stow scripts/ in tools/extra

Collect core Caffe tools like train_net, device_query, etc. together in
tools/ and include helper scripts under tools/extra.

10 years agofile mnist
Evan Shelhamer [Tue, 25 Feb 2014 06:22:30 +0000 (22:22 -0800)]
file mnist

10 years agoadd imagenet mean file
Evan Shelhamer [Sat, 22 Feb 2014 07:43:01 +0000 (23:43 -0800)]
add imagenet mean file

10 years agomove imagenet splits + synsets to data
Evan Shelhamer [Sat, 22 Feb 2014 07:20:53 +0000 (23:20 -0800)]
move imagenet splits + synsets to data

10 years agoMerge pull request #164 from t-abe/fix-typo
Evan Shelhamer [Wed, 26 Feb 2014 20:37:41 +0000 (12:37 -0800)]
Merge pull request #164 from t-abe/fix-typo

10 years agoFix error message typo in SoftmaxWithLossLayer
tabe [Wed, 26 Feb 2014 02:00:56 +0000 (11:00 +0900)]
Fix error message typo in SoftmaxWithLossLayer

10 years agoMerge pull request #154 from sguada/leveldb_max_open_files
Evan Shelhamer [Wed, 26 Feb 2014 20:37:12 +0000 (12:37 -0800)]
Merge pull request #154 from sguada/leveldb_max_open_files

10 years agoSet leveldb options.max_open_files = 100. Fix #13 and #38
Sergio Guadarrama [Tue, 25 Feb 2014 01:56:06 +0000 (17:56 -0800)]
Set leveldb options.max_open_files = 100. Fix #13 and #38

10 years agominor README fix
Sergey Karayev [Wed, 26 Feb 2014 06:59:34 +0000 (22:59 -0800)]
minor README fix

10 years agoMore comments in Makefile.config.example
Sergey Karayev [Wed, 26 Feb 2014 06:59:26 +0000 (22:59 -0800)]
More comments in Makefile.config.example

10 years agomore instructions on how to contribute
Sergey Karayev [Wed, 26 Feb 2014 06:32:31 +0000 (22:32 -0800)]
more instructions on how to contribute

10 years agoMerge pull request #157 from sergeyk/master
Sergey Karayev [Tue, 25 Feb 2014 22:12:37 +0000 (14:12 -0800)]
Merge pull request #157 from sergeyk/master

Moving gh-pages stuff to docs/ directory, with script to build and deploy to gh-pages.

10 years agoUpdated README with doc info
Sergey Karayev [Tue, 25 Feb 2014 19:34:23 +0000 (11:34 -0800)]
Updated README with doc info

10 years agoSafer docs/ build process: into own folder
Sergey Karayev [Tue, 25 Feb 2014 19:09:39 +0000 (11:09 -0800)]
Safer docs/ build process: into own folder

10 years agoimproved docs-building script
Sergey Karayev [Tue, 25 Feb 2014 09:09:06 +0000 (01:09 -0800)]
improved docs-building script

10 years agoMoving gh-pages docs to docs/ folder, with script to build them
Sergey Karayev [Tue, 25 Feb 2014 09:03:08 +0000 (01:03 -0800)]
Moving gh-pages docs to docs/ folder, with script to build them

10 years agoProperly index windows in detector list mode
Evan Shelhamer [Sun, 23 Feb 2014 23:09:38 +0000 (15:09 -0800)]
Properly index windows in detector list mode

Fix iteration over single windows: whether one or more windows are
listed for an image, generate windows as a list.

10 years agofix detector's coordinate mapping for images smaller than IMAGE_DIM
Evan Shelhamer [Sat, 22 Feb 2014 23:42:58 +0000 (15:42 -0800)]
fix detector's coordinate mapping for images smaller than IMAGE_DIM

10 years agoMerge pull request #123 from longjon/master
Sergey Karayev [Fri, 21 Feb 2014 02:40:09 +0000 (18:40 -0800)]
Merge pull request #123 from longjon/master

don't pass LDFLAGS when only performing compilation (-c)

10 years agoRevert "Merge pull request #114 from jeffdonahue/dags-by-split"
Evan Shelhamer [Tue, 18 Feb 2014 01:03:57 +0000 (17:03 -0800)]
Revert "Merge pull request #114 from jeffdonahue/dags-by-split"

Revert dags-by-split merge because split layers were not quite ready.
Sorry for the bug!

We are adopting a `master`/`dev` split development
model, where new commits and pull requests will be merged to `dev` for
testing before integration to `master`. This will keep master clean and
stable.

This reverts commit d339d242b43ec5bec9dceb657ee0d665d524b1eb, reversing
changes made to 55198262d79944fa7382868f7ecd108ed4f238a2.

10 years agodon't pass LDFLAGS when only performing compilation (-c)
Jonathan L Long [Mon, 17 Feb 2014 23:51:48 +0000 (15:51 -0800)]
don't pass LDFLAGS when only performing compilation (-c)

This simplifies the compiler commands and suppresses warnings.

10 years agoadd contributing guide
Evan Shelhamer [Mon, 17 Feb 2014 20:27:08 +0000 (12:27 -0800)]
add contributing guide

10 years agoMerge pull request #114 from jeffdonahue/dags-by-split
Evan Shelhamer [Mon, 17 Feb 2014 19:37:40 +0000 (11:37 -0800)]
Merge pull request #114 from jeffdonahue/dags-by-split

Support arbitrary DAGs with SplitLayer

10 years agoremove unnecessary include
Jeff Donahue [Sun, 16 Feb 2014 20:31:40 +0000 (12:31 -0800)]
remove unnecessary include

10 years agoeliminate some cruft by relying on std::map default initializations
Jeff Donahue [Sun, 16 Feb 2014 19:11:03 +0000 (11:11 -0800)]
eliminate some cruft by relying on std::map default initializations

10 years agoget rid of messy snprintf string concatenation
Jeff Donahue [Sun, 16 Feb 2014 18:02:42 +0000 (10:02 -0800)]
get rid of messy snprintf string concatenation

10 years agoget_split_blob_name returns a string to remove some verbosity
Jeff Donahue [Sun, 16 Feb 2014 11:18:39 +0000 (03:18 -0800)]
get_split_blob_name returns a string to remove some verbosity

10 years agoremove redundant add_bottom (immediately cleared and then re-added)
Jeff Donahue [Sun, 16 Feb 2014 10:02:32 +0000 (02:02 -0800)]
remove redundant add_bottom (immediately cleared and then re-added)

10 years agoadd test for layer with two tops that are inputs to multiple layers
Jeff Donahue [Sun, 16 Feb 2014 09:49:27 +0000 (01:49 -0800)]
add test for layer with two tops that are inputs to multiple layers

10 years agofix comment typo
Jeff Donahue [Sun, 16 Feb 2014 09:38:32 +0000 (01:38 -0800)]
fix comment typo

10 years agoremove pointlessly duplicated CheckGradientExhaustive calls (I screwed
Jeff Donahue [Sun, 16 Feb 2014 00:48:10 +0000 (16:48 -0800)]
remove pointlessly duplicated CheckGradientExhaustive calls (I screwed
up when merging, I think)

10 years agochange \" in test_split_layer to ' for readability
Jeff Donahue [Sun, 16 Feb 2014 00:38:47 +0000 (16:38 -0800)]
change \" in test_split_layer to ' for readability

10 years agoallow in place computation of SplitLayer 0th top blob
Jeff Donahue [Sun, 16 Feb 2014 00:28:44 +0000 (16:28 -0800)]
allow in place computation of SplitLayer 0th top blob

10 years agogive first top split blob same name as bottom blob
Jeff Donahue [Sun, 16 Feb 2014 00:00:44 +0000 (16:00 -0800)]
give first top split blob same name as bottom blob

10 years agochange \n's to less distracting spaces in hard-coded proto strings
Jeff Donahue [Sat, 15 Feb 2014 23:56:15 +0000 (15:56 -0800)]
change \n's to less distracting spaces in hard-coded proto strings

10 years agoeliminate redundant code with get_split_blob_name method
Jeff Donahue [Sat, 15 Feb 2014 23:52:48 +0000 (15:52 -0800)]
eliminate redundant code with get_split_blob_name method

10 years agosome cleanup
Jeff Donahue [Sat, 15 Feb 2014 22:51:37 +0000 (14:51 -0800)]
some cleanup

10 years agoadd split layer insertion tests; move split insertion code to util file
Jeff Donahue [Sat, 15 Feb 2014 22:39:44 +0000 (14:39 -0800)]
add split layer insertion tests; move split insertion code to util file

10 years agoadd split layer tests
Jeff Donahue [Sat, 15 Feb 2014 20:24:00 +0000 (12:24 -0800)]
add split layer tests

10 years agoadd split layer tests
Jeff Donahue [Sat, 15 Feb 2014 20:24:00 +0000 (12:24 -0800)]
add split layer tests

10 years agomake split_layer backward obey propagate_down
Jeff Donahue [Sat, 15 Feb 2014 20:07:02 +0000 (12:07 -0800)]
make split_layer backward obey propagate_down

10 years agoadd SplitLayer and Net::AddSplits to transform shared bottom blobs into
Jeff Donahue [Sat, 15 Feb 2014 19:53:24 +0000 (11:53 -0800)]
add SplitLayer and Net::AddSplits to transform shared bottom blobs into
split layers

10 years agodefine by := (no need for re-expansion)
Evan Shelhamer [Sat, 15 Feb 2014 07:28:26 +0000 (23:28 -0800)]
define by := (no need for re-expansion)

10 years agopython requirements: don't fear the future
Evan Shelhamer [Sat, 15 Feb 2014 02:14:56 +0000 (18:14 -0800)]
python requirements: don't fear the future

10 years agoadd shebang to python scripts
Evan Shelhamer [Fri, 14 Feb 2014 23:40:38 +0000 (15:40 -0800)]
add shebang to python scripts

for executing in the shell without call to python. Follows the example
of @kloudkl .

10 years agoadd macro for numpy < 1.7
Evan Shelhamer [Thu, 23 Jan 2014 17:10:44 +0000 (09:10 -0800)]
add macro for numpy < 1.7

as suggested by @longjon
https://github.com/BVLC/caffe/issues/44#issuecomment-32832810

10 years agoMerge pull request #106 from tdomhan/sigmoidlayer
Yangqing Jia [Thu, 13 Feb 2014 17:56:35 +0000 (09:56 -0800)]
Merge pull request #106 from tdomhan/sigmoidlayer

Sigmoidlayer

10 years agofixed copyright
Tobias Domhan [Thu, 13 Feb 2014 17:20:27 +0000 (18:20 +0100)]
fixed copyright

10 years agosigmoid layer cpu and gpu code
Tobias Domhan [Thu, 13 Feb 2014 16:42:21 +0000 (17:42 +0100)]
sigmoid layer cpu and gpu code

10 years agoadded sigmoid layer
Tobias Domhan [Thu, 13 Feb 2014 16:32:18 +0000 (17:32 +0100)]
added sigmoid layer

10 years agoMerge pull request #104 from sergeyk/master
Evan Shelhamer [Thu, 13 Feb 2014 09:42:22 +0000 (01:42 -0800)]
Merge pull request #104 from sergeyk/master

Groom detection demo notebook, replace gflags with argparse in detector.py

10 years agoselective_search_demo final updated version
Sergey Karayev [Thu, 13 Feb 2014 09:22:02 +0000 (01:22 -0800)]
selective_search_demo final updated version

10 years agodetector.py refactored with argparse (was gflags)
Sergey Karayev [Thu, 13 Feb 2014 09:21:43 +0000 (01:21 -0800)]
detector.py refactored with argparse (was gflags)

10 years agoUpdated detection demo notebook.
Sergey Karayev [Thu, 13 Feb 2014 09:03:03 +0000 (01:03 -0800)]
Updated detection demo notebook.
- Works with new detector.py
- Everything is run automatically from cells.

10 years agogit-ignoring ipython notebook checkpoints
Sergey Karayev [Thu, 13 Feb 2014 07:58:33 +0000 (23:58 -0800)]
git-ignoring ipython notebook checkpoints

10 years agomoving selective_search_demo notebook to examples/
Sergey Karayev [Thu, 13 Feb 2014 07:58:21 +0000 (23:58 -0800)]
moving selective_search_demo notebook to examples/

10 years agoUpdate LICENSE
Yangqing Jia [Thu, 13 Feb 2014 06:18:28 +0000 (22:18 -0800)]
Update LICENSE

Removed the FreeBSD disclaimer (which should not be there) per http://opensource.org/licenses/BSD-2-Clause

10 years agoMerge pull request #103 from Yangqing/master
Yangqing Jia [Thu, 13 Feb 2014 05:59:13 +0000 (21:59 -0800)]
Merge pull request #103 from Yangqing/master

bugfix regarding #100

10 years agobugfix regarding #100
Yangqing Jia [Thu, 13 Feb 2014 05:52:33 +0000 (21:52 -0800)]
bugfix regarding #100

10 years agoUpdate net.cpp
Yangqing Jia [Thu, 13 Feb 2014 01:31:36 +0000 (17:31 -0800)]
Update net.cpp

Fixed bug raised by @tdomhan in issue #100.

10 years agoMerge pull request #98 from kloudkl/check_data_size
Evan Shelhamer [Wed, 12 Feb 2014 09:34:42 +0000 (01:34 -0800)]
Merge pull request #98 from kloudkl/check_data_size

fix size initialization in convert_imageset

10 years agoSet data_size_initialized to true after data_size is initialized
Kai Li [Wed, 12 Feb 2014 08:15:08 +0000 (16:15 +0800)]
Set data_size_initialized to true after data_size is initialized

10 years agoadd CXXFLAGS for libstdc++ on OS X 10.9
Evan Shelhamer [Wed, 12 Feb 2014 03:55:41 +0000 (19:55 -0800)]
add CXXFLAGS for libstdc++ on OS X 10.9

10 years agoMerge pull request #94 from kloudkl/image_data_size
Yangqing Jia [Tue, 11 Feb 2014 18:09:59 +0000 (10:09 -0800)]
Merge pull request #94 from kloudkl/image_data_size

Ensure all the images are of the same size before creating leveldb

10 years agoAdd script to resize and crop images in parallel using mincepie
Kai Li [Tue, 11 Feb 2014 11:39:02 +0000 (19:39 +0800)]
Add script to resize and crop images in parallel using mincepie

10 years agoCheck data size when converting images into leveldb
Kai Li [Tue, 11 Feb 2014 07:14:11 +0000 (15:14 +0800)]
Check data size when converting images into leveldb

10 years agoinclude pip requirements.txt for python deps
Evan Shelhamer [Tue, 11 Feb 2014 08:41:01 +0000 (00:41 -0800)]
include pip requirements.txt for python deps

10 years agoMerge pull request #91 from kloudkl/plot_training_log
Evan Shelhamer [Tue, 11 Feb 2014 04:03:54 +0000 (20:03 -0800)]
Merge pull request #91 from kloudkl/plot_training_log

plot training/test measures against iterations/time
create mnist leveldb as separate script

10 years agoRemove trailing whitespace in example gnuplot script
Kai Li [Tue, 11 Feb 2014 02:59:53 +0000 (10:59 +0800)]
Remove trailing whitespace in example gnuplot script

10 years agoAdd python matplotlib example to plot the training log
Kai Li [Tue, 11 Feb 2014 02:54:15 +0000 (10:54 +0800)]
Add python matplotlib example to plot the training log

10 years agoAdd gnuplot example to plot the training log
Kai Li [Tue, 11 Feb 2014 02:48:06 +0000 (10:48 +0800)]
Add gnuplot example to plot the training log

10 years agoUpdate script to parse log format that contains test iteration
Kai Li [Mon, 10 Feb 2014 08:39:42 +0000 (16:39 +0800)]
Update script to parse log format that contains test iteration

10 years agoPrint iteration along with every test score in Solver::Test
Kai Li [Mon, 10 Feb 2014 08:03:15 +0000 (16:03 +0800)]
Print iteration along with every test score in Solver::Test

10 years agoExtract elapsed seconds since the start of solving from training log
Kai Li [Mon, 10 Feb 2014 07:42:37 +0000 (15:42 +0800)]
Extract elapsed seconds since the start of solving from training log

10 years agoExtract learning rate from training log
Kai Li [Mon, 10 Feb 2014 06:18:36 +0000 (14:18 +0800)]
Extract learning rate from training log

10 years agoreplace bundled install instructions with link to site
Evan Shelhamer [Mon, 10 Feb 2014 23:31:59 +0000 (15:31 -0800)]
replace bundled install instructions with link to site

10 years agoMerge pull request #90 from sguada/parselog
Evan Shelhamer [Mon, 10 Feb 2014 20:56:13 +0000 (12:56 -0800)]
Merge pull request #90 from sguada/parselog

Polish log parsing script

10 years agoUse sed instead of awk to find the Iteration
sguada [Sun, 9 Feb 2014 23:46:25 +0000 (15:46 -0800)]
Use sed instead of awk to find the Iteration

10 years agoUpdate parselog.sh
Sergio Guadarrama [Sun, 9 Feb 2014 22:08:10 +0000 (14:08 -0800)]
Update parselog.sh

Removed parameters

10 years agoExtract Iteration from log instead of computing it from parameters
sguada [Sun, 9 Feb 2014 22:01:14 +0000 (14:01 -0800)]
Extract Iteration from log instead of computing it from parameters

10 years agoMerge pull request #89 from sguada/parselog
Yangqing Jia [Sun, 9 Feb 2014 17:36:54 +0000 (09:36 -0800)]
Merge pull request #89 from sguada/parselog

Added bash script to parse log

10 years agoAdded bash script to parse log and extract training loss, and test loss and accuracy
sguada [Sun, 9 Feb 2014 03:46:01 +0000 (19:46 -0800)]
Added bash script to parse log and extract training loss, and test loss and accuracy

10 years agoMerge pull request #83 from sguada/net_speed
Evan Shelhamer [Fri, 7 Feb 2014 20:28:11 +0000 (12:28 -0800)]
Merge pull request #83 from sguada/net_speed

Add benchmarks

10 years agoMore detailed net_speed_benchmark
sguada [Fri, 7 Feb 2014 17:51:32 +0000 (09:51 -0800)]
More detailed net_speed_benchmark

10 years agofix path problem in train_mnist.sh
Zhongwen Xu [Thu, 6 Feb 2014 12:55:40 +0000 (20:55 +0800)]
fix path problem in train_mnist.sh

10 years agoMerge pull request #70 from petewarden/buffer-overflow
Evan Shelhamer [Wed, 5 Feb 2014 21:13:12 +0000 (13:13 -0800)]
Merge pull request #70 from petewarden/buffer-overflow

Fix for buffer overflow problem with long filenames when setting up the LevelDB