Ross Girshick [Tue, 15 Jul 2014 00:04:43 +0000 (17:04 -0700)]
fix bug that breaks MATLAB 2014a compilation
Jeff Donahue [Mon, 14 Jul 2014 21:13:50 +0000 (14:13 -0700)]
Merge pull request #694 from jeffdonahue/travis-tweaks
Travis tweaks -- make --keep-going; build on all branches; replace CUSTOM_CXX <eom>
Jeff Donahue [Mon, 14 Jul 2014 20:46:09 +0000 (13:46 -0700)]
Add blank lines between fields for readability.
Jeff Donahue [Mon, 14 Jul 2014 20:43:08 +0000 (13:43 -0700)]
Replace CUSTOM_CXX env var to specify non-default C++ compiler.
Jeff Donahue [Mon, 14 Jul 2014 20:37:13 +0000 (13:37 -0700)]
Run Travis build on all branches (remove whitelist from .travis.yml).
Jeff Donahue [Mon, 14 Jul 2014 20:31:13 +0000 (13:31 -0700)]
Add --keep-going flag to first make so that any targets that can be
built are built; write out full -j flag as --jobs for clarity.
Evan Shelhamer [Mon, 14 Jul 2014 17:54:48 +0000 (19:54 +0200)]
fix Makefile comment about library names
Jeff Donahue [Mon, 14 Jul 2014 09:56:08 +0000 (02:56 -0700)]
Merge pull request #685 from jeffdonahue/seed-hinge-loss-test
Seed HingeLossLayerTest; bad values can cause test (and therefore Travis build) to fail
Jeff Donahue [Mon, 14 Jul 2014 09:44:28 +0000 (02:44 -0700)]
Seed HingeLossLayerTest; bad values can cause test (and therefore Travis
CI build) to fail
Evan Shelhamer [Mon, 14 Jul 2014 09:27:24 +0000 (11:27 +0200)]
Merge pull request #681 from BVLC/travisci
continuous integration for build, test, and lint by Travis CI
Jeff Donahue [Sun, 13 Jul 2014 05:37:10 +0000 (22:37 -0700)]
Travis build failure wasn't working for lint/warn because they didn't
exit with a non-zero code -- this fixes that.
Jeff Donahue [Sat, 12 Jul 2014 11:27:36 +0000 (04:27 -0700)]
@jeffdonahue's tweaks to .travis.yml config:
-Add (CPU-only) test, lint, warn and parallel (-j 4) to travis CI build.
-Add /usr/local/lib to travis config (seems needed for LMDB).
-Put export in "before_script"; disable clang build -- doesn't work on Linux.
-Cache Ubuntu apt packages.
-Install bc package to hopefully suppress "bc: not found" errors
-Get apt packages before_install as suggested by Travis official docs
-Remove specified email address and IRC notifications (emails are sent
to the committer by default; others can view build results in public
Travis feed, on pull requests, etc.).
Jeff Donahue [Sat, 12 Jul 2014 17:00:44 +0000 (10:00 -0700)]
-Override the default compiler by specifying a CXX in
Makefile.config instead of CUSTOM_CXX, as Travis exports CXX
as the compiler env variable name.
-Change TEST_HDFS -> TEST_HXX_SRCS.
huy [Thu, 10 Jul 2014 06:02:06 +0000 (23:02 -0700)]
@huyng's .travis.yml integration configuration file to install and test Caffe.
Jeff Donahue [Sat, 12 Jul 2014 13:58:35 +0000 (06:58 -0700)]
Move test headers to include/.
Add a test param to test both CPU and GPU (with both float and double
Dtypes).
Sergey Karayev [Sat, 12 Jul 2014 16:25:23 +0000 (09:25 -0700)]
back-merging [docs] changes and web demo [example] addition; updating
net_surgery example to new format
Conflicts:
docs/getting_pretrained_models.md
docs/index.md
Sergey Karayev [Sat, 12 Jul 2014 16:20:07 +0000 (09:20 -0700)]
Merge pull request #679 from sergeyk/master
[example] image classification web demo
Sergey Karayev [Sat, 12 Jul 2014 02:23:47 +0000 (19:23 -0700)]
[example] image classification web demo
Sergey Karayev [Sat, 12 Jul 2014 00:20:46 +0000 (17:20 -0700)]
Merge pull request #675 from sergeyk/master
Revamped docs system
Sergey Karayev [Sat, 12 Jul 2014 00:19:35 +0000 (17:19 -0700)]
[docs] shelhamer's minor suggestions
Sergey Karayev [Fri, 11 Jul 2014 21:00:56 +0000 (14:00 -0700)]
[docs] updated instructions for contributing documentation
Sergey Karayev [Fri, 11 Jul 2014 20:28:55 +0000 (13:28 -0700)]
[docs] moved example md’s to examples/**/md’s and added script to gather
them for publication
Sergey Karayev [Fri, 11 Jul 2014 20:27:38 +0000 (13:27 -0700)]
[docs] cosmetic
Evan Shelhamer [Fri, 11 Jul 2014 04:09:41 +0000 (06:09 +0200)]
fix link for caffe_rcnn_imagenet_model
Evan Shelhamer [Fri, 11 Jul 2014 04:07:55 +0000 (06:07 +0200)]
Back-merge documentation and fixes
* master:
host materials on dl.caffe.berkeleyvision.org
fix caffe acm-mm paper link
[docs] readme
[docs] got rid of redundant README, updated development instructions
[docs] reworked index page, got rid of publications page
point to reference performance from installation, add GTX 770
acknowledge BVLC PI Trevor Darrell for advising Caffe
add latest CUDA arch to fix invalid device function errors
switch language to "related publications"
add publication section to homepage
fix caffe paper link -- still hasn't appeared on arxiv yet
Added top-1 and top-5 accuracy for the caffe networks to docs
add skeleton of the Caffe publications page
Update docs on building boost on OSX for the python wrappers
fix OSX 10.9 homebrew CXX doc
caffe.Net preprocessing members belong to object, not class
10.9 install doc formatting
Evan Shelhamer [Fri, 11 Jul 2014 04:01:42 +0000 (06:01 +0200)]
host materials on dl.caffe.berkeleyvision.org
Evan Shelhamer [Thu, 10 Jul 2014 12:45:44 +0000 (14:45 +0200)]
fix caffe acm-mm paper link
longjon [Thu, 10 Jul 2014 00:18:33 +0000 (17:18 -0700)]
Merge pull request #633 from kloudkl/cpu-only-memcpy
Support CPU only memcpy
Kai Li [Wed, 9 Jul 2014 23:50:31 +0000 (07:50 +0800)]
Replace cudaMemcpy with caffe_gpu_memcpy in SyncedMemory per @longjon
Kai Li [Wed, 9 Jul 2014 17:57:16 +0000 (01:57 +0800)]
Implement @Yangqing's solution to copy memory in the SyncedMemory
Kai Li [Wed, 9 Jul 2014 02:12:07 +0000 (10:12 +0800)]
Switch to GPU mode when pointer is move to or from GPU in SyncedMemory
Kai Li [Wed, 9 Jul 2014 01:47:28 +0000 (09:47 +0800)]
Check the GPU mode to decide which memcpy to use
Kai Li [Mon, 7 Jul 2014 07:26:24 +0000 (15:26 +0800)]
Avoid using cudaMemcpy for memcpy when there is no GPU and CUDA driver
Jeff Donahue [Wed, 9 Jul 2014 23:39:17 +0000 (16:39 -0700)]
makefile hotfix
Jeff Donahue [Wed, 9 Jul 2014 22:54:35 +0000 (15:54 -0700)]
Merge pull request #661 from jeffdonahue/fix-error-output
Fix bug introduced by warning logs (errors didn't print)
Jeff Donahue [Wed, 9 Jul 2014 22:47:21 +0000 (15:47 -0700)]
fix bug introduced by warning logs: errors didn't print because they
are logged to the warnings file
Sergey Karayev [Wed, 9 Jul 2014 22:07:42 +0000 (15:07 -0700)]
[docs] readme
Sergey Karayev [Wed, 9 Jul 2014 22:06:10 +0000 (15:06 -0700)]
[docs] got rid of redundant README, updated development instructions
Jeff Donahue [Wed, 9 Jul 2014 18:37:14 +0000 (11:37 -0700)]
Makefile: cleanup lint/warn report logic (and make the two more consistent)
Sergey Karayev [Wed, 9 Jul 2014 17:14:00 +0000 (10:14 -0700)]
[docs] reworked index page, got rid of publications page
Evan Shelhamer [Wed, 9 Jul 2014 06:47:36 +0000 (08:47 +0200)]
Merge pull request #649 from jeffdonahue/warnlog
"make warn" to print compilation warnings; "make lint" runs incrementally
Jeff Donahue [Wed, 9 Jul 2014 00:52:49 +0000 (17:52 -0700)]
Output a lint report for every source file linted; use to lint
incrementally
Jeff Donahue [Tue, 8 Jul 2014 22:58:12 +0000 (15:58 -0700)]
Dump compiler warnings to *.warnings.txt; use "make warn" to print them
Jeff Donahue [Tue, 8 Jul 2014 22:06:34 +0000 (15:06 -0700)]
Merge pull request #647 from jeffdonahue/nocleanlinecount
Don't make clean when running linecount
Jeff Donahue [Tue, 8 Jul 2014 22:02:00 +0000 (15:02 -0700)]
Don't make clean when running linecount
Jeff Donahue [Mon, 7 Jul 2014 23:40:50 +0000 (16:40 -0700)]
Merge pull request #614 from ronghanghu/rectangular_pooling
Rectangular pooling
Ronghang Hu [Mon, 7 Jul 2014 19:12:59 +0000 (12:12 -0700)]
added gradient check for non-square pooling
Ronghang Hu [Mon, 7 Jul 2014 18:32:58 +0000 (11:32 -0700)]
fixed style errors
Evan Shelhamer [Sun, 6 Jul 2014 19:47:53 +0000 (12:47 -0700)]
Merge pull request #611 from shelhamer/makefile-config-cxx
Customize compiler setting in Makefile.config
Ronghang Hu [Sat, 5 Jul 2014 15:21:50 +0000 (08:21 -0700)]
add tests for rectangular pooling regions
Ronghang Hu [Sat, 5 Jul 2014 00:29:56 +0000 (17:29 -0700)]
fixing pooling SetUp() to allow default values for stride and pad
Ronghang Hu [Fri, 4 Jul 2014 04:05:23 +0000 (21:05 -0700)]
Update pooling_layer.cu
Replace pad_, kernel_size_, stride_ with pad_h_, pad_w_, kernel_size_h_, kernel_size_w_, stride_h_, stride_w_ to support pooling on rectangle regions.
Ronghang Hu [Fri, 4 Jul 2014 03:42:58 +0000 (20:42 -0700)]
Update pooling_layer.cpp
Replace pad_, kernel_size_, stride_ with pad_h_, pad_w_, kernel_size_h_, kernel_size_w_, stride_h_, stride_w_ to support pooling on rectangle regions.
Ronghang Hu [Fri, 4 Jul 2014 03:33:50 +0000 (20:33 -0700)]
Update vision_layers.hpp
Replace pad_, kernel_size_, stride_ with pad_h_, pad_w_, kernel_size_h_, kernel_size_w_, stride_h_, stride_w_ to support pooling on rectangle regions.
Ronghang Hu [Fri, 4 Jul 2014 03:30:25 +0000 (20:30 -0700)]
Update caffe.proto
Add pad_h, pad_w, kernel_size_h, kernel_size_w, stride_h, stride_w to support pooling on rectangle regions.
Evan Shelhamer [Fri, 4 Jul 2014 02:07:10 +0000 (19:07 -0700)]
point to reference performance from installation, add GTX 770
Evan Shelhamer [Fri, 4 Jul 2014 01:15:38 +0000 (18:15 -0700)]
customize compiler setting in Makefile.config
in case of issues with default compilers or exotic platforms.
Evan Shelhamer [Fri, 4 Jul 2014 00:29:14 +0000 (17:29 -0700)]
Merge pull request #549 from jamt9000/fix-resize-crop-pil
Make resizing & cropping with PIL work
Evan Shelhamer [Fri, 4 Jul 2014 00:27:37 +0000 (17:27 -0700)]
Merge pull request #555 from shelhamer/uva-memory
Switch to Unified Virtual Address memory copies
Jeff Donahue [Fri, 4 Jul 2014 00:25:51 +0000 (17:25 -0700)]
Merge pull request #602 from kloudkl/layers-in-order
Layers in order
Evan Shelhamer [Sat, 28 Jun 2014 21:05:35 +0000 (14:05 -0700)]
fix casts (static for void*)
Evan Shelhamer [Sat, 28 Jun 2014 20:48:37 +0000 (13:48 -0700)]
reduce caffe_copy to instantiations, split off caffe_memcpy for void*
Evan Shelhamer [Sat, 28 Jun 2014 08:52:49 +0000 (01:52 -0700)]
replace all memset with caffe_set() / caffe_gpu_set()
...except for `SyncedMem` since it has no type.
Evan Shelhamer [Sat, 28 Jun 2014 02:51:33 +0000 (19:51 -0700)]
replace all memcpy by caffe_copy
Evan Shelhamer [Sat, 28 Jun 2014 04:25:36 +0000 (21:25 -0700)]
do all caffe_copy() as UVA mem copy, and drop caffe_gpu_copy()
Do all memory copies by `cudaMemcpy` in UVA mode so that the same
`caffe_copy()` interface works for all transfers.
`cudaMemcpy()` is used in lieu of BLAS copies because they do not
understand UVA.
Drop the now unnecessary `caffe_gpu_copy()` since location of the
pointers is now irrelevant to the interface.
Evan Shelhamer [Sat, 28 Jun 2014 01:38:39 +0000 (18:38 -0700)]
replace softmax cudaMemcpy with caffe_gpu_copy
Evan Shelhamer [Sat, 28 Jun 2014 01:36:48 +0000 (18:36 -0700)]
switch to unified virtual addressing CUDA memcpy
Host / device copies are distinguished by the virtual address of the
pointers instead of explicit memcpy modes.
Evan Shelhamer [Fri, 27 Jun 2014 22:01:02 +0000 (15:01 -0700)]
report UVA in platform test
Evan Shelhamer [Fri, 4 Jul 2014 00:11:20 +0000 (17:11 -0700)]
Merge pull request #609 from jeffdonahue/multiconv
Generalize CONVOLUTION layer to multiple inputs/outputs
Jeff Donahue [Thu, 3 Jul 2014 22:33:12 +0000 (15:33 -0700)]
ConvolutionLayer can take N bottom blobs and N top blobs
Jeff Donahue [Thu, 3 Jul 2014 21:39:35 +0000 (14:39 -0700)]
add EqualNumBottomTopBlobs() property for layers; use in
ConvolutionLayer
Kai Li [Thu, 3 Jul 2014 12:17:41 +0000 (20:17 +0800)]
Organize the loss layers in alphabetical order
Kai Li [Thu, 3 Jul 2014 12:16:54 +0000 (20:16 +0800)]
Arrange the data layers to be in alphabetical order
Kai Li [Thu, 3 Jul 2014 12:15:53 +0000 (20:15 +0800)]
Separate layers relatively independent of images out of vision_layers
Evan Shelhamer [Wed, 2 Jul 2014 20:06:31 +0000 (13:06 -0700)]
acknowledge BVLC PI Trevor Darrell for advising Caffe
Jeff Donahue [Tue, 1 Jul 2014 17:15:29 +0000 (10:15 -0700)]
fix uninitialized variable warnings in tools
yzhuan [Mon, 30 Jun 2014 08:08:55 +0000 (16:08 +0800)]
Update Makefile.config.example
fix some typing error
Evan Shelhamer [Mon, 30 Jun 2014 00:27:50 +0000 (17:27 -0700)]
Merge pull request #545 from jamt9000/im2col-kernel-test
Test for im2col kernel
Evan Shelhamer [Sat, 28 Jun 2014 20:54:58 +0000 (13:54 -0700)]
lint
Sergio Guadarrama [Sat, 28 Jun 2014 17:37:40 +0000 (10:37 -0700)]
Merge pull request #502 from sguada/fix_dropout_backward
Fix dropout backward in TEST phase
Sergio [Sat, 28 Jun 2014 17:22:13 +0000 (10:22 -0700)]
Remove Cuda.major >= 2 check on Dropout test
Sergio [Thu, 19 Jun 2014 01:49:14 +0000 (18:49 -0700)]
Check that pointers are different before copying in caffe_copy and caffe_gpu_copy
Sergio [Sat, 14 Jun 2014 15:39:35 +0000 (08:39 -0700)]
Added test to Dropout to check gradients during Test phase
Sergio [Sat, 14 Jun 2014 01:54:28 +0000 (18:54 -0700)]
Fix var names in Dropout.cu
Sergio [Sat, 28 Jun 2014 01:54:08 +0000 (18:54 -0700)]
Modify Dropout to allow backward pass in TEST phase
Conflicts:
src/caffe/layers/dropout_layer.cpp
src/caffe/layers/dropout_layer.cu
James Thewlis [Fri, 27 Jun 2014 23:49:53 +0000 (00:49 +0100)]
Fix building tests with parallel make
The changes for .cu tests meant that creating
TEST_BUILD_DIR wasn't happening first
Evan Shelhamer [Fri, 27 Jun 2014 21:15:02 +0000 (14:15 -0700)]
Merge pull request #510 from crizCraig/patch-1
Add comment to Makefile.config.example about DEBUG flag issue in OSX
Evan Shelhamer [Fri, 27 Jun 2014 20:46:49 +0000 (13:46 -0700)]
Merge pull request #531 from flickr/dev-top-k-accuracy
Measure accuracy as top-k (default to top-1)
Rob Hess [Tue, 24 Jun 2014 00:22:43 +0000 (17:22 -0700)]
Comment-fix.
Rob Hess [Fri, 20 Jun 2014 21:39:58 +0000 (14:39 -0700)]
Update name of last added param.
Rob Hess [Fri, 20 Jun 2014 21:37:07 +0000 (14:37 -0700)]
Add unit test for accuracy layer.
cypof [Thu, 19 Jun 2014 22:52:10 +0000 (15:52 -0700)]
Next LayerParameter proto id
Rob Hess [Thu, 19 Jun 2014 22:12:56 +0000 (15:12 -0700)]
Use vectors instead of arrays.
Rob Hess [Mon, 16 Jun 2014 20:35:46 +0000 (13:35 -0700)]
Compute top-k accuracy in AccuracyLayer.
Rob Hess [Sat, 14 Jun 2014 02:07:38 +0000 (19:07 -0700)]
Incorporate top_k param into AccuracyLayer and check it's value.
Rob Hess [Sat, 14 Jun 2014 01:16:04 +0000 (18:16 -0700)]
Add parameter for AccuracyLayer in proto.
Evan Shelhamer [Fri, 27 Jun 2014 15:47:42 +0000 (08:47 -0700)]
add latest CUDA arch to fix invalid device function errors
...on devices of that architecture.
Evan Shelhamer [Fri, 27 Jun 2014 15:53:52 +0000 (08:53 -0700)]
Merge pull request #554 from shelhamer/nvcc-arch-50
Add latest CUDA arch to fix invalid device function errors on such devices
Evan Shelhamer [Fri, 27 Jun 2014 15:47:42 +0000 (08:47 -0700)]
add latest CUDA arch to fix invalid device function errors
...on devices of that architecture.
James Thewlis [Fri, 27 Jun 2014 09:49:08 +0000 (10:49 +0100)]
Make resizing & cropping with PIL work
Previously it was trying to use undefined variables