Kai Li [Tue, 17 Jun 2014 05:35:59 +0000 (13:35 +0800)]
Initialize the RNG generator with an orthogonally newed Generator
Kai Li [Tue, 17 Jun 2014 03:43:10 +0000 (11:43 +0800)]
Fix the condition prefetch_needs_rand in the ImageDataLayer
Jonathan L Long [Fri, 20 Jun 2014 08:05:41 +0000 (01:05 -0700)]
remove erroneous comment in ArgMaxLayer
Sergey Karayev [Fri, 20 Jun 2014 00:13:34 +0000 (17:13 -0700)]
Merge pull request #521 from sguada/set_device_id_at_init
Set device_id at the beginning of Solver.Init()
Sergio [Thu, 19 Jun 2014 19:55:48 +0000 (12:55 -0700)]
Set device_id at the begining of Solver.Init() to avoid using memory in the default GPU
Yangqing Jia [Thu, 19 Jun 2014 01:18:08 +0000 (18:18 -0700)]
Merge pull request #504 from leelurch/Config-Example-Ubuntu14.04
Add comment for how to set the CUDA path when cuda tools are installed b...
Sergio Guadarrama [Tue, 17 Jun 2014 16:20:25 +0000 (09:20 -0700)]
Merge pull request #507 from longjon/set-device-early
Fix Caffe::SetDevice to avoid initializing on default device
Jonathan L Long [Mon, 16 Jun 2014 22:20:17 +0000 (15:20 -0700)]
in Caffe::SetDevice, call cudaSetDevice before Get
Otherwise initialization will be performed on whichever device is
default.
Sergey Karayev [Mon, 16 Jun 2014 06:38:42 +0000 (23:38 -0700)]
Merge pull request #431 from mavenlin/lmdb
Add support for LMDB (LevelDB alternative)
leelurch [Mon, 16 Jun 2014 01:07:04 +0000 (20:07 -0500)]
Add comment for how to set the CUDA path when cuda tools are installed by the package manager.
linmin [Sat, 14 Jun 2014 08:35:48 +0000 (16:35 +0800)]
fix string compare error
linmin [Sat, 14 Jun 2014 08:15:44 +0000 (16:15 +0800)]
add lmdb support for compute_image_mean
linmin [Sat, 14 Jun 2014 08:15:18 +0000 (16:15 +0800)]
add lmdb support for convert_imageset
Evan Shelhamer [Fri, 13 Jun 2014 20:22:22 +0000 (13:22 -0700)]
Merge pull request #495 from jeffdonahue/refactor-net
Minor Net::Init refactoring: name loop indices, add helpers
Evan Shelhamer [Fri, 13 Jun 2014 18:42:40 +0000 (11:42 -0700)]
add net surgery link to docs (+ drop old comment)
Jeff Donahue [Fri, 13 Jun 2014 06:07:23 +0000 (23:07 -0700)]
unify data layer tests: was copied four times for all combinations of
cpu/gpu and leveldb/lmdb; now just one copy of each test body
Jeff Donahue [Fri, 13 Jun 2014 05:51:33 +0000 (22:51 -0700)]
unify test_data_layer tests
Jeff Donahue [Fri, 13 Jun 2014 05:29:59 +0000 (22:29 -0700)]
lint
linmin [Fri, 13 Jun 2014 02:26:38 +0000 (10:26 +0800)]
fixed cpplint error
linmin [Fri, 13 Jun 2014 02:19:33 +0000 (10:19 +0800)]
add tests for lmdb of datalayer (copied from test_data_layer.cpp)
linmin [Wed, 21 May 2014 16:15:32 +0000 (00:15 +0800)]
add option for lmdb
Evan Shelhamer [Thu, 12 Jun 2014 23:00:49 +0000 (16:00 -0700)]
Merge pull request #455 from shelhamer/pycaffe-save
Save from python for net surgery
Jeff Donahue [Wed, 11 Jun 2014 02:22:16 +0000 (19:22 -0700)]
refactor Net::Init to call helpers AppendBottom and AppendTop
Jeff Donahue [Tue, 10 Jun 2014 20:19:34 +0000 (13:19 -0700)]
make Net::Init loop indices clearer
Jeff Donahue [Thu, 12 Jun 2014 22:37:10 +0000 (15:37 -0700)]
Merge pull request #496 from jeffdonahue/test-net-use-dummy-data
Make test_net use DUMMY_DATA instead of DATA (leveldb)
Jeff Donahue [Thu, 12 Jun 2014 21:58:07 +0000 (14:58 -0700)]
make test_net use DUMMY_DATA instead of leveldb
Evan Shelhamer [Thu, 12 Jun 2014 21:41:25 +0000 (14:41 -0700)]
make notebook for net surgery of fully-convolutional model
Evan Shelhamer [Wed, 11 Jun 2014 16:57:07 +0000 (09:57 -0700)]
define fully-convolutional imagenet model
Evan Shelhamer [Mon, 26 May 2014 06:49:51 +0000 (23:49 -0700)]
save from python for net surgery
0. Scheme desired parameters.
1. Do surgery on the net through `net.params['name'][idx].data[...] = `.
2. Save post-operation net params by `net.save('fname')`.
Handwoven deep nets, anyone?
Evan Shelhamer [Wed, 11 Jun 2014 22:22:04 +0000 (15:22 -0700)]
Merge pull request #482 from shelhamer/rcnn-detector-example
Make R-CNN the Caffe detection example
Evan Shelhamer [Wed, 11 Jun 2014 17:17:23 +0000 (10:17 -0700)]
Merge pull request #469 from weinman/grayscale-io-convert
Add grayscale input processing for intensity images in tools and
pycaffe.
Evan Shelhamer [Tue, 10 Jun 2014 22:01:41 +0000 (15:01 -0700)]
pycaffe: leave grayscale images gray according to arg
Evan Shelhamer [Wed, 11 Jun 2014 16:55:54 +0000 (09:55 -0700)]
drop learning rates and decays from deploy model
Evan Shelhamer [Tue, 10 Jun 2014 21:46:53 +0000 (14:46 -0700)]
groom install docs
- make OS X boost compilation more clear
- make punctuation more sincere
Jeff Donahue [Tue, 10 Jun 2014 18:35:08 +0000 (11:35 -0700)]
fix clang compilation problem w/ DummyDataLayer
Evan Shelhamer [Tue, 10 Jun 2014 03:56:19 +0000 (20:56 -0700)]
finish R-CNN detection example
- run through and save new output
- collect region proposals with R-CNN configuration (see sergeyk/selective_search_ijcv_with_python)
- call detect.py in GPU mode
- fix NMS plotting: X and Y coords were accidentally exchanged. print scores too.
Evan Shelhamer [Tue, 10 Jun 2014 03:43:47 +0000 (20:43 -0700)]
make selective search proposals with R-CNN configuration
Evan Shelhamer [Tue, 10 Jun 2014 02:46:07 +0000 (19:46 -0700)]
edit detection example, include R-CNN NMS
Evan Shelhamer [Sun, 8 Jun 2014 23:53:06 +0000 (16:53 -0700)]
make R-CNN the Caffe detection example
Evan Shelhamer [Mon, 9 Jun 2014 03:31:35 +0000 (20:31 -0700)]
pycaffe Detector crops with surrounding context
- caffe.Detector learned how to crop windows with context in the R-CNN
style s.t. the bordero of the network input is a given amount of
context.
- add --context_pad arg to detect.py for amount of context. Default is
16, as in R-CNN.
Evan Shelhamer [Tue, 10 Jun 2014 01:12:16 +0000 (18:12 -0700)]
fix old detect.py default
Jeff Donahue [Mon, 9 Jun 2014 18:52:06 +0000 (11:52 -0700)]
lint dummy data layer
Jeff Donahue [Mon, 9 Jun 2014 17:58:26 +0000 (10:58 -0700)]
Merge pull request #480 from jeffdonahue/dummy-data-layer
Dummy data layer
Jeff Donahue [Sun, 8 Jun 2014 23:04:41 +0000 (16:04 -0700)]
add DummyDataLayer tests
Jeff Donahue [Sun, 8 Jun 2014 21:58:53 +0000 (14:58 -0700)]
add DummyDataLayer
Jeff Donahue [Mon, 9 Jun 2014 05:44:32 +0000 (22:44 -0700)]
fix ArgMaxLayer bug in num bottom blobs decl. pointed out by @sguada
Evan Shelhamer [Mon, 9 Jun 2014 04:11:24 +0000 (21:11 -0700)]
Merge pull request #479 from jeffdonahue/declare-layer-names-and-numblobs
Layers declare their types and number of bottom/top blobs
Evan Shelhamer [Mon, 9 Jun 2014 03:44:36 +0000 (20:44 -0700)]
add fish bike example image
Jeff Donahue [Sun, 8 Jun 2014 19:45:17 +0000 (12:45 -0700)]
move MemoryDataLayer decl. from vision_layers.hpp to data_layers.hpp
Jeff Donahue [Fri, 6 Jun 2014 22:40:26 +0000 (15:40 -0700)]
layers declare their names and number of input/output blobs, and don't
check top/bottom blob counts explicitly in SetUp; instead call base
Layer::SetUp.
Jeff Donahue [Mon, 9 Jun 2014 01:08:24 +0000 (18:08 -0700)]
fix Makefile build dir link upgrade bug reported by @jamt9000
Jerod Weinman [Sun, 8 Jun 2014 20:46:23 +0000 (15:46 -0500)]
Changed variable name: iscolor to is_color.
Jeff Donahue [Sun, 8 Jun 2014 19:03:22 +0000 (12:03 -0700)]
Merge pull request #473 from shelhamer/pad-max-pooling
Padding for Max Pooling
Jeff Donahue [Fri, 6 Jun 2014 20:59:19 +0000 (13:59 -0700)]
check the last pooling in padding and add padded max pooling test
[Adapted from a commit by @jeffdonahue by @shelhamer.]
Evan Shelhamer [Thu, 5 Jun 2014 17:53:42 +0000 (10:53 -0700)]
padding for max pooling
Max pooling pads by -inf if the padding parameter is set.
Padding for pooling, like padding for convolution, can preserve the
dimensions of the bottom at the top. By setting the padding to
floor(kernel_size / 2) the top output is the "same" instead of the
"valid" part of the bottom input.
Evan Shelhamer [Sun, 8 Jun 2014 05:00:05 +0000 (22:00 -0700)]
Merge pull request #475 from jeffdonahue/tanh-fixes
Make TanH cleaner, more efficient, and possible to use in-place
Jeff Donahue [Fri, 6 Jun 2014 00:20:30 +0000 (17:20 -0700)]
Make TanH cleaner, more efficient, and possible to use in-place
Jeff Donahue [Fri, 6 Jun 2014 01:06:01 +0000 (18:06 -0700)]
Merge pull request #471 from jeffdonahue/debug-release-build-dirs
Compile debug/release into separate directories
Evan Shelhamer [Tue, 3 Jun 2014 13:21:22 +0000 (09:21 -0400)]
Merge pull request #466 from robcurrie/dev
Update docs on building boost on OSX for the python wrappers
Jeff Donahue [Tue, 3 Jun 2014 06:57:37 +0000 (23:57 -0700)]
update .gitignore appropriately for separate debug/release build dirs
Jeff Donahue [Tue, 3 Jun 2014 06:47:09 +0000 (23:47 -0700)]
compile debug/release into separate directories so you don't have to
rebuild the whole thing to switch back and forth
Jerod Weinman [Mon, 2 Jun 2014 20:54:25 +0000 (15:54 -0500)]
Added an iscolor flag to io.cpp method ReadImageToDatum to handle grayscale images and a corresponding commandline flag [-g] to convert_imageset.cpp.
Rob Currie [Thu, 29 May 2014 21:46:29 +0000 (14:46 -0700)]
Update docs on building boost on OSX for the python wrappers
Evan Shelhamer [Thu, 29 May 2014 00:18:22 +0000 (17:18 -0700)]
fix OSX 10.9 homebrew CXX doc
clang++ and not clang as accidentally committed in 2dcbcd9.
Sergio Guadarrama [Tue, 27 May 2014 19:06:57 +0000 (12:06 -0700)]
Merge pull request #422 from sguada/threshold_layer
Threshold layer to binarize features
Added GPU code and tested
Sergio [Tue, 27 May 2014 18:54:53 +0000 (11:54 -0700)]
Un comment Test GPUs cases, fixed ThresholdLayer.cu
Sergio [Tue, 27 May 2014 18:44:17 +0000 (11:44 -0700)]
Comment Test GPUs cases
Sergio [Tue, 27 May 2014 18:06:56 +0000 (11:06 -0700)]
Make lint happy
Sergio [Tue, 27 May 2014 18:02:20 +0000 (11:02 -0700)]
Fixed call to ThresholdForward in ThresholdLayer.cu
Sergio [Tue, 27 May 2014 18:01:19 +0000 (11:01 -0700)]
Fixed type in ThresholdLayer.cu
Sergio [Tue, 27 May 2014 17:59:36 +0000 (10:59 -0700)]
Fixed typo in Threshold Layer definition
Sergio [Tue, 27 May 2014 17:57:26 +0000 (10:57 -0700)]
Added ForwardGPU to ThresholdLayer and to the tests
Sergio [Tue, 27 May 2014 17:54:21 +0000 (10:54 -0700)]
Added Threshold layer to neuron_layers.hpp
Sergio Guadarrama [Fri, 16 May 2014 01:58:04 +0000 (18:58 -0700)]
Corrected conditions in test_threshold
Sergio Guadarrama [Fri, 16 May 2014 01:47:57 +0000 (18:47 -0700)]
Fix typo in test_threshold ThresholdParameter
Sergio Guadarrama [Fri, 16 May 2014 01:42:50 +0000 (18:42 -0700)]
Added the code for threshold_layer to the repo
Sergio Guadarrama [Fri, 16 May 2014 00:14:00 +0000 (17:14 -0700)]
Added NeuronLayer<Dtype>::SetUp(bottom, top) to ThresholdLayer
Sergio Guadarrama [Fri, 16 May 2014 00:01:50 +0000 (17:01 -0700)]
Added threshold setting test
Sergio Guadarrama [Thu, 15 May 2014 23:58:27 +0000 (16:58 -0700)]
Fixed name of blob_bottom_
Sergio Guadarrama [Thu, 15 May 2014 23:57:50 +0000 (16:57 -0700)]
Fixed name of threshold_ var
Sergio [Tue, 27 May 2014 17:32:11 +0000 (10:32 -0700)]
Fixed ThresholdParam
Conflicts:
src/caffe/proto/caffe.proto
Conflicts:
src/caffe/proto/caffe.proto
Conflicts:
src/caffe/proto/caffe.proto
Sergio [Thu, 15 May 2014 16:30:07 +0000 (09:30 -0700)]
Test for Threshold layer
Evan Shelhamer [Tue, 27 May 2014 04:58:34 +0000 (21:58 -0700)]
Merge pull request #459 from shelhamer/python-net-preprocessing-members
Make net preprocessing options belong to instantiated net and not class
Evan Shelhamer [Tue, 27 May 2014 04:58:34 +0000 (21:58 -0700)]
Merge pull request #459 from shelhamer/python-net-preprocessing-members
Make net preprocessing options belong to instantiated net and not class
Evan Shelhamer [Tue, 27 May 2014 04:50:39 +0000 (21:50 -0700)]
caffe.Net preprocessing members belong to object, not class
Evan Shelhamer [Mon, 26 May 2014 17:50:09 +0000 (10:50 -0700)]
Merge pull request #445 from jeffdonahue/convert_imageset_resize_option
Optionally resize an image set to canonical dimensions when converting.
Do this by default for creating the imagenet train + val leveldbs.
Evan Shelhamer [Mon, 26 May 2014 17:50:00 +0000 (10:50 -0700)]
convert imageset comment fixup
Evan Shelhamer [Mon, 26 May 2014 16:54:20 +0000 (09:54 -0700)]
Merge pull request #456 from longjon/spurious-ldflags
Don't pass LDFLAGS when only performing compilation (-c)
Jonathan L Long [Mon, 26 May 2014 08:34:32 +0000 (01:34 -0700)]
don't pass LDFLAGS when only compiling
Evan Shelhamer [Sun, 25 May 2014 23:19:14 +0000 (16:19 -0700)]
10.9 install doc formatting
Evan Shelhamer [Sun, 25 May 2014 04:41:16 +0000 (21:41 -0700)]
Back-merge recent fixes from master to dev
fix OSX 10.9 compiler/stdlib override for latest homebrew
follow-up on #443 to invert k channels (instead of 3)
Correctly invert the swapping of colour channels
link presentation on dropbox (was self-hosted during a dropbox issue)
link to demo
fix draw_net python script
release v1 model defs + weights
point out @niuzhiheng's work on the Windows port
fix test_all path in docs
link canonical bvlc site
fix detection notebook link
Evan Shelhamer [Sun, 25 May 2014 04:06:37 +0000 (21:06 -0700)]
fix OSX 10.9 compiler/stdlib override for latest homebrew
Sergio Guadarrama [Sun, 25 May 2014 02:39:58 +0000 (19:39 -0700)]
Merge pull request #448 from jeffdonahue/sguada-fix_maxpooling
Finish up max pooling with a mask from @sguada
Tested
Jeff Donahue [Sun, 25 May 2014 02:02:51 +0000 (19:02 -0700)]
merge caffe_set definitions; define for int as well
Jeff Donahue [Sun, 25 May 2014 01:40:03 +0000 (18:40 -0700)]
add tests for maxpooling layer forward, and for maxpooling with top mask
Jeff Donahue [Sun, 25 May 2014 01:09:05 +0000 (18:09 -0700)]
optionally output the mask to a top blob instead of storing internally
Jeff Donahue [Sat, 24 May 2014 23:59:15 +0000 (16:59 -0700)]
make a Blob<unsigned int> and use in dropout layer
Jeff Donahue [Sat, 24 May 2014 23:27:38 +0000 (16:27 -0700)]
use a Blob<int> instead of a SyncedMemory to store max_idx_
Jeff Donahue [Sat, 24 May 2014 23:14:44 +0000 (16:14 -0700)]
bugfix: setting count to the top count in backward doesn't process all
of the bottom (assuming the bottom is larger, which happens for
nontrivial poolsize>1)
Jeff Donahue [Sat, 24 May 2014 23:14:04 +0000 (16:14 -0700)]
mask should be const in backward pass