platform/upstream/caffe.git
10 years agogpu_hamming_distance fails unit test with fixed RNG; mark it NOT_IMPLEMENTED
Jeff Donahue [Tue, 8 Apr 2014 11:25:20 +0000 (04:25 -0700)]
gpu_hamming_distance fails unit test with fixed RNG; mark it NOT_IMPLEMENTED
with TODO to fix and disable its unit test

10 years agocleanup RNG unit tests
Jeff Donahue [Tue, 8 Apr 2014 10:54:27 +0000 (03:54 -0700)]
cleanup RNG unit tests

10 years agomake rng_ a private member of Generator
Jeff Donahue [Tue, 8 Apr 2014 04:16:00 +0000 (21:16 -0700)]
make rng_ a private member of Generator

10 years agocleanup test_math_functions
Jeff Donahue [Tue, 8 Apr 2014 02:05:59 +0000 (19:05 -0700)]
cleanup test_math_functions

10 years agocomment to explain the purpose of Caffe::set_generator
Jeff Donahue [Tue, 8 Apr 2014 02:08:27 +0000 (19:08 -0700)]
comment to explain the purpose of Caffe::set_generator

10 years agofix bernoulli*bernoulli test, now all pass
Jeff Donahue [Tue, 8 Apr 2014 00:58:11 +0000 (17:58 -0700)]
fix bernoulli*bernoulli test, now all pass

10 years agocall caffe_set_rng at the end of each vRng function to maintain state
Jeff Donahue [Tue, 8 Apr 2014 00:14:23 +0000 (17:14 -0700)]
call caffe_set_rng at the end of each vRng function to maintain state

10 years agoadd bernoulli*bernoulli test
Jeff Donahue [Mon, 7 Apr 2014 19:24:21 +0000 (12:24 -0700)]
add bernoulli*bernoulli test

10 years agocleanup log messages
Jeff Donahue [Mon, 7 Apr 2014 02:57:44 +0000 (19:57 -0700)]
cleanup log messages

10 years agoadd analogous test for uniform instead of gaussian
Jeff Donahue [Mon, 7 Apr 2014 02:41:14 +0000 (19:41 -0700)]
add analogous test for uniform instead of gaussian

10 years agoadd test demonstrating weird boost RNG issue when sampling from a
Jeff Donahue [Mon, 7 Apr 2014 01:55:58 +0000 (18:55 -0700)]
add test demonstrating weird boost RNG issue when sampling from a
gaussian followed by a bernoulli

10 years agoMerge pull request #305 from shelhamer/install-doc-blas-platform
Jeff Donahue [Wed, 9 Apr 2014 03:11:53 +0000 (20:11 -0700)]
Merge pull request #305 from shelhamer/install-doc-blas-platform

Document BLAS install, tailor Makefile and Makefile.config to platform

10 years agoMerge pull request #309 from shelhamer/comment-matlab-config
Jeff Donahue [Tue, 8 Apr 2014 23:57:13 +0000 (16:57 -0700)]
Merge pull request #309 from shelhamer/comment-matlab-config

Comment out MATLAB by default in Makefile.config

10 years agoComment out MATLAB by default in Makefile.config
Evan Shelhamer [Tue, 8 Apr 2014 23:42:03 +0000 (16:42 -0700)]
Comment out MATLAB by default in Makefile.config

Otherwise the Makefile tries to determine the MATLAB SO extension even
if MATLAB doesn't exist, breaking `make`.

10 years agoauto-configure linux/osx build differences
Evan Shelhamer [Tue, 8 Apr 2014 22:41:29 +0000 (15:41 -0700)]
auto-configure linux/osx build differences

- set cxx as needed (clang++ on os x)
- set stdlib flag for os x 10.9 (CUDA libc++ workaround)
- link ATLAS properly for non-MKL installation whether linux or os x

10 years agotrivial makefile grooming
Evan Shelhamer [Tue, 8 Apr 2014 22:25:04 +0000 (15:25 -0700)]
trivial makefile grooming

