Kai Li [Mon, 17 Mar 2014 07:55:47 +0000 (15:55 +0800)]
Display total num of processed files after computing image mean
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
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.
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
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.
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
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
Jonathan L Long [Tue, 18 Mar 2014 04:11:36 +0000 (21:11 -0700)]
Add the feature and filter visualization example (Lena) to docs
Jonathan L Long [Tue, 18 Mar 2014 04:04:11 +0000 (21:04 -0700)]
Add ImageNet Lena filter visualization example
Evan Shelhamer [Tue, 18 Mar 2014 04:16:44 +0000 (21:16 -0700)]
style: line continuation spacing
Evan Shelhamer [Tue, 18 Mar 2014 04:16:19 +0000 (21:16 -0700)]
bring back padding test and lint it
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
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.
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.
Jonathan L Long [Mon, 17 Mar 2014 23:46:47 +0000 (16:46 -0700)]
Move semicolon to appease lint
Sergey Karayev [Mon, 17 Mar 2014 23:10:38 +0000 (16:10 -0700)]
minor
Sergey Karayev [Mon, 17 Mar 2014 23:07:39 +0000 (16:07 -0700)]
Lint errors fixed, except still using stream.
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
Sergey Karayev [Mon, 17 Mar 2014 21:05:32 +0000 (14:05 -0700)]
Making HDF5 blob data non-mutable for copy (minor)
Jeff Donahue [Mon, 17 Mar 2014 21:03:19 +0000 (14:03 -0700)]
make runtest with TEST_ALL_BIN obey TEST_GPUID
Evan Shelhamer [Mon, 17 Mar 2014 20:48:06 +0000 (13:48 -0700)]
relax timing checks for commodity GPUs
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.
Eric Tzeng [Mon, 17 Mar 2014 20:04:10 +0000 (13:04 -0700)]
Fix a test assuming CPU mode without explicitly setting it.
Sergey Karayev [Mon, 17 Mar 2014 19:19:44 +0000 (12:19 -0700)]
HDF5 data now loaded into Blobs; cleaner interface
Sergey Karayev [Mon, 17 Mar 2014 02:55:59 +0000 (19:55 -0700)]
HDF5DataLayer source is now a list of filenames
Sergey Karayev [Mon, 17 Mar 2014 02:23:00 +0000 (19:23 -0700)]
DRYing and documenting HDF5 loading code.
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
Tobias Domhan [Sun, 16 Mar 2014 11:50:30 +0000 (12:50 +0100)]
support for more than 2 dimensions in hdf5 files
Jonathan L Long [Sat, 15 Mar 2014 09:40:16 +0000 (02:40 -0700)]
Fix indentation in C++ Python module
Jonathan L Long [Tue, 11 Mar 2014 05:06:03 +0000 (22:06 -0700)]
Add extra comment on vector_indexing_suite to _caffe.cpp
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.
Evan Shelhamer [Sat, 15 Mar 2014 00:03:14 +0000 (17:03 -0700)]
add hdf5 dependency to install guide
Evan Shelhamer [Fri, 14 Mar 2014 03:13:46 +0000 (20:13 -0700)]
fix wrapper example paths
Eric Tzeng [Thu, 13 Mar 2014 21:35:48 +0000 (14:35 -0700)]
More documentation on running tests (including --gtest_filter info).
Eric Tzeng [Fri, 28 Feb 2014 00:08:16 +0000 (16:08 -0800)]
Compile a binary to run all tests at once.
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
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.
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
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
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
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
sguada [Thu, 6 Mar 2014 09:17:22 +0000 (01:17 -0800)]
Log memory usage while loading a Net
Kai Li [Wed, 26 Feb 2014 13:11:53 +0000 (21:11 +0800)]
Fix the cpplint errors for benchmark 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
Kai Li [Thu, 20 Feb 2014 11:44:41 +0000 (19:44 +0800)]
Replace CPU timer with newly added Timer to benchmark net speed
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
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
chyojn [Sat, 1 Mar 2014 03:40:49 +0000 (11:40 +0800)]
remove specific device id from solver proto
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
chyojn [Fri, 28 Feb 2014 09:08:50 +0000 (17:08 +0800)]
add cifar10 80sec and 18pct models, according to convnet
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