platform/upstream/caffe.git
10 years agoMerge pull request #120 from sguada/images_layer
Evan Shelhamer [Thu, 13 Mar 2014 18:39:38 +0000 (11:39 -0700)]
Merge pull request #120 from sguada/images_layer

Images layer: A data provider layer directly from images

10 years agoUpdate README.md to fix missing } in bibtex
Jeff Donahue [Thu, 6 Mar 2014 22:43:45 +0000 (14:43 -0800)]
Update README.md to fix missing } in bibtex

10 years agoMerge pull request #187 from yosinski/doc-up
Yangqing Jia [Tue, 4 Mar 2014 22:28:06 +0000 (14:28 -0800)]
Merge pull request #187 from yosinski/doc-up

Fixed command path in documentation

10 years agoFixed command path in documentation
Jason Yosinski [Tue, 4 Mar 2014 18:00:30 +0000 (13:00 -0500)]
Fixed command path in documentation

10 years agoDraft development guidelines, link from README
Evan Shelhamer [Fri, 28 Feb 2014 21:01:11 +0000 (13:01 -0800)]
Draft development guidelines, link from README

10 years agominor readme polish
Evan Shelhamer [Fri, 28 Feb 2014 19:41:24 +0000 (11:41 -0800)]
minor readme polish

10 years agoadd hardware notes to installation
Evan Shelhamer [Thu, 27 Feb 2014 09:21:16 +0000 (01:21 -0800)]
add hardware notes to installation

10 years agooutline pull request etiquette
Evan Shelhamer [Thu, 27 Feb 2014 09:05:13 +0000 (01:05 -0800)]
outline pull request etiquette

10 years agopolish doc build and deploy and allow other remotes
Evan Shelhamer [Thu, 27 Feb 2014 04:52:08 +0000 (20:52 -0800)]
polish doc build and deploy and allow other remotes

10 years agofix path for mnist leveldb creation
Evan Shelhamer [Thu, 27 Feb 2014 04:06:21 +0000 (20:06 -0800)]
fix path for mnist leveldb creation

10 years agofix examples shell scripts: too many dollar signs, not enough coffee
Evan Shelhamer [Thu, 27 Feb 2014 04:03:46 +0000 (20:03 -0800)]
fix examples shell scripts: too many dollar signs, not enough coffee

10 years agofix formatting + notebook url of 8c245b5
Evan Shelhamer [Thu, 27 Feb 2014 03:51:52 +0000 (19:51 -0800)]
fix formatting + notebook url of 8c245b5

10 years agoupdate detection example post re-arrangement in #124
Evan Shelhamer [Thu, 27 Feb 2014 03:26:38 +0000 (19:26 -0800)]
update detection example post re-arrangement in #124

10 years agoMerge pull request #167 from BVLC/next
Evan Shelhamer [Wed, 26 Feb 2014 23:32:42 +0000 (15:32 -0800)]
Merge pull request #167 from BVLC/next

So be it.

10 years agoDefine split layer (merge trick)
Evan Shelhamer [Wed, 26 Feb 2014 22:56:37 +0000 (14:56 -0800)]
Define split layer (merge trick)

Originally authored by Jeff Donahue, but this commit was needed for
historical reasons.

10 years agoMerge pull request #129 from jeffdonahue/dags-by-split
Evan Shelhamer [Wed, 26 Feb 2014 22:41:57 +0000 (14:41 -0800)]
Merge pull request #129 from jeffdonahue/dags-by-split

Welcome to the model of forking paths.

10 years agominor cleanup; only get blob_name if needed
Jeff Donahue [Tue, 18 Feb 2014 21:29:13 +0000 (13:29 -0800)]
minor cleanup; only get blob_name if needed

10 years agoadd idempotence test
Jeff Donahue [Tue, 18 Feb 2014 21:01:10 +0000 (13:01 -0800)]
add idempotence test

10 years agoadd imagenet no split insertion test
Jeff Donahue [Tue, 18 Feb 2014 20:55:09 +0000 (12:55 -0800)]
add imagenet no split insertion test

10 years agofix split layer insertion bug with in-place layers
Jeff Donahue [Tue, 18 Feb 2014 20:27:24 +0000 (12:27 -0800)]
fix split layer insertion bug with in-place layers

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 agoMerge pull request #116 from aravindhm/tanh
Evan Shelhamer [Wed, 26 Feb 2014 22:13:28 +0000 (14:13 -0800)]
Merge pull request #116 from aravindhm/tanh

10 years agoAdded a test for the tanh layer.
Aravindh Mahendran [Sun, 16 Feb 2014 16:04:26 +0000 (11:04 -0500)]
Added a test for the tanh layer.

10 years agoAdded tanh activation function layer.
Aravindh Mahendran [Sun, 16 Feb 2014 15:43:34 +0000 (10:43 -0500)]
Added tanh activation function layer.

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 agoEnforce that new_height and new_width are both 0 or both > 0
sguada [Mon, 17 Feb 2014 18:26:11 +0000 (10:26 -0800)]
Enforce that new_height and new_width are both 0 or both > 0

10 years agoFixed typos to pass test_images_layer
sguada [Mon, 17 Feb 2014 18:18:26 +0000 (10:18 -0800)]
Fixed typos to pass test_images_layer

10 years agoRenamed input_layer to images_layer
sguada [Mon, 17 Feb 2014 18:08:39 +0000 (10:08 -0800)]
Renamed input_layer to images_layer

10 years agoAdded the option to resize_image to resize images using cv::resize while reading...
sguada [Sat, 15 Feb 2014 07:26:32 +0000 (23:26 -0800)]
Added the option to resize_image to resize images using cv::resize while reading them

10 years agoFixed input_layer to pass tests, added cat image to data to perform the tests
sguada [Sat, 15 Feb 2014 06:43:25 +0000 (22:43 -0800)]
Fixed input_layer to pass tests, added cat image to data to perform the tests

10 years agoAdded input_layer to set of layers and to factory
Sergio Guadarrama [Fri, 14 Feb 2014 02:35:28 +0000 (18:35 -0800)]
Added input_layer to set of layers and to factory

10 years agoDraft for Input_layer copied from Data_layer
Sergio Guadarrama [Fri, 14 Feb 2014 02:18:05 +0000 (18:18 -0800)]
Draft for Input_layer copied from Data_layer

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