platform/upstream/caffeonacl.git
10 years agosort layer factory's list alphabetically
Evan Shelhamer [Tue, 18 Mar 2014 06:30:10 +0000 (23:30 -0700)]
sort layer factory's list alphabetically

10 years agofix style bugs in new layers' proto fields
Evan Shelhamer [Tue, 18 Mar 2014 06:29:54 +0000 (23:29 -0700)]
fix style bugs in new layers' proto fields

10 years agoBack-merge documentation and historical PRs to master
Evan Shelhamer [Tue, 18 Mar 2014 06:24:54 +0000 (23:24 -0700)]
Back-merge documentation and historical PRs to master

10 years agoproofreading
Evan Shelhamer [Tue, 18 Mar 2014 06:14:07 +0000 (23:14 -0700)]
proofreading

10 years agoMerge pull request #226 from longjon/imagenet-vis
Evan Shelhamer [Tue, 18 Mar 2014 06:11:45 +0000 (23:11 -0700)]
Merge pull request #226 from longjon/imagenet-vis

Layer-by-layer visualization example

10 years agoDraft CIFAR-10 doc and cleanup example
Evan Shelhamer [Tue, 18 Mar 2014 06:04:17 +0000 (23:04 -0700)]
Draft CIFAR-10 doc and cleanup example

This is a work-in-progress. A full tutorial should be written up at
some point.

10 years agoMerge pull request #228 from longjon/pycaffe-exceptions
Evan Shelhamer [Tue, 18 Mar 2014 06:09:30 +0000 (23:09 -0700)]
Merge pull request #228 from longjon/pycaffe-exceptions

Raise Python exception if input files don't exist for better interactivity

10 years agoRaise Python exceptions if CaffeNet input files don't exist
Jonathan L Long [Wed, 12 Mar 2014 00:10:14 +0000 (17:10 -0700)]
Raise Python exceptions if CaffeNet input files don't exist

This is for convenience only; if the input files are moved or deleted at
the wrong time, pycaffe could still crash (as it did before). However,
in most cases this will make interactive use easier.

10 years agoAdd comment explaining placement of system headers in C++ Python module
Jonathan L Long [Tue, 18 Mar 2014 05:54:48 +0000 (22:54 -0700)]
Add comment explaining placement of system headers in C++ Python module

10 years agoMerge pull request #227 from shelhamer/padding-deprecation
longjon [Tue, 18 Mar 2014 05:35:32 +0000 (22:35 -0700)]
Merge pull request #227 from shelhamer/padding-deprecation

Bring back padding layer to ease release upgrade

10 years agoAdd the feature and filter visualization example (Lena) to docs
Jonathan L Long [Tue, 18 Mar 2014 04:11:36 +0000 (21:11 -0700)]
Add the feature and filter visualization example (Lena) to docs

10 years agoAdd ImageNet Lena filter visualization example
Jonathan L Long [Tue, 18 Mar 2014 04:04:11 +0000 (21:04 -0700)]
Add ImageNet Lena filter visualization example

10 years agostyle: line continuation spacing
Evan Shelhamer [Tue, 18 Mar 2014 04:16:44 +0000 (21:16 -0700)]
style: line continuation spacing

10 years agobring back padding test and lint it
Evan Shelhamer [Tue, 18 Mar 2014 04:16:19 +0000 (21:16 -0700)]
bring back padding test and lint it

10 years agobring back padding layer with deprecation notice
Evan Shelhamer [Tue, 18 Mar 2014 04:09:53 +0000 (21:09 -0700)]
bring back padding layer with deprecation notice

- bring back padding layer
- split into cpp, cu
- add deprecation notice

10 years agoMerge pull request #203 from sergeyk/hdf5_data
Sergio Guadarrama [Tue, 18 Mar 2014 01:15:14 +0000 (18:15 -0700)]
Merge pull request #203 from sergeyk/hdf5_data

HDF5DataLayer source now takes list of filenames, loads one at a time.

10 years agoMerge pull request #199 from longjon/pycaffe-ordereddict
Evan Shelhamer [Tue, 18 Mar 2014 00:07:36 +0000 (17:07 -0700)]
Merge pull request #199 from longjon/pycaffe-ordereddict

Update Python interface, using OrderedDict for blobs and layers to expose activations, params, and diffs.

10 years agoMove semicolon to appease lint
Jonathan L Long [Mon, 17 Mar 2014 23:46:47 +0000 (16:46 -0700)]
Move semicolon to appease lint