10 years agoMerge pull request #273 from jeffdonahue/lrn-map-layer
Jeff Donahue [Tue, 8 Apr 2014 18:52:37 +0000 (11:52 -0700)]
Merge pull request #273 from jeffdonahue/lrn-map-layer

Within-channel LRN layer

10 years agoupdate proto field IDs from placeholder values
Jeff Donahue [Tue, 8 Apr 2014 18:46:49 +0000 (11:46 -0700)]
update proto field IDs from placeholder values

10 years agocleanup power layer test suite
Jeff Donahue [Sat, 29 Mar 2014 20:46:20 +0000 (13:46 -0700)]
cleanup power layer test suite

10 years agominor unit test cleanup
Jeff Donahue [Sat, 29 Mar 2014 20:21:36 +0000 (13:21 -0700)]
minor unit test cleanup

10 years agocleanup extra LRN method names
Jeff Donahue [Sat, 29 Mar 2014 20:12:12 +0000 (13:12 -0700)]
cleanup extra LRN method names

10 years agodon't recompute pre_pad
Jeff Donahue [Sat, 29 Mar 2014 19:31:49 +0000 (12:31 -0700)]
don't recompute pre_pad

10 years agoremove unnecessary local variables from EltwiseProductLayer
Jeff Donahue [Sat, 29 Mar 2014 19:23:03 +0000 (12:23 -0700)]
remove unnecessary local variables from EltwiseProductLayer

10 years agominor polishing
Jeff Donahue [Sat, 29 Mar 2014 19:01:11 +0000 (12:01 -0700)]
minor polishing

