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.
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.
Jonathan L Long [Tue, 11 Mar 2014 04:51:25 +0000 (21:51 -0700)]
Expose caffe.Net.params as an OrderedDict
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.
Jonathan L Long [Tue, 11 Mar 2014 03:39:31 +0000 (20:39 -0700)]
Update imagenet/wrapper.py to use the new Net 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
Jonathan L Long [Tue, 11 Mar 2014 03:33:31 +0000 (20:33 -0700)]
Use an OrderedDict for caffe.Net.blobs
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.
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.
Jonathan L Long [Sat, 1 Mar 2014 09:48:06 +0000 (01:48 -0800)]
pycaffe: blobs and params are properties, not methods
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
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.
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.
linmin [Fri, 21 Feb 2014 03:25:22 +0000 (11:25 +0800)]
move if outside of forloop
linmin [Thu, 20 Feb 2014 05:44:14 +0000 (13:44 +0800)]
compute data mean for float_data
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
Evan Shelhamer [Fri, 28 Feb 2014 21:01:11 +0000 (13:01 -0800)]
Draft development guidelines, link from README
Evan Shelhamer [Fri, 28 Feb 2014 19:41:24 +0000 (11:41 -0800)]
minor readme polish
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
Jeff Donahue [Fri, 28 Feb 2014 08:23:33 +0000 (00:23 -0800)]
Merge pull request #125 from sguada/concat_layer
Concat layer
chyojn [Fri, 28 Feb 2014 06:46:13 +0000 (14:46 +0800)]
use absolute path in script
Sergio Guadarrama [Fri, 28 Feb 2014 03:11:52 +0000 (19:11 -0800)]
Splited concat_layer into .cpp and .cu, cleaned lint errors
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
sguada [Tue, 18 Feb 2014 02:16:38 +0000 (18:16 -0800)]
Added Tests for Concat Layer, and passed
sguada [Tue, 18 Feb 2014 01:08:30 +0000 (17:08 -0800)]
Added concat_dim to caffe.proto and ConcatLayer to set of layers
Sergio Guadarrama [Mon, 17 Feb 2014 21:43:05 +0000 (13:43 -0800)]
Code for concat_layer for concat along num and channels dimensions
Evan Shelhamer [Thu, 27 Feb 2014 23:53:32 +0000 (15:53 -0800)]
fix include order for pycaffe on osx, override lint
Evan Shelhamer [Thu, 27 Feb 2014 09:21:16 +0000 (01:21 -0800)]
add hardware notes to installation
Evan Shelhamer [Thu, 27 Feb 2014 09:05:13 +0000 (01:05 -0800)]
outline pull request etiquette
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
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 ...
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.
Evan Shelhamer [Thu, 27 Feb 2014 04:52:08 +0000 (20:52 -0800)]
polish doc build and deploy and allow other remotes
Evan Shelhamer [Thu, 27 Feb 2014 04:06:21 +0000 (20:06 -0800)]
fix path for mnist leveldb creation
Evan Shelhamer [Thu, 27 Feb 2014 04:03:46 +0000 (20:03 -0800)]
fix examples shell scripts: too many dollar signs, not enough coffee
Evan Shelhamer [Thu, 27 Feb 2014 03:51:52 +0000 (19:51 -0800)]
fix formatting + notebook url of 8c245b5
Evan Shelhamer [Thu, 27 Feb 2014 03:26:38 +0000 (19:26 -0800)]
update detection example post re-arrangement in #124
Eric Tzeng [Thu, 27 Feb 2014 02:45:45 +0000 (18:45 -0800)]
Splitting source files between CUDA and CPU code.
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
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
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)
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)
Jeff Donahue [Wed, 26 Feb 2014 05:56:49 +0000 (21:56 -0800)]
cpplint.py -> cpp_lint.py and NOLINT_NEXTLINE -> NOLINT_NEXT_LINE
Jeff Donahue [Wed, 26 Feb 2014 05:20:16 +0000 (21:20 -0800)]
add new tools dir to linted dir list
Jeff Donahue [Wed, 26 Feb 2014 04:39:01 +0000 (20:39 -0800)]
fix linter errors in examples
Jeff Donahue [Wed, 26 Feb 2014 02:58:49 +0000 (18:58 -0800)]
add examples, python, matlab to NONGEN_CXX_SRCS so they are linted as
well
Jeff Donahue [Wed, 26 Feb 2014 01:47:01 +0000 (17:47 -0800)]
fix compiler warning for test_hdf5data_layer
Jeff Donahue [Wed, 26 Feb 2014 01:35:38 +0000 (17:35 -0800)]
fix post-rebase linter errors
Jeff Donahue [Wed, 26 Feb 2014 00:12:47 +0000 (16:12 -0800)]
long -> int64_t; all linter errors fixed. woohoo!
Jeff Donahue [Wed, 26 Feb 2014 00:03:46 +0000 (16:03 -0800)]
handle linter stream errors
Jeff Donahue [Wed, 26 Feb 2014 00:01:05 +0000 (16:01 -0800)]
allow TODO without username
Jeff Donahue [Tue, 25 Feb 2014 23:58:20 +0000 (15:58 -0800)]
make test_gradient_check_util methods use pointers for non-const inputs
(also change EXPECT_LT and EXPECT_GT pair to EXPECT_NEAR)
Jeff Donahue [Tue, 25 Feb 2014 23:21:23 +0000 (15:21 -0800)]
fix most linter errors
Jeff Donahue [Tue, 25 Feb 2014 21:39:20 +0000 (13:39 -0800)]
add NOLINT_NEXTLINE to suppress linter errors on nextline
Jeff Donahue [Tue, 25 Feb 2014 20:49:57 +0000 (12:49 -0800)]
exclude proto generated files from lint
Jeff Donahue [Tue, 25 Feb 2014 20:47:25 +0000 (12:47 -0800)]
add hpp to valid cpplint extensions
Jeff Donahue [Tue, 25 Feb 2014 20:13:31 +0000 (12:13 -0800)]
fix matcaffe and pycaffe linter errors
Jeff Donahue [Tue, 25 Feb 2014 20:00:41 +0000 (12:00 -0800)]
suppress linter errors due to not including the directory when naming .h
files
Kai Li [Wed, 26 Feb 2014 03:14:51 +0000 (11:14 +0800)]
Reverse the order of hdf5_hl hdf5 as LIBRARIES in Makefile
Jeff Donahue [Tue, 25 Feb 2014 19:44:28 +0000 (11:44 -0800)]
add cpplint.py and "make lint" to run on all c source files
Sergey Karayev [Tue, 25 Feb 2014 22:16:13 +0000 (14:16 -0800)]
Merge pull request #147 from sergeyk/hdf5_data
HDF5DataLayer: read matrix of features and labels from HDF5 file as input
Evan Shelhamer [Sat, 15 Feb 2014 09:39:14 +0000 (01:39 -0800)]
name blobs and params for their layers in python wrapper
note that pairs of params with the same layer name are the
params & bias
Sergey Karayev [Tue, 25 Feb 2014 06:35:33 +0000 (22:35 -0800)]
minor comment edit
Sergey Karayev [Sun, 23 Feb 2014 20:29:14 +0000 (12:29 -0800)]
HDF5DataLayer, with test.
Sergey Karayev [Sun, 23 Feb 2014 21:02:32 +0000 (13:02 -0800)]
Adding GPU coverage to the DataLayer test.
Evan Shelhamer [Tue, 25 Feb 2014 05:37:38 +0000 (21:37 -0800)]
Merge pull request #128 from mavenlin/pad-im2col
im2col and col2im learn to pad and padding layer is obsolete
linmin [Tue, 25 Feb 2014 04:58:23 +0000 (12:58 +0800)]
remove cuda_timer as is no longer needed
linmin [Tue, 25 Feb 2014 04:56:51 +0000 (12:56 +0800)]
remove padding_layer and its test
linmin [Tue, 25 Feb 2014 04:48:21 +0000 (12:48 +0800)]
unified to padding aware version
remove test code (no longer needed and won't compile)
linmin [Tue, 25 Feb 2014 02:09:58 +0000 (10:09 +0800)]
remove padding layers in imagenet definitions
linmin [Tue, 25 Feb 2014 01:59:30 +0000 (09:59 +0800)]
remove the pad=0 case in conv_layer and im2col_layer
linmin [Tue, 18 Feb 2014 10:57:51 +0000 (18:57 +0800)]
add code to measure timing
linmin [Fri, 14 Feb 2014 08:01:38 +0000 (16:01 +0800)]
add test code to test the padding aware im2col col2im functions
linmin [Wed, 12 Feb 2014 04:13:51 +0000 (12:13 +0800)]
implemented padding aware im2col and col2im functions
Evan Shelhamer [Wed, 26 Feb 2014 23:32:42 +0000 (15:32 -0800)]
Merge pull request #167 from BVLC/next
So be it.
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.
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.
Jeff Donahue [Tue, 18 Feb 2014 21:29:13 +0000 (13:29 -0800)]
minor cleanup; only get blob_name if needed
Jeff Donahue [Tue, 18 Feb 2014 21:01:10 +0000 (13:01 -0800)]
add idempotence test
Jeff Donahue [Tue, 18 Feb 2014 20:55:09 +0000 (12:55 -0800)]
add imagenet no split insertion test
Jeff Donahue [Tue, 18 Feb 2014 20:27:24 +0000 (12:27 -0800)]
fix split layer insertion bug with in-place layers
Jeff Donahue [Sun, 16 Feb 2014 20:31:40 +0000 (12:31 -0800)]
remove unnecessary include
Jeff Donahue [Sun, 16 Feb 2014 19:11:03 +0000 (11:11 -0800)]
eliminate some cruft by relying on std::map default initializations
Jeff Donahue [Sun, 16 Feb 2014 18:02:42 +0000 (10:02 -0800)]
get rid of messy snprintf string concatenation
Jeff Donahue [Sun, 16 Feb 2014 11:18:39 +0000 (03:18 -0800)]
get_split_blob_name returns a string to remove some verbosity
Jeff Donahue [Sun, 16 Feb 2014 10:02:32 +0000 (02:02 -0800)]
remove redundant add_bottom (immediately cleared and then re-added)
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
Jeff Donahue [Sun, 16 Feb 2014 09:38:32 +0000 (01:38 -0800)]
fix comment typo
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)
Jeff Donahue [Sun, 16 Feb 2014 00:38:47 +0000 (16:38 -0800)]
change \" in test_split_layer to ' for readability
Jeff Donahue [Sun, 16 Feb 2014 00:28:44 +0000 (16:28 -0800)]
allow in place computation of SplitLayer 0th top blob
Jeff Donahue [Sun, 16 Feb 2014 00:00:44 +0000 (16:00 -0800)]
give first top split blob same name as bottom blob
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
Jeff Donahue [Sat, 15 Feb 2014 23:52:48 +0000 (15:52 -0800)]
eliminate redundant code with get_split_blob_name method
Jeff Donahue [Sat, 15 Feb 2014 22:51:37 +0000 (14:51 -0800)]
some cleanup
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
Jeff Donahue [Sat, 15 Feb 2014 20:24:00 +0000 (12:24 -0800)]
add split layer tests
Jeff Donahue [Sat, 15 Feb 2014 20:24:00 +0000 (12:24 -0800)]
add split layer tests
Jeff Donahue [Sat, 15 Feb 2014 20:07:02 +0000 (12:07 -0800)]
make split_layer backward obey propagate_down
Evan Shelhamer [Wed, 26 Feb 2014 22:13:28 +0000 (14:13 -0800)]
Merge pull request #116 from aravindhm/tanh