10 years agominor
Sergey Karayev [Mon, 17 Mar 2014 23:10:38 +0000 (16:10 -0700)]
minor

10 years agoLint errors fixed, except still using stream.
Sergey Karayev [Mon, 17 Mar 2014 23:07:39 +0000 (16:07 -0700)]
Lint errors fixed, except still using stream.

10 years agoMerge pull request #222 from jeffdonahue/test-all-bin-gpuid
Evan Shelhamer [Mon, 17 Mar 2014 21:13:24 +0000 (14:13 -0700)]
Merge pull request #222 from jeffdonahue/test-all-bin-gpuid

make runtest with TEST_ALL_BIN obey TEST_GPUID

10 years agoMaking HDF5 blob data non-mutable for copy (minor)
Sergey Karayev [Mon, 17 Mar 2014 21:05:32 +0000 (14:05 -0700)]
Making HDF5 blob data non-mutable for copy (minor)

10 years agomake runtest with TEST_ALL_BIN obey TEST_GPUID
Jeff Donahue [Mon, 17 Mar 2014 21:03:19 +0000 (14:03 -0700)]
make runtest with TEST_ALL_BIN obey TEST_GPUID

10 years agorelax timing checks for commodity GPUs
Evan Shelhamer [Mon, 17 Mar 2014 20:48:06 +0000 (13:48 -0700)]
relax timing checks for commodity GPUs

10 years agoMerge pull request #179 from erictzeng/test_all
Evan Shelhamer [Mon, 17 Mar 2014 20:20:42 +0000 (13:20 -0700)]
Merge pull request #179 from erictzeng/test_all

Run all tests jointly in a single binary and summarize failures at the end.

10 years agoFix a test assuming CPU mode without explicitly setting it.
Eric Tzeng [Mon, 17 Mar 2014 20:04:10 +0000 (13:04 -0700)]
Fix a test assuming CPU mode without explicitly setting it.

10 years agoHDF5 data now loaded into Blobs; cleaner interface
Sergey Karayev [Mon, 17 Mar 2014 19:19:44 +0000 (12:19 -0700)]
HDF5 data now loaded into Blobs; cleaner interface

10 years agoreadme.md updated with more info about development
Sergey Karayev [Mon, 17 Mar 2014 17:43:28 +0000 (10:43 -0700)]
readme.md updated with more info about development

10 years agoHDF5DataLayer source is now a list of filenames
Sergey Karayev [Mon, 17 Mar 2014 02:55:59 +0000 (19:55 -0700)]
HDF5DataLayer source is now a list of filenames

10 years agoDRYing and documenting HDF5 loading code.
Sergey Karayev [Mon, 17 Mar 2014 02:23:00 +0000 (19:23 -0700)]
DRYing and documenting HDF5 loading code.

10 years agoMerge pull request #217 from tdomhan/multidhdf5
Sergey Karayev [Mon, 17 Mar 2014 00:50:09 +0000 (17:50 -0700)]
Merge pull request #217 from tdomhan/multidhdf5

support for more than 2 dimensions in hdf5 files

10 years agosupport for more than 2 dimensions in hdf5 files
Tobias Domhan [Sun, 16 Mar 2014 11:50:30 +0000 (12:50 +0100)]
support for more than 2 dimensions in hdf5 files

10 years agoFix indentation in C++ Python module
Jonathan L Long [Sat, 15 Mar 2014 09:40:16 +0000 (02:40 -0700)]
Fix indentation in C++ Python module

10 years agoAdd extra comment on vector_indexing_suite to _caffe.cpp
Jonathan L Long [Tue, 11 Mar 2014 05:06:03 +0000 (22:06 -0700)]
Add extra comment on vector_indexing_suite to _caffe.cpp

10 years agoRemove spurious constructors from CaffeBlob and CaffeBlobWrap
Jonathan L Long [Tue, 11 Mar 2014 05:04:46 +0000 (22:04 -0700)]
Remove spurious constructors from CaffeBlob and CaffeBlobWrap

This prevents accidental construction of partially-specified blobs,
which could break the Python layer.

10 years agoAdd names to the blobs returned by CaffeLayer
Jonathan L Long [Tue, 11 Mar 2014 05:02:08 +0000 (22:02 -0700)]
Add names to the blobs returned by CaffeLayer

Even though these are redundant, this keeps the meaning of
CaffeBlob.name consistent for now, and will allow CaffeBlob construction
to be simplified.