10 years agoreplace old cifar full with within channel LRN (per cuda-convnet
Jeff Donahue [Sat, 29 Mar 2014 11:26:35 +0000 (04:26 -0700)]
replace old cifar full with within channel LRN (per cuda-convnet
layers-18pct) -- slightly slower (5000 iters now takes 6:57; took 6:43
previously), but slightly more accurate (exactly 82% test accuracy; got
81.65% before)

10 years agomerge LRNMapLayer into LRNLayer with norm_region proto field
Jeff Donahue [Sat, 29 Mar 2014 10:36:28 +0000 (03:36 -0700)]
merge LRNMapLayer into LRNLayer with norm_region proto field

10 years agofix some param bugs
Jeff Donahue [Sat, 29 Mar 2014 09:13:34 +0000 (02:13 -0700)]
fix some param bugs

10 years agoadd cifar example using LRN_MAP (just like the cuda-convnet layers-18pct
Jeff Donahue [Sat, 29 Mar 2014 07:51:49 +0000 (00:51 -0700)]
add cifar example using LRN_MAP (just like the cuda-convnet layers-18pct
architecture) instead of LRN

10 years agouse bvlc copyright
Jeff Donahue [Sat, 29 Mar 2014 05:55:12 +0000 (22:55 -0700)]
use bvlc copyright

10 years agouse split layer in LRNMapLayer
Jeff Donahue [Sat, 29 Mar 2014 04:25:15 +0000 (21:25 -0700)]
use split layer in LRNMapLayer

10 years agobug fix: average pooling already divides by N^2
Jeff Donahue [Sat, 29 Mar 2014 03:20:47 +0000 (20:20 -0700)]
bug fix: average pooling already divides by N^2

10 years agoadd padding for average pooling
Jeff Donahue [Sat, 29 Mar 2014 03:18:06 +0000 (20:18 -0700)]
add padding for average pooling

10 years agouse average pool instead of conv
Jeff Donahue [Fri, 28 Mar 2014 23:29:21 +0000 (16:29 -0700)]
use average pool instead of conv

10 years agoadd unit tests for new layer types
Jeff Donahue [Fri, 28 Mar 2014 22:39:33 +0000 (15:39 -0700)]
add unit tests for new layer types

10 years agoadd LRN within map layer and dependencies (eltwise product and power)
Jeff Donahue [Fri, 28 Mar 2014 22:04:36 +0000 (15:04 -0700)]
add LRN within map layer and dependencies (eltwise product and power)

10 years agoblas install docs, other install polish
Evan Shelhamer [Tue, 8 Apr 2014 04:57:27 +0000 (21:57 -0700)]
blas install docs, other install polish

10 years agoBack-merge documentation and fixes
Evan Shelhamer [Tue, 8 Apr 2014 05:13:13 +0000 (22:13 -0700)]
Back-merge documentation and fixes

format installation docs, add links
Add hdf5 requirements to 10.9 notes, drop cmake (not linked)
fix im2col height/width bound check bug (issue #284 identified by @kmatzen)
strip confusing confusing comment about shuffling files
add /etc/rc.local hint for boot configuration of gpus
Include k40 images per day benchmark
drop caffe presentation in favor of dropbox link
make build_docs.sh script work from anywhere
proofread, fix dead link, standardize NVIDIA capitalization
Added Link in index.md to perfomance_hardware.md
Added Performance and Hardware Tips
imagenet fix: ilvsrc -> ilsvrc

10 years agoformat installation docs, add links
Evan Shelhamer [Tue, 8 Apr 2014 05:07:18 +0000 (22:07 -0700)]
format installation docs, add links

10 years agoAdd hdf5 requirements to 10.9 notes, drop cmake (not linked)
Evan Shelhamer [Tue, 8 Apr 2014 02:31:07 +0000 (19:31 -0700)]
Add hdf5 requirements to 10.9 notes, drop cmake (not linked)

10 years agofix im2col height/width bound check bug (issue #284 identified by
Jeff Donahue [Mon, 7 Apr 2014 06:53:02 +0000 (23:53 -0700)]
fix im2col height/width bound check bug (issue #284 identified by
@kmatzen)

10 years agoMerge pull request #298 from jeffdonahue/im2col-nonsquare-bug
Evan Shelhamer [Tue, 8 Apr 2014 01:44:40 +0000 (18:44 -0700)]
Merge pull request #298 from jeffdonahue/im2col-nonsquare-bug

Fix im2col nonsquare bug (#284)

10 years agoMerge pull request #302 from sguada/protobuf_limit
Evan Shelhamer [Tue, 8 Apr 2014 01:34:59 +0000 (18:34 -0700)]
Merge pull request #302 from sguada/protobuf_limit

Double protobuf size limit

10 years agoDoubled protobuf Bytes Limit
Sergio Guadarrama [Tue, 8 Apr 2014 00:36:27 +0000 (17:36 -0700)]
Doubled protobuf Bytes Limit

10 years agofix im2col height/width bound check bug (issue #284 identified by
Jeff Donahue [Mon, 7 Apr 2014 06:53:02 +0000 (23:53 -0700)]
fix im2col height/width bound check bug (issue #284 identified by
@kmatzen)

10 years agoseparate CPU from GPU ConvolutionLayerTests
Jeff Donahue [Mon, 7 Apr 2014 06:50:43 +0000 (23:50 -0700)]
separate CPU from GPU ConvolutionLayerTests

10 years agomake height/width of input dims in conv layer tests more different to
Jeff Donahue [Mon, 7 Apr 2014 06:46:25 +0000 (23:46 -0700)]
make height/width of input dims in conv layer tests more different to
expose bug (GPU tests now fail due to the bug)

10 years agostrip confusing confusing comment about shuffling files
Evan Shelhamer [Sat, 5 Apr 2014 05:32:44 +0000 (22:32 -0700)]
strip confusing confusing comment about shuffling files

10 years agoRevert "Fix segfault." (python)
Evan Shelhamer [Sat, 5 Apr 2014 05:10:47 +0000 (22:10 -0700)]
Revert "Fix segfault." (python)

Revert 88507032de1eb675539d91a1d79c221f3faf5d99 from #287.

The call to `Py_Initialize()` is unnecessary and masked a build
configuration issue.

10 years agoMerge pull request #277 from jeffdonahue/makefile-improvements
Evan Shelhamer [Fri, 4 Apr 2014 22:25:38 +0000 (15:25 -0700)]
Merge pull request #277 from jeffdonahue/makefile-improvements

Makefile improvements

10 years agogitignore python/caffe/proto/; superclean ignore data dir
Jeff Donahue [Fri, 4 Apr 2014 20:44:34 +0000 (13:44 -0700)]
gitignore python/caffe/proto/; superclean ignore data dir

10 years agoadd /etc/rc.local hint for boot configuration of gpus
Evan Shelhamer [Fri, 4 Apr 2014 17:22:24 +0000 (10:22 -0700)]
add /etc/rc.local hint for boot configuration of gpus

10 years agoMerge pull request #287 from robwhess/dev
Evan Shelhamer [Fri, 4 Apr 2014 03:55:49 +0000 (20:55 -0700)]
Merge pull request #287 from robwhess/dev

Fix python segfault in Mac OS X.

10 years agoMerge pull request #288 from beam2d/fix-blob-params-order
Jeff Donahue [Thu, 3 Apr 2014 14:44:43 +0000 (07:44 -0700)]
Merge pull request #288 from beam2d/fix-blob-params-order

Fix parameter orders in declaration of Reshape

10 years agoFix parameter orders in declaration of Reshape
Seiya Tokui [Thu, 3 Apr 2014 07:56:38 +0000 (16:56 +0900)]
Fix parameter orders in declaration of Reshape

10 years agoInclude k40 images per day benchmark
Evan Shelhamer [Thu, 3 Apr 2014 01:48:45 +0000 (18:48 -0700)]
Include k40 images per day benchmark

10 years agodrop caffe presentation in favor of dropbox link
Evan Shelhamer [Thu, 3 Apr 2014 01:40:37 +0000 (18:40 -0700)]
drop caffe presentation in favor of dropbox link

10 years agomake build_docs.sh script work from anywhere
Evan Shelhamer [Thu, 3 Apr 2014 01:38:20 +0000 (18:38 -0700)]
make build_docs.sh script work from anywhere

10 years agoproofread, fix dead link, standardize NVIDIA capitalization
Evan Shelhamer [Thu, 3 Apr 2014 01:12:41 +0000 (18:12 -0700)]
proofread, fix dead link, standardize NVIDIA capitalization

Thanks NVIDIA for the GPUs!

10 years agoFix segfault.
Rob Hess [Thu, 3 Apr 2014 00:50:18 +0000 (17:50 -0700)]
Fix segfault.

10 years agoAdded Link in index.md to perfomance_hardware.md
Sergio Guadarrama [Thu, 3 Apr 2014 00:03:25 +0000 (17:03 -0700)]
Added Link in index.md to perfomance_hardware.md

10 years agoAdded Performance and Hardware Tips
Sergio Guadarrama [Wed, 2 Apr 2014 23:59:45 +0000 (16:59 -0700)]
Added Performance and Hardware Tips

10 years agoinclude build/ before other dirs so old proto built files in src/ and
Jeff Donahue [Wed, 2 Apr 2014 18:29:01 +0000 (11:29 -0700)]
include build/ before other dirs so old proto built files in src/ and
include/ don't interfere

10 years agoremove silly thing where I copied proto headers to a separate
Jeff Donahue [Mon, 31 Mar 2014 21:25:42 +0000 (14:25 -0700)]
remove silly thing where I copied proto headers to a separate
build/include dir

10 years agomatcaffe fixes
Jeff Donahue [Mon, 31 Mar 2014 21:16:11 +0000 (14:16 -0700)]
matcaffe fixes

10 years agofix test bugs and minor cleanup
Jeff Donahue [Sun, 30 Mar 2014 14:21:00 +0000 (07:21 -0700)]
fix test bugs and minor cleanup

10 years agocleanup python build and clean
Jeff Donahue [Sun, 30 Mar 2014 13:58:17 +0000 (06:58 -0700)]
cleanup python build and clean

10 years agocompile test bins directly into build/test
Jeff Donahue [Sun, 30 Mar 2014 13:21:38 +0000 (06:21 -0700)]
compile test bins directly into build/test

10 years agoadd test header dependency and fix mat targets
Jeff Donahue [Sun, 30 Mar 2014 12:22:52 +0000 (05:22 -0700)]
add test header dependency and fix mat targets

10 years agominor cleanup
Jeff Donahue [Sun, 30 Mar 2014 11:44:17 +0000 (04:44 -0700)]
minor cleanup

10 years agolibcaffe.* in build/lib/
Jeff Donahue [Sun, 30 Mar 2014 11:42:43 +0000 (04:42 -0700)]
libcaffe.* in build/lib/

10 years agoeverything prints a blank line after compiling
Jeff Donahue [Sun, 30 Mar 2014 11:36:22 +0000 (04:36 -0700)]
everything prints a blank line after compiling

10 years agolots of corrections to dependencies etc., things seem to mostly build
Jeff Donahue [Sun, 30 Mar 2014 11:14:48 +0000 (04:14 -0700)]
lots of corrections to dependencies etc., things seem to mostly build
coherently now

10 years agomessed around with Makefile - currently in very messy state
Jeff Donahue [Sun, 30 Mar 2014 05:26:46 +0000 (22:26 -0700)]
messed around with Makefile - currently in very messy state

10 years agocleanup superclean output
Jeff Donahue [Sun, 30 Mar 2014 03:12:24 +0000 (20:12 -0700)]
cleanup superclean output

10 years agoput proto-generated .cc and .h files in build directory
Jeff Donahue [Sun, 30 Mar 2014 02:36:05 +0000 (19:36 -0700)]
put proto-generated .cc and .h files in build directory

10 years agocreate softlink to test directory at build/test
Jeff Donahue [Sun, 30 Mar 2014 01:29:15 +0000 (18:29 -0700)]
create softlink to test directory at build/test

10 years agocreate superclean Makefile target to delete all files with generated
Jeff Donahue [Sun, 30 Mar 2014 00:47:58 +0000 (17:47 -0700)]
create superclean Makefile target to delete all files with generated
extensions

10 years agoput TEST_GPUID in Makefile.config
Jeff Donahue [Sun, 30 Mar 2014 00:46:39 +0000 (17:46 -0700)]
put TEST_GPUID in Makefile.config

10 years agoMerge pull request #223 from sguada/improved_matcaffe
Jeff Donahue [Wed, 2 Apr 2014 17:50:59 +0000 (10:50 -0700)]
Merge pull request #223 from sguada/improved_matcaffe

Improved matcaffe

10 years agoMerge pull request #278 from kloudkl/log_error_string_in_check_macro
Jeff Donahue [Wed, 2 Apr 2014 17:39:10 +0000 (10:39 -0700)]
Merge pull request #278 from kloudkl/log_error_string_in_check_macro

Log error strings in the error/status checking macros

10 years agoMerge pull request #283 from jeffdonahue/boost-rand-seed
Evan Shelhamer [Wed, 2 Apr 2014 00:28:41 +0000 (17:28 -0700)]
Merge pull request #283 from jeffdonahue/boost-rand-seed

Seed Boost RNG with cluster_seedgen by default

10 years agoseed boost rng with cluster_seedgen by default
Jeff Donahue [Tue, 1 Apr 2014 23:49:34 +0000 (16:49 -0700)]
seed boost rng with cluster_seedgen by default

10 years agoAdd a space before the error string
Kai Li [Tue, 1 Apr 2014 02:30:40 +0000 (10:30 +0800)]
Add a space before the error string

10 years agoFix cpplint errors
Kai Li [Mon, 31 Mar 2014 14:38:16 +0000 (22:38 +0800)]
Fix cpplint errors

10 years agoAdd curandGetErrorString and use it to redefine CURAND_CHECK
Kai Li [Mon, 31 Mar 2014 14:29:36 +0000 (22:29 +0800)]
Add curandGetErrorString and use it to redefine CURAND_CHECK

10 years agoAdd caffe::cublasGetErrorString and redefine CUBLAS_CHECK with it
Kai Li [Mon, 31 Mar 2014 14:23:22 +0000 (22:23 +0800)]
Add caffe::cublasGetErrorString and redefine CUBLAS_CHECK with it

10 years agoDefine CUDA_POST_KERNEL_CHECK with CUDA_CHECK
Kai Li [Mon, 31 Mar 2014 14:07:22 +0000 (22:07 +0800)]
Define CUDA_POST_KERNEL_CHECK with CUDA_CHECK

10 years agoLog error string rather than enum value in CUDA_CHECK
Kai Li [Mon, 31 Mar 2014 13:56:05 +0000 (21:56 +0800)]
Log error string rather than enum value in CUDA_CHECK

10 years agoRemoved empty space, verified lint
Sergio Guadarrama [Mon, 31 Mar 2014 22:57:48 +0000 (15:57 -0700)]
Removed empty space, verified lint

10 years agoAdded default values to matcaffe_batch for testing
Sergio Guadarrama [Mon, 31 Mar 2014 22:55:33 +0000 (15:55 -0700)]
Added default values to matcaffe_batch for testing

10 years agoAdded matcaffe_init to easy reuse of caffe initialization
Sergio Guadarrama [Mon, 31 Mar 2014 22:47:36 +0000 (15:47 -0700)]
Added matcaffe_init to easy reuse of caffe initialization

10 years agoRemoved fillers from imagenet_deploy
Sergio Guadarrama [Mon, 31 Mar 2014 21:45:29 +0000 (14:45 -0700)]
Removed fillers from imagenet_deploy

10 years agoCreated reset command and changed END to NULL again
Sergio Guadarrama [Mon, 17 Mar 2014 19:44:58 +0000 (12:44 -0700)]
Created reset command and changed END to NULL again

10 years agoAdded prints to matcaffe_demo stages
sguada [Thu, 27 Feb 2014 21:40:31 +0000 (13:40 -0800)]
Added prints to matcaffe_demo stages

10 years agoCleaned matcaffe.cpp to pass lint
Sergio Guadarrama [Mon, 31 Mar 2014 21:42:24 +0000 (14:42 -0700)]
Cleaned matcaffe.cpp to pass lint

10 years agoChanged matcaffe_demo to return maxlabel
Sergio Guadarrama [Mon, 31 Mar 2014 21:40:38 +0000 (14:40 -0700)]
Changed matcaffe_demo to return maxlabel

10 years agoChanged Copyright to BVLC
Sergio Guadarrama [Mon, 31 Mar 2014 21:39:16 +0000 (14:39 -0700)]
Changed Copyright to BVLC

10 years agoResolved merge conflicts
Sergio Guadarrama [Mon, 31 Mar 2014 21:37:58 +0000 (14:37 -0700)]
Resolved merge conflicts

10 years agoMerge pull request #275 from kloudkl/fix_kernel_for_loop_in_macro
Jeff Donahue [Sat, 29 Mar 2014 20:46:04 +0000 (13:46 -0700)]
Merge pull request #275 from kloudkl/fix_kernel_for_loop_in_macro

Fix kernel for loop in macro

10 years agoUse CUDA_KERNEL_LOOP in the macro DEFINE_AND_INSTANTIATE_GPU_UNARY_FUNC
Kai Li [Sat, 29 Mar 2014 20:37:53 +0000 (04:37 +0800)]
Use CUDA_KERNEL_LOOP in the macro DEFINE_AND_INSTANTIATE_GPU_UNARY_FUNC