Evan Shelhamer [Mon, 19 Oct 2015 18:43:59 +0000 (11:43 -0700)]
Merge pull request #3218 from shelhamer/cudnn3-compatible
[docs] mark cuDNN v3 compatible
Evan Shelhamer [Mon, 19 Oct 2015 18:43:36 +0000 (11:43 -0700)]
Merge pull request #3219 from shelhamer/install-caffe-users
[docs] direct installation questions to caffe-users
Evan Shelhamer [Mon, 19 Oct 2015 18:39:29 +0000 (11:39 -0700)]
[docs] cuDNN v3 compatible
Evan Shelhamer [Mon, 19 Oct 2015 18:36:38 +0000 (11:36 -0700)]
installation questions -> caffe-users
Evan Shelhamer [Mon, 19 Oct 2015 17:05:14 +0000 (10:05 -0700)]
Merge pull request #3217 from BonsaiAI/qualify-CUDA-status-message
[build] Qualify messages issued by CMake when CUDA is unavailable
T.E.A de Souza [Mon, 19 Oct 2015 10:19:38 +0000 (18:19 +0800)]
Qualify messages issued by CMake when CUDA is unavailable
Evan Shelhamer [Sat, 17 Oct 2015 07:26:40 +0000 (00:26 -0700)]
Merge pull request #3116 from ronghanghu/solver-refactor
Solver Refactor: Separate files and Change Solver's Type to String
Evan Shelhamer [Sat, 17 Oct 2015 07:23:48 +0000 (00:23 -0700)]
Merge pull request #3206 from shelhamer/net-init-logging
[style] Clean Up Logging for Net Init
Evan Shelhamer [Sat, 17 Oct 2015 00:32:27 +0000 (17:32 -0700)]
clean up logging for Net init
- condense conditions by `LOG_IF`
- only log memory use once after all tops
Ronghang Hu [Sat, 26 Sep 2015 18:47:32 +0000 (11:47 -0700)]
Update examples and docs
Ronghang Hu [Sat, 26 Sep 2015 18:47:02 +0000 (11:47 -0700)]
Add automatic upgrade for solver type
Ronghang Hu [Fri, 25 Sep 2015 02:40:45 +0000 (19:40 -0700)]
Change solver type to string and provide solver registry
Ronghang Hu [Fri, 25 Sep 2015 00:11:07 +0000 (17:11 -0700)]
Split solver code into one file per solver class
Ronghang Hu [Sat, 17 Oct 2015 05:01:26 +0000 (22:01 -0700)]
Merge pull request #3207 from ronghanghu/test-matcaffe-io
Test reading and writing mean proto in matlab
Ronghang Hu [Sat, 17 Oct 2015 04:19:59 +0000 (21:19 -0700)]
Test reading and writing mean proto in matlab
Evan Shelhamer [Sat, 17 Oct 2015 01:09:00 +0000 (18:09 -0700)]
Merge pull request #3089 from shelhamer/groom-conv
[style] groom im2col + col2im for clarity
Evan Shelhamer [Sat, 17 Oct 2015 01:08:22 +0000 (18:08 -0700)]
Merge pull request #3204 from shelhamer/rearrange-upgrade-helpers
[style] Rearrange Proto Upgrade Helpers
Evan Shelhamer [Sat, 17 Oct 2015 00:59:13 +0000 (17:59 -0700)]
Merge pull request #3190 from DrSleep/master
Fix drawing problems with repeated convolution -- close #3201
Evan Shelhamer [Sat, 17 Oct 2015 00:56:13 +0000 (17:56 -0700)]
Merge pull request #3189 from bchu/caffenet-mirror
Set CaffeNet train_val test mirroring to false
Evan Shelhamer [Fri, 16 Oct 2015 23:33:06 +0000 (16:33 -0700)]
rearrange upgrade helpers
order from general helpers to specific upgrades in chronological order.
Evan Shelhamer [Fri, 16 Oct 2015 03:17:55 +0000 (20:17 -0700)]
Merge pull request #3160 from shelhamer/cudnnV3
Basic cuDNN v3 support
Simon Layton [Wed, 8 Jul 2015 19:35:55 +0000 (15:35 -0400)]
Initial cuDNN v3 support
Jeff Donahue [Thu, 15 Oct 2015 21:16:03 +0000 (14:16 -0700)]
Merge pull request #3200 from lukeyeager/bvlc/fix-blobproto_to_array
Allow old-style shape in blobproto_to_array
Luke Yeager [Thu, 15 Oct 2015 18:03:09 +0000 (11:03 -0700)]
Allow old-style shape in blobproto_to_array
Fixes #3199
Bug introduced in #3170
Vladimir [Wed, 14 Oct 2015 03:00:14 +0000 (12:00 +0900)]
Fixed drawing problems with repeated convolution
Jeff Donahue [Wed, 14 Oct 2015 00:25:09 +0000 (17:25 -0700)]
Merge pull request #2966 from cdoersch/batch_reindex_layer
BatchReindexLayer to shuffle, subsample, and replicate examples in a batch
Brian Chu [Tue, 13 Oct 2015 20:24:42 +0000 (13:24 -0700)]
Set CaffeNet train_val test mirroring to false
Evan Shelhamer [Tue, 13 Oct 2015 18:09:48 +0000 (11:09 -0700)]
Merge pull request #3187 from akash1810/patch-1
[example] Add pyyaml as a requirement for web demo
Akash A [Tue, 13 Oct 2015 16:53:35 +0000 (17:53 +0100)]
Add pyyaml as a requirement
In getting the [web demo](http://caffe.berkeleyvision.org/gathered/examples/web_demo.html) started I get an `ImportError: No module named yaml` error when running `./scripts/download_model_binary.py models/bvlc_reference_caffenet`.
Ronghang Hu [Tue, 13 Oct 2015 16:36:55 +0000 (09:36 -0700)]
Merge pull request #3184 from lalelale/patch-1
Update store2hdf5.m
Alessandro Giusti [Tue, 13 Oct 2015 12:30:45 +0000 (14:30 +0200)]
Update store2hdf5.m
Fixed a bug in two assertions (the condition input argument must be a scalar logical)
Ronghang Hu [Sun, 11 Oct 2015 16:48:09 +0000 (09:48 -0700)]
Merge pull request #3162 from kkhoot/fix_mvn
Improve numerical stability of variance computation in MVNLayer
Kang Kim [Wed, 7 Oct 2015 16:26:25 +0000 (01:26 +0900)]
Improve numerical stability of variance computation in MVNLayer
Jeff Donahue [Sun, 11 Oct 2015 02:39:22 +0000 (19:39 -0700)]
Merge pull request #3170 from sh1r0/pycaffe_io
Remove the 4D constraint of blobproto IO in python
sh1r0 [Thu, 8 Oct 2015 16:31:05 +0000 (00:31 +0800)]
Remove the 4D constraint of blobproto IO in python
Carl Doersch [Mon, 24 Aug 2015 03:47:25 +0000 (20:47 -0700)]
BatchReindexLayer to shuffle, subsample, and replicate examples in a batch
Ronghang Hu [Wed, 7 Oct 2015 19:41:37 +0000 (12:41 -0700)]
Merge pull request #3164 from eerwitt/layer-documentation-sample-fixes
Documentation References ImageNet Sample Location
e3 [Wed, 7 Oct 2015 18:52:45 +0000 (11:52 -0700)]
fixes BVLC/caffe#3163
Jeff Donahue [Mon, 5 Oct 2015 21:36:11 +0000 (14:36 -0700)]
Merge pull request #3152 from jeffdonahue/silence-backward-fix
SilenceLayer Backward bugfix (fixes #3151)
Jeff Donahue [Mon, 5 Oct 2015 21:15:08 +0000 (14:15 -0700)]
SilenceLayer Backward bugfix (fixes #3151)
Ronghang Hu [Mon, 5 Oct 2015 07:30:10 +0000 (00:30 -0700)]
Merge pull request #3058 from zoharby/master
Add a caffe.io.write_mean function to the MATLAB interface
zoharby [Fri, 11 Sep 2015 12:06:28 +0000 (15:06 +0300)]
Add a caffe.io.write_mean function to the MATLAB interface
Useful for exporting models from MATLAB (e.g. MatConvNet) to Caffe
Evan Shelhamer [Thu, 1 Oct 2015 17:05:32 +0000 (10:05 -0700)]
Merge pull request #3133 from kashefy/badge
add badge for travis build and license
Youssef Kashef [Thu, 1 Oct 2015 16:20:23 +0000 (18:20 +0200)]
add badge for travis build and license
Evan Shelhamer [Thu, 1 Oct 2015 00:43:05 +0000 (17:43 -0700)]
Merge pull request #3069 from timmeinhardt/argmax
Add argmax_param "axis" to maximise output along the specified axis
Ronghang Hu [Tue, 29 Sep 2015 16:07:44 +0000 (09:07 -0700)]
Merge pull request #3128 from hjss06/patch-1
Fix a typo
Yang Song [Tue, 29 Sep 2015 12:07:52 +0000 (20:07 +0800)]
Fix a typo
Fix a typo in the message.
Ronghang Hu [Sat, 26 Sep 2015 18:14:30 +0000 (11:14 -0700)]
Merge pull request #3073 from ronghanghu/consistent-malloc-free
Ensure consistency between memory alloc and free
Ronghang Hu [Wed, 16 Sep 2015 20:39:23 +0000 (13:39 -0700)]
Add flag on how host memory is allocated
Add a bool flag to record whether a host memory is allocated using malloc or
cudaMallocHost, and free correspondingly using this flag, instead of depending on Caffe::mode(), which is mutable during runtime.
Evan Shelhamer [Fri, 25 Sep 2015 21:57:17 +0000 (14:57 -0700)]
Merge pull request #3032 from ronghanghu/ban-pythonlayer-in-parallel
Disallow PythonLayer in Multi-GPU training
Evan Shelhamer [Fri, 25 Sep 2015 16:23:32 +0000 (09:23 -0700)]
Merge pull request #3118 from ducha-aiki/patch-1
Fix parse_log.sh against "prefetch queue empty" messages
Tim Meinhardt [Tue, 15 Sep 2015 14:57:55 +0000 (16:57 +0200)]
Implement ArgMaxLayerTest for axis param
Tim Meinhardt [Tue, 15 Sep 2015 14:57:37 +0000 (16:57 +0200)]
Generalise ArgMaxLayerTest bottom blob shape
Tim Meinhardt [Tue, 15 Sep 2015 14:56:45 +0000 (16:56 +0200)]
Update ArgMaxLayer documentation for axis param
Tim Meinhardt [Tue, 15 Sep 2015 14:56:16 +0000 (16:56 +0200)]
Implement ArgMaxLayer forward_cpu and reshape for axis param
Tim Meinhardt [Tue, 15 Sep 2015 14:55:26 +0000 (16:55 +0200)]
Add argmax_param axis
Dmytro Mishkin [Fri, 25 Sep 2015 07:00:23 +0000 (10:00 +0300)]
Fix parse_log.sh against "prefetch queue empty" messages
Jeff Donahue [Thu, 24 Sep 2015 21:10:50 +0000 (14:10 -0700)]
Merge pull request #3115 from lukeyeager/fix-generate-sample-data
Fix generate_sample_data.py
Luke Yeager [Thu, 24 Sep 2015 20:33:11 +0000 (13:33 -0700)]
Fix generate_sample_data.py - bug from #2978
Jeff Donahue [Thu, 24 Sep 2015 20:11:05 +0000 (13:11 -0700)]
Merge pull request #2978 from lukeyeager/h5t_integer
Allow H5T_INTEGER in HDF5 files
Luke Yeager [Wed, 26 Aug 2015 01:58:45 +0000 (18:58 -0700)]
Modify HDF5DataLayerTest to test H5T_INTEGER data
Luke Yeager [Thu, 24 Sep 2015 19:35:35 +0000 (12:35 -0700)]
Allow H5T_INTEGER in HDF5 files
Evan Shelhamer [Thu, 24 Sep 2015 04:17:45 +0000 (21:17 -0700)]
Merge pull request #2951 from dplarson/examples_readme_link
[examples] fix link to feature visualization notebook
Evan Shelhamer [Thu, 24 Sep 2015 03:38:44 +0000 (20:38 -0700)]
Merge pull request #3112 from shelhamer/test-reshape-harder
[test] Test Reshape more rigorously
Evan Shelhamer [Wed, 23 Sep 2015 20:40:24 +0000 (13:40 -0700)]
[test] TestReshape: check that shapes actually change
Check that output spatial shape varies with input shape while the output
num matches the input num.
Evan Shelhamer [Wed, 23 Sep 2015 20:40:16 +0000 (13:40 -0700)]
[test] TestReshape: expect instead of check
Evan Shelhamer [Wed, 23 Sep 2015 20:38:29 +0000 (13:38 -0700)]
[test] TestReshape: check small then large
checking large then small can mask failure since the smaller shape
memory will fit within the larger shape.
Jon Long [Mon, 21 Sep 2015 23:27:51 +0000 (16:27 -0700)]
Merge pull request #3096 from longjon/fix-conv-reshape
Fix broken conv/deconv reshaping
Evan Shelhamer [Mon, 21 Sep 2015 18:06:03 +0000 (11:06 -0700)]
Merge pull request #3093 from shelhamer/check-xcode-clt-version
[build] check xcode command line tools version >= 6
Jonathan L Long [Sun, 20 Sep 2015 22:31:59 +0000 (15:31 -0700)]
fix broken conv/deconv reshaping caused by reading bottom shape in
LayerSetUp
This also eliminates the extra copying of bottom's shape.
Jeff Donahue [Sun, 20 Sep 2015 22:16:59 +0000 (15:16 -0700)]
Merge pull request #3095 from longjon/fix-deconv-backward
Fix broken DeconvolutionLayer GPU backward caused by ND conv typo
Jonathan L Long [Sun, 20 Sep 2015 21:20:28 +0000 (14:20 -0700)]
fix broken DeconvolutionLayer GPU backward caused by typo
Evan Shelhamer [Sun, 20 Sep 2015 03:38:18 +0000 (20:38 -0700)]
[build] check xcode command line tools version >= 6
future-proof version check for BLAS libraries on OS X
fix #3092
Evan Shelhamer [Sat, 19 Sep 2015 21:07:10 +0000 (14:07 -0700)]
mark const im2col + col2im terms
Evan Shelhamer [Sat, 19 Sep 2015 21:00:14 +0000 (14:00 -0700)]
harmonize the im2col_{cpu,gpu} assignment
Evan Shelhamer [Sat, 19 Sep 2015 20:50:57 +0000 (13:50 -0700)]
clarify im2col + col2im var names
- clarify indices by naming *_im for indices in image
and *_col for indices in column
- mark corresonding im2col + col2im quantities by renaming
patch_* -> kernel_*
- fix out-of-date names in equivalent col2im loop
Jon Long [Sat, 19 Sep 2015 02:56:20 +0000 (19:56 -0700)]
Merge pull request #3083 from yanchen036/master
refine format of switch case statement in solver
Jeff Donahue [Sat, 19 Sep 2015 01:13:05 +0000 (18:13 -0700)]
Merge pull request #2049 from jeffdonahue/nd-convolution
ND convolution with im2col
Jeff Donahue [Thu, 5 Mar 2015 03:30:17 +0000 (19:30 -0800)]
Im2col and Convolution layers support N spatial axes
Jeff Donahue [Thu, 5 Mar 2015 05:31:34 +0000 (21:31 -0800)]
Blob: add SyncedMemory shape accessor for GPU shape access
Jeff Donahue [Thu, 5 Mar 2015 03:27:56 +0000 (19:27 -0800)]
caffe.proto: generalize ConvolutionParameter to N spatial axes
Yan Chen [Fri, 18 Sep 2015 09:02:16 +0000 (17:02 +0800)]
refine format of switch case in solver
Evan Shelhamer [Thu, 17 Sep 2015 23:38:39 +0000 (16:38 -0700)]
Merge pull request #3081 from shelhamer/include-io-by-default
include IO dependencies by default
Evan Shelhamer [Thu, 17 Sep 2015 22:05:12 +0000 (15:05 -0700)]
[build] include IO dependencies by default
keep old behavior by including leveldb, lmdb, and opencv by default
Ronghang Hu [Thu, 17 Sep 2015 20:26:30 +0000 (13:26 -0700)]
Merge pull request #3074 from ronghanghu/show-use-cpu
Get back 'USE CPU' print for caffe train
Jeff Donahue [Thu, 17 Sep 2015 07:33:11 +0000 (00:33 -0700)]
Merge pull request #2523 from BonsaiAI/separate-io-dependencies
Separate dependencies for configurable installation
T.E.A de Souza [Tue, 8 Sep 2015 04:20:40 +0000 (12:20 +0800)]
Add a comment indicating that Travis CI tests are CPU only
Tea [Thu, 17 Sep 2015 07:02:45 +0000 (15:02 +0800)]
Fix case in CMake notices
Tea [Sat, 27 Jun 2015 03:44:56 +0000 (11:44 +0800)]
Separate IO dependencies
OpenCV, LMDB, LevelDB and Snappy are made optional via switches
(USE_OPENCV, USE_LMDB, USE_LEVELDB) available for Make and CMake
builds. Since Snappy is a LevelDB dependency, its use is determined by
USE_LEVELDB. HDF5 is left bundled because it is used for serializing
weights and solverstates.
Ronghang Hu [Wed, 16 Sep 2015 19:06:16 +0000 (12:06 -0700)]
Get back 'USE CPU' print for caffe train
Jeff Donahue [Wed, 16 Sep 2015 18:24:27 +0000 (11:24 -0700)]
Merge pull request #3070 from mohomran/resize_nd-image_bug
bug in caffe.io.resize_image when applied to images with 2 or >3 channels
Mohamed Omran [Tue, 15 Sep 2015 15:18:32 +0000 (17:18 +0200)]
removed bug in caffe.io.resize_image when applied to Nd images
Ronghang Hu [Mon, 14 Sep 2015 21:57:18 +0000 (14:57 -0700)]
Merge pull request #3049 from seanbell/check-snapshot-prefix
Check that the snapshot directory is writeable before starting training
Sean Bell [Wed, 9 Sep 2015 16:49:27 +0000 (12:49 -0400)]
Check that the snapshot directory is writeable before starting training
Ronghang Hu [Mon, 14 Sep 2015 17:14:56 +0000 (10:14 -0700)]
Merge pull request #3063 from ronghanghu/use-expectnear-in-eltwiselayertest
Use EXPECT_NEAR in EltwiseLayer test
Ronghang Hu [Mon, 14 Sep 2015 16:54:35 +0000 (09:54 -0700)]
Merge pull request #2941 from thatguymike/MultiGPUDocs
Add some documentation on Multi-GPU support
Ronghang Hu [Mon, 14 Sep 2015 03:46:24 +0000 (20:46 -0700)]
Use EXPECT_NEAR in EltwiseLayer test
Otherwise there seem to be some numerical issues causing BLAS results not exactly same as evaluated results in test code.
Ronghang Hu [Wed, 9 Sep 2015 17:25:08 +0000 (10:25 -0700)]
Merge pull request #3048 from seanbell/minor-string-fix
Minor: missing space in string formatting
Sean Bell [Wed, 9 Sep 2015 16:52:52 +0000 (12:52 -0400)]
Minor: missing space in string formatting
Ronghang Hu [Fri, 4 Sep 2015 21:16:31 +0000 (14:16 -0700)]
disallow PythonLayer in Multi-GPU training