10 years agoExpose caffe.Net.params as an OrderedDict
Jonathan L Long [Tue, 11 Mar 2014 04:51:25 +0000 (21:51 -0700)]
Expose caffe.Net.params as an OrderedDict

10 years agoExpose layers and remove now-redundant params in Python interface
Jonathan L Long [Tue, 11 Mar 2014 04:46:36 +0000 (21:46 -0700)]
Expose layers and remove now-redundant params in Python interface

For now, only layer names and blobs are accessible, but more
functionality (layer Forward and Backward) could be added later.

10 years agoadd hdf5 dependency to install guide
Evan Shelhamer [Sat, 15 Mar 2014 00:03:14 +0000 (17:03 -0700)]
add hdf5 dependency to install guide

10 years agoPublish the Caffe presentation, pi day edition
Evan Shelhamer [Fri, 14 Mar 2014 18:51:21 +0000 (11:51 -0700)]
Publish the Caffe presentation, pi day edition

Learn all about the Caffeine life.

Deep learning, coffee, and pie: better together!

(Although this is a pdf at the moment, it'll be replaced with a google
doc soon).

10 years agonote CUDA lib without CUDA driver install for CPU mode
Evan Shelhamer [Fri, 14 Mar 2014 17:51:05 +0000 (10:51 -0700)]
note CUDA lib without CUDA driver install for CPU mode

10 years agofix wrapper example paths
Evan Shelhamer [Fri, 14 Mar 2014 03:13:46 +0000 (20:13 -0700)]
fix wrapper example paths

10 years agoMore documentation on running tests (including --gtest_filter info).
Eric Tzeng [Thu, 13 Mar 2014 21:35:48 +0000 (14:35 -0700)]
More documentation on running tests (including --gtest_filter info).

10 years agoCompile a binary to run all tests at once.
Eric Tzeng [Fri, 28 Feb 2014 00:08:16 +0000 (16:08 -0800)]
Compile a binary to run all tests at once.

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 agoMerge pull request #136 from kloudkl/cuda_timing
Evan Shelhamer [Thu, 13 Mar 2014 18:31:36 +0000 (11:31 -0700)]
Merge pull request #136 from kloudkl/cuda_timing

Add Timer class unifying CPU and GPU timer and use it in net_speed_benchmark

10 years agoMerge pull request #184 from chyojn/cifar10_model_script
Evan Shelhamer [Thu, 13 Mar 2014 18:17:59 +0000 (11:17 -0700)]
Merge pull request #184 from chyojn/cifar10_model_script

CIFAR-10 model defs, solver configs, and example scripts.

10 years agoUpdate imagenet/wrapper.py to use the new Net interface
Jonathan L Long [Tue, 11 Mar 2014 03:39:31 +0000 (20:39 -0700)]
Update imagenet/wrapper.py to use the new Net interface

10 years agoUpdate detector.py to use the new Net/blobs interface
Jonathan L Long [Tue, 11 Mar 2014 03:38:39 +0000 (20:38 -0700)]
Update detector.py to use the new Net/blobs interface

10 years agoUse an OrderedDict for caffe.Net.blobs
Jonathan L Long [Tue, 11 Mar 2014 03:33:31 +0000 (20:33 -0700)]
Use an OrderedDict for caffe.Net.blobs

10 years agoAdd a pass-through Python wrapper of _caffe.CaffeNet
Jonathan L Long [Tue, 11 Mar 2014 03:06:18 +0000 (20:06 -0700)]
Add a pass-through Python wrapper of _caffe.CaffeNet

This commit restores caffe.pycaffe as Python code that wraps
caffe._caffe. It also renames caffe.CaffeNet as the less-redundant
caffe.Net.

10 years agoRename pycaffe.cpp -> _caffe.cpp in preparation for python wrapper
Jonathan L Long [Tue, 11 Mar 2014 03:00:01 +0000 (20:00 -0700)]
Rename pycaffe.cpp -> _caffe.cpp in preparation for python wrapper

This commit should not break any code which does not refer explicitly to
caffe.pycaffe.

10 years agopycaffe: blobs and params are properties, not methods
Jonathan L Long [Sat, 1 Mar 2014 09:48:06 +0000 (01:48 -0800)]
pycaffe: blobs and params are properties, not methods

10 years agoMerge pull request #191 from sguada/print_memory
Evan Shelhamer [Thu, 13 Mar 2014 18:15:50 +0000 (11:15 -0700)]
Merge pull request #191 from sguada/print_memory

Print memory required by Data Blobs

10 years agoMerge pull request #200 from longjon/pycaffe-forwardprefilled
Sergey Karayev [Thu, 13 Mar 2014 18:12:01 +0000 (11:12 -0700)]
Merge pull request #200 from longjon/pycaffe-forwardprefilled

Expose ForwardPrefilled in pycaffe

10 years agopycaffe: expose ForwardPrefilled
Jonathan L Long [Thu, 20 Feb 2014 07:12:46 +0000 (23:12 -0800)]
pycaffe: expose ForwardPrefilled

This allows, for example, a net taking input from a LevelDB to be run
through a Python script.

10 years agoMerge pull request #134 from mavenlin/computemean
Evan Shelhamer [Tue, 11 Mar 2014 01:31:38 +0000 (18:31 -0700)]
Merge pull request #134 from mavenlin/computemean

Allow single data in computation of the data mean.

10 years agomove if outside of forloop
linmin [Fri, 21 Feb 2014 03:25:22 +0000 (11:25 +0800)]
move if outside of forloop

10 years agocompute data mean for float_data
linmin [Thu, 20 Feb 2014 05:44:14 +0000 (13:44 +0800)]
compute data mean for float_data

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 agoChanged display top shape to include num and count, Memory required by Data
Sergio Guadarrama [Thu, 6 Mar 2014 21:32:06 +0000 (13:32 -0800)]
Changed display top shape to include num and count, Memory required by Data

10 years agoLog memory usage while loading a Net
sguada [Thu, 6 Mar 2014 09:17:22 +0000 (01:17 -0800)]
Log memory usage while loading a Net

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 agoFix the cpplint errors for benchmark Timer
Kai Li [Wed, 26 Feb 2014 13:11:53 +0000 (21:11 +0800)]
Fix the cpplint errors for benchmark Timer

10 years agoAdd state machine, boost::posix_time based cpu timer & tests for Timer
Kai Li [Tue, 25 Feb 2014 16:00:59 +0000 (00:00 +0800)]
Add state machine, boost::posix_time based cpu timer & tests for Timer

10 years agoReplace CPU timer with newly added Timer to benchmark net speed
Kai Li [Thu, 20 Feb 2014 11:44:41 +0000 (19:44 +0800)]
Replace CPU timer with newly added Timer to benchmark net speed

10 years agoAdd Timer to wrap CPU clock_t and GPU cudaEvent_t based timing
Kai Li [Thu, 20 Feb 2014 11:42:57 +0000 (19:42 +0800)]
Add Timer to wrap CPU clock_t and GPU cudaEvent_t based timing

10 years agoSynchronize GPU before CPU timers start and stop in net_speed_benchmark
Kai Li [Thu, 20 Feb 2014 10:29:08 +0000 (18:29 +0800)]
Synchronize GPU before CPU timers start and stop in net_speed_benchmark

10 years agoremove specific device id from solver proto
chyojn [Sat, 1 Mar 2014 03:40:49 +0000 (11:40 +0800)]
remove specific device id from solver proto

10 years agomove model's pad layer into conv layer; add script to create db and train net by...
chyojn [Sat, 1 Mar 2014 03:21:13 +0000 (11:21 +0800)]
move model's pad layer into conv layer; add script to create db and train net by 80sec and 18pct model

10 years agoadd cifar10 80sec and 18pct models, according to convnet
chyojn [Fri, 28 Feb 2014 09:08:50 +0000 (17:08 +0800)]
add cifar10 80sec and 18pct models, according to convnet

10 years agoBack-merge documentation updates from master
Evan Shelhamer [Fri, 28 Feb 2014 21:49:44 +0000 (13:49 -0800)]
Back-merge documentation updates from master

Draft development guidelines, link from README
minor readme polish
add hardware notes to installation
outline pull request etiquette
polish doc build and deploy and allow other remotes
fix path for mnist leveldb creation
fix examples shell scripts: too many dollar signs, not enough coffee
fix formatting + notebook url of 8c245b5
update detection example post re-arrangement in #124

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 agoMerge pull request #181 from chyojn/absolute_path_of_script
Evan Shelhamer [Fri, 28 Feb 2014 18:42:02 +0000 (10:42 -0800)]
Merge pull request #181 from chyojn/absolute_path_of_script

use absolute path in parselog script

10 years agoMerge pull request #125 from sguada/concat_layer
Jeff Donahue [Fri, 28 Feb 2014 08:23:33 +0000 (00:23 -0800)]
Merge pull request #125 from sguada/concat_layer

Concat layer

10 years agouse absolute path in script
chyojn [Fri, 28 Feb 2014 06:46:13 +0000 (14:46 +0800)]
use absolute path in script

10 years agoSplited concat_layer into .cpp and .cu, cleaned lint errors
Sergio Guadarrama [Fri, 28 Feb 2014 03:11:52 +0000 (19:11 -0800)]
Splited concat_layer into .cpp and .cu, cleaned lint errors

10 years agoFixed test to pass and don't exhaustive search since it takes too long
sguada [Thu, 27 Feb 2014 06:33:57 +0000 (22:33 -0800)]
Fixed test to pass and don't exhaustive search since it takes too long

10 years agoAdded Tests for Concat Layer, and passed
sguada [Tue, 18 Feb 2014 02:16:38 +0000 (18:16 -0800)]
Added Tests for Concat Layer, and passed

10 years agoAdded concat_dim to caffe.proto and ConcatLayer to set of layers
sguada [Tue, 18 Feb 2014 01:08:30 +0000 (17:08 -0800)]
Added concat_dim to caffe.proto and ConcatLayer to set of layers

10 years agoCode for concat_layer for concat along num and channels dimensions
Sergio Guadarrama [Mon, 17 Feb 2014 21:43:05 +0000 (13:43 -0800)]
Code for concat_layer for concat along num and channels dimensions

10 years agofix include order for pycaffe on osx, override lint
Evan Shelhamer [Thu, 27 Feb 2014 23:53:32 +0000 (15:53 -0800)]
fix include order for pycaffe on osx, override lint

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 agoMerge pull request #176 from jeffdonahue/osx-make-lint-fix
Evan Shelhamer [Thu, 27 Feb 2014 08:48:21 +0000 (00:48 -0800)]
Merge pull request #176 from jeffdonahue/osx-make-lint-fix

Fix 'make lint' in OSX

10 years agofix 'make lint' in OSX:
Jeff Donahue [Thu, 27 Feb 2014 08:33:48 +0000 (00:33 -0800)]
fix 'make lint' in OSX:
seems that NONGEN_CXX_SRCS wasn't getting populated in OSX due to some
disagreement in the regex formatting in find...give up on that and use
an ugly but reliable chain of -name ... -or -name ...

10 years agoMerge pull request #172 from erictzeng/split_cuda
Evan Shelhamer [Thu, 27 Feb 2014 05:14:34 +0000 (21:14 -0800)]
Merge pull request #172 from erictzeng/split_cuda

Split source files between CUDA and CPU code. Pave the way for #3 and #122.

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 agoSplitting source files between CUDA and CPU code.
Eric Tzeng [Thu, 27 Feb 2014 02:45:45 +0000 (18:45 -0800)]
Splitting source files between CUDA and CPU code.

10 years agoMerge pull request #168 from jeffdonahue/fix-lint-bugs
Evan Shelhamer [Thu, 27 Feb 2014 01:56:57 +0000 (17:56 -0800)]
Merge pull request #168 from jeffdonahue/fix-lint-bugs

Fix bugs introduced by lint

10 years agofix python/matlab wrapper bugs introduced by lint; change linter->lint
Jeff Donahue [Wed, 26 Feb 2014 16:49:27 +0000 (08:49 -0800)]
fix python/matlab wrapper bugs introduced by lint; change linter->lint
in Makefile

10 years agomake lint will not rerun if successful and no source files have been
Jeff Donahue [Wed, 26 Feb 2014 08:41:19 +0000 (00:41 -0800)]
make lint will not rerun if successful and no source files have been
changed; saves output to build/cpp_lint.log (or build/cpp_lint.error_log
on failure)

10 years agoMerge pull request #163 from jeffdonahue/linter
Evan Shelhamer [Wed, 26 Feb 2014 06:02:55 +0000 (22:02 -0800)]
Merge pull request #163 from jeffdonahue/linter

Lint C++ (suffer for fashion)

10 years agocpplint.py -> cpp_lint.py and NOLINT_NEXTLINE -> NOLINT_NEXT_LINE
Jeff Donahue [Wed, 26 Feb 2014 05:56:49 +0000 (21:56 -0800)]
cpplint.py -> cpp_lint.py and NOLINT_NEXTLINE -> NOLINT_NEXT_LINE