Evan Shelhamer [Wed, 19 Mar 2014 16:56:20 +0000 (09:56 -0700)]
Merge pull request #221 from jamt9000/fix-dump-network
Fix dump network
Evan Shelhamer [Wed, 19 Mar 2014 16:36:55 +0000 (09:36 -0700)]
Merge pull request #242 from kloudkl/script
Fix shell scripts: current dir, wget output, and naming conventions
Kai Li [Wed, 19 Mar 2014 15:26:14 +0000 (23:26 +0800)]
File naming convention requires that two words be split by a underscore
Kai Li [Wed, 19 Mar 2014 15:21:19 +0000 (23:21 +0800)]
Wget should never be quiet
Kai Li [Wed, 19 Mar 2014 15:20:09 +0000 (23:20 +0800)]
Fix shell script current dir bad substition errors
James Thewlis [Wed, 19 Mar 2014 14:55:44 +0000 (14:55 +0000)]
Remove cudaSetDevice(1)
So it works when there is only one GPU
Evan Shelhamer [Wed, 19 Mar 2014 07:10:40 +0000 (00:10 -0700)]
Merge pull request #231 from BVLC/next
0.99 release
Evan Shelhamer [Wed, 19 Mar 2014 06:57:41 +0000 (23:57 -0700)]
arrange example images, update paths, bring back imagenet_pretrained
Jeff Donahue [Wed, 19 Mar 2014 01:42:27 +0000 (18:42 -0700)]
Merge pull request #236 from jeffdonahue/test-all-bin-makefile-deps
Add libcaffe.a to dependencies for TEST_ALL_BIN
Jeff Donahue [Tue, 18 Mar 2014 21:49:31 +0000 (14:49 -0700)]
also fix for runtest
Jeff Donahue [Tue, 18 Mar 2014 21:39:36 +0000 (14:39 -0700)]
add libcaffe.a to TEST_ALL_BIN dependencies in Makefile
Jeff Donahue [Wed, 19 Mar 2014 01:36:56 +0000 (18:36 -0700)]
Merge pull request #240 from jeffdonahue/rm-cuda-kernel-loop-comments
Fix minor issues related to CUDA_KERNEL_LOOP -- merging myself as I'm only adding/removing comments other than the addition of CUDA_KERNEL_LOOP to PaddingLayer (and checked that this passes all tests).
Jeff Donahue [Wed, 19 Mar 2014 01:19:25 +0000 (18:19 -0700)]
use CUDA_KERNEL_LOOP in padding layer
Jeff Donahue [Wed, 19 Mar 2014 00:59:41 +0000 (17:59 -0700)]
fix remaining lint errors
Jeff Donahue [Wed, 19 Mar 2014 00:34:25 +0000 (17:34 -0700)]
fix remaining issues related to CUDA_KERNEL_LOOP
Jeff Donahue [Wed, 19 Mar 2014 00:13:34 +0000 (17:13 -0700)]
Merge pull request #239 from jeffdonahue/fix-kernel-loop-macro
Fix CUDA_KERNEL_LOOP from @blackball
Jeff Donahue [Wed, 19 Mar 2014 00:06:51 +0000 (17:06 -0700)]
fix kernel loop bugs, compiles and passes all tests
blackball [Tue, 18 Mar 2014 03:04:39 +0000 (11:04 +0800)]
addd CUDA_KERNEL_LOOP macro
Evan Shelhamer [Tue, 18 Mar 2014 22:45:42 +0000 (15:45 -0700)]
lint, except for rand/rand_r
Evan Shelhamer [Tue, 18 Mar 2014 20:54:17 +0000 (13:54 -0700)]
drop models/ in favor of examples/
Move the Caffe reference imagenet model and script to fetch it to
examples/imagenet.
Caffe bundles reference models, but it makes more sense to keep them
close to examples.
Evan Shelhamer [Tue, 18 Mar 2014 20:55:57 +0000 (13:55 -0700)]
fix README links to presentation and development section
Sergey Karayev [Tue, 18 Mar 2014 20:16:31 +0000 (13:16 -0700)]
build_docs script
Evan Shelhamer [Tue, 18 Mar 2014 19:53:12 +0000 (12:53 -0700)]
groom docs, move Caffe presentation to dropbox
Evan Shelhamer [Tue, 18 Mar 2014 19:26:49 +0000 (12:26 -0700)]
Merge pull request #234 from sergeyk/updating_docs
removing notebooks in docs, updating instructions
Sergey Karayev [Tue, 18 Mar 2014 18:59:34 +0000 (11:59 -0700)]
minor fixes suggested by evan
Sergey Karayev [Tue, 18 Mar 2014 18:17:51 +0000 (11:17 -0700)]
removing notebooks in docs, updating instructions
Sergey Karayev [Tue, 18 Mar 2014 16:18:03 +0000 (09:18 -0700)]
minor fix to caffe model DL script
Sergey Karayev [Tue, 18 Mar 2014 16:14:27 +0000 (09:14 -0700)]
Merge pull request #230 from kloudkl/get_model_script
Improve caffe reference imagenet model downloader
James Thewlis [Tue, 18 Mar 2014 09:28:09 +0000 (09:28 +0000)]
Set phase to TRAIN when performing backward pass
Evan Shelhamer [Tue, 18 Mar 2014 09:09:00 +0000 (02:09 -0700)]
Merge pull request #229 from kloudkl/minor_change
Display total num of processed files after computing image mean
Kai Li [Tue, 18 Mar 2014 08:12:35 +0000 (16:12 +0800)]
Add support for md5 checksum on OS X
Kai Li [Mon, 17 Mar 2014 06:33:13 +0000 (14:33 +0800)]
Avoid repeatedly downloading caffe reference imagenet model
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 07:23:29 +0000 (00:23 -0700)]
minor mnist example update
Evan Shelhamer [Tue, 18 Mar 2014 07:21:01 +0000 (00:21 -0700)]
link draft CIFAR-10 example
Evan Shelhamer [Tue, 18 Mar 2014 06:30:10 +0000 (23:30 -0700)]
sort layer factory's list alphabetically
Evan Shelhamer [Tue, 18 Mar 2014 06:29:54 +0000 (23:29 -0700)]
fix style bugs in new layers' proto fields
Evan Shelhamer [Tue, 18 Mar 2014 06:24:54 +0000 (23:24 -0700)]
Back-merge documentation and historical PRs to master
Evan Shelhamer [Tue, 18 Mar 2014 06:14:07 +0000 (23:14 -0700)]
proofreading
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
James Thewlis [Mon, 17 Mar 2014 20:50:41 +0000 (20:50 +0000)]
Fix wrong argv check for whether a backward pass should be done
James Thewlis [Mon, 17 Mar 2014 20:48:37 +0000 (20:48 +0000)]
Prevent blob from being freed at end of if statement scope
Was causing nonsense data to be read, tripping the blob size
check in Blob::CopyFrom
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 17:43:28 +0000 (10:43 -0700)]
readme.md updated with more info about development
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 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).
Evan Shelhamer [Fri, 14 Mar 2014 17:51:05 +0000 (10:51 -0700)]
note CUDA lib without CUDA driver install for CPU mode
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:39:38 +0000 (11:39 -0700)]
Merge pull request #120 from sguada/images_layer
Images layer: A data provider layer directly from images
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
Jeff Donahue [Thu, 6 Mar 2014 22:43:45 +0000 (14:43 -0800)]
Update README.md to fix missing } in bibtex
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
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