Evan Shelhamer [Thu, 24 Apr 2014 16:37:43 +0000 (09:37 -0700)]
Merge pull request #352 from jeffdonahue/solver-seed
Eliminate use of "rand" in code; enable deterministic results via solver seed
Evan Shelhamer [Thu, 24 Apr 2014 16:35:13 +0000 (09:35 -0700)]
Merge pull request #357 from jeffdonahue/test-on-iter-0
Test before doing any training
Jeff Donahue [Thu, 24 Apr 2014 09:05:32 +0000 (02:05 -0700)]
test on "0th iteration" -- before doing any training
Jeff Donahue [Wed, 23 Apr 2014 01:00:22 +0000 (18:00 -0700)]
add caffe/random_fn lint rule to check for use of rand, rand_r, random
Jeff Donahue [Tue, 22 Apr 2014 23:32:40 +0000 (16:32 -0700)]
replace std::shuffle with version using prefetch rng; improve unit test
Jeff Donahue [Tue, 22 Apr 2014 21:12:36 +0000 (14:12 -0700)]
replace remaining uses of rand() with caffe_rng_rand()
Jeff Donahue [Tue, 22 Apr 2014 21:09:37 +0000 (14:09 -0700)]
prefetch_rng in window_data_layer
Jeff Donahue [Tue, 22 Apr 2014 20:56:02 +0000 (13:56 -0700)]
prefetch_rng in ImageDataLayer
Jeff Donahue [Tue, 22 Apr 2014 20:17:05 +0000 (13:17 -0700)]
test scale param
Jeff Donahue [Tue, 22 Apr 2014 20:08:26 +0000 (13:08 -0700)]
make seed test pass by setting up new layer to generate the 2nd sequence
Jeff Donahue [Tue, 22 Apr 2014 19:41:02 +0000 (12:41 -0700)]
cleanup data_layer, add prefetch_rng_ field to it and use instead of
rand -- seeded tests still fail
Jeff Donahue [Tue, 22 Apr 2014 18:34:40 +0000 (11:34 -0700)]
add tests for random crop sequence -- currently both fail
Jeff Donahue [Tue, 22 Apr 2014 11:42:47 +0000 (04:42 -0700)]
add data layer crop tests
Jeff Donahue [Thu, 17 Apr 2014 04:00:30 +0000 (21:00 -0700)]
add random_seed field to SolverParameter and have solver use it --
already works for lenet, doesn't work for imagenet w/ rand() calls
Jeff Donahue [Wed, 23 Apr 2014 06:12:14 +0000 (23:12 -0700)]
add forward tests (via reference impl) for SigmoidCrossEntropyLayer
Evan Shelhamer [Tue, 22 Apr 2014 22:49:20 +0000 (15:49 -0700)]
Merge pull request #350 from longjon/finicky-exhaustive
Make CheckGradientExhaustive fail for topless layers
Jonathan L Long [Tue, 22 Apr 2014 06:41:50 +0000 (23:41 -0700)]
make CheckGradientExhaustive fail for topless layers
Without this commit, it is possible to mistakenly call
CheckGradientExhaustive on a layer with no top blobs (i.e., a loss
layer), causing the gradient check to silently succeed while doing
nothing. With this commit, doing so will cause the test to fail.
Evan Shelhamer [Tue, 22 Apr 2014 05:20:36 +0000 (22:20 -0700)]
Merge pull request #348 from jeffdonahue/datalayer-singleton-bugfix
Fix singleton call in data layers
Note previous crash reports were not in fact due to RNG, although they led to improvements of the RNG code.
Jeff Donahue [Tue, 22 Apr 2014 03:43:39 +0000 (20:43 -0700)]
do the same as prev commit for ImageDataLayer
Jeff Donahue [Tue, 22 Apr 2014 03:35:43 +0000 (20:35 -0700)]
fix bug where DataLayerPrefetch creates its own Caffe singleton, causing
the phase to always be set to TRAIN (always random crops) and RNG failures
Evan Shelhamer [Mon, 21 Apr 2014 03:12:57 +0000 (20:12 -0700)]
Comment current forward/backward responsibilities
Evan Shelhamer [Mon, 21 Apr 2014 03:07:06 +0000 (20:07 -0700)]
Proofread install docs
Evan Shelhamer [Sun, 20 Apr 2014 23:57:56 +0000 (16:57 -0700)]
Merge pull request #339 from sergeyk/dev
Update installation docs
Sergey Karayev [Sun, 20 Apr 2014 20:38:30 +0000 (13:38 -0700)]
installation doc update
Evan Shelhamer [Sat, 19 Apr 2014 06:18:59 +0000 (23:18 -0700)]
Merge pull request #336 from jeffdonahue/fix-rng-segfault
Fix RNG segfault related to #297
Evan Shelhamer [Fri, 18 Apr 2014 18:51:41 +0000 (11:51 -0700)]
fix examples path in mnist leveldb sh
Jeff Donahue [Fri, 18 Apr 2014 18:11:01 +0000 (11:11 -0700)]
Merge pull request #332 from jeffdonahue/share-trained-layers
add ShareTrainedLayersWith method and use for test net in solver
Jeff Donahue [Fri, 18 Apr 2014 17:51:30 +0000 (10:51 -0700)]
remove now unused set_generator and related code
Jeff Donahue [Fri, 18 Apr 2014 17:36:28 +0000 (10:36 -0700)]
pass caffe rng ref into variate_generator constructor instead of having
caffe rng adopt its state
Jeff Donahue [Fri, 18 Apr 2014 01:23:33 +0000 (18:23 -0700)]
remove unnecessary return from void set_generator
Jeff Donahue [Wed, 16 Apr 2014 17:01:30 +0000 (10:01 -0700)]
add ShareTrainedLayersWith method and use for test net in solver
Evan Shelhamer [Wed, 16 Apr 2014 15:46:49 +0000 (09:46 -0600)]
Merge pull request #330 from jeffdonahue/mnist-autoencoder-example
MNIST autoencoder example
Jeff Donahue [Wed, 16 Apr 2014 15:14:27 +0000 (08:14 -0700)]
change to correct next layer id for merge
Jeff Donahue [Wed, 16 Apr 2014 15:13:20 +0000 (08:13 -0700)]
clear sigmoid top vec at initialization
Jeff Donahue [Wed, 16 Apr 2014 05:46:45 +0000 (22:46 -0700)]
add sigmoid cross ent layer unit tests
Jeff Donahue [Wed, 16 Apr 2014 05:26:11 +0000 (22:26 -0700)]
mnist_autoencoder_solver cleanup
Jeff Donahue [Wed, 16 Apr 2014 05:25:46 +0000 (22:25 -0700)]
change lenet dir to 'mnist' in docs
Jeff Donahue [Tue, 15 Apr 2014 22:38:57 +0000 (15:38 -0700)]
make solver able to compute and display test loss
Jeff Donahue [Tue, 15 Apr 2014 22:38:06 +0000 (15:38 -0700)]
mnist autoencoder test proto bugfix: add sigmoid layer before loss
Jeff Donahue [Tue, 15 Apr 2014 22:12:57 +0000 (15:12 -0700)]
enable DataLayer to output unlabeled data
Jeff Donahue [Tue, 15 Apr 2014 21:52:41 +0000 (14:52 -0700)]
add mnist autoencoder example necessities (sigmoid cross entropy loss
layer, sparse gaussian filler)
Jeff Donahue [Tue, 15 Apr 2014 17:56:32 +0000 (10:56 -0700)]
rename lenet dir to mnist
Evan Shelhamer [Tue, 15 Apr 2014 07:37:06 +0000 (01:37 -0600)]
Give choice of ATLAS, MKL, and OpenBLAS (with option to override paths)
- configure build for ATLAS, MKL, or OpenBLAS on Linux and OSX
- allow overriding of the include or lib dirs
- replace magic numbers with BLAS names (atlas, mkl, open)
Follow-up from #305 and #325.
Evan Shelhamer [Tue, 15 Apr 2014 07:36:18 +0000 (01:36 -0600)]
rename python include config var to match lib
Evan Shelhamer [Tue, 15 Apr 2014 07:47:57 +0000 (01:47 -0600)]
Merge pull request #325 from AlOa/OpenBlas
Add possibility to use OpenBlas
AlOa [Mon, 14 Apr 2014 14:12:12 +0000 (16:12 +0200)]
Add possibility to use OpenBlas
Evan Shelhamer [Sun, 13 Apr 2014 01:40:08 +0000 (18:40 -0700)]
Merge pull request #318 from jeffdonahue/blob-copy-by-reference
add Share{Data,Diff} methods to blobs to enable "virtual" copies
- reduce operations by not copying values
- spare memory by shared_ptrs
- simplify SplitLayer logic
Evan Shelhamer [Sun, 13 Apr 2014 01:26:30 +0000 (18:26 -0700)]
Merge pull request #319 from jeffdonahue/sigmoid-optimization
sigmoid layer backward pass optimization: don't recompute forward pass
Jeff Donahue [Sat, 12 Apr 2014 11:16:23 +0000 (04:16 -0700)]
sigmoid layer backward pass optimization: don't recompute forward pass
Jeff Donahue [Sat, 12 Apr 2014 07:52:15 +0000 (00:52 -0700)]
change Adopt -> Share as suggested by kloudkl
Jeff Donahue [Sat, 12 Apr 2014 01:07:08 +0000 (18:07 -0700)]
add Adopt{Data,Diff} methods to blobs to enable "virtual copying"
Jeff Donahue [Fri, 11 Apr 2014 23:07:43 +0000 (16:07 -0700)]
add unit tests for cpu/gpu copy functions
Jeff Donahue [Sat, 12 Apr 2014 06:47:40 +0000 (23:47 -0700)]
change some unnecessary TYPED_TESTs to TEST_Fs
Jeff Donahue [Fri, 11 Apr 2014 23:10:15 +0000 (16:10 -0700)]
fix lint errors by adding 'explicit' to new single arg pycaffe
constructors
Evan Shelhamer [Fri, 11 Apr 2014 05:49:50 +0000 (22:49 -0700)]
polished ignore
Evan Shelhamer [Thu, 10 Apr 2014 00:11:49 +0000 (17:11 -0700)]
Back-merge docs and example image changes from `master` to `dev`
Evan Shelhamer [Wed, 9 Apr 2014 22:54:40 +0000 (15:54 -0700)]
Merge pull request #310 from jeffdonahue/clang-test-power-layer-fixes
clang fixes for test_power_layer
Jeff Donahue [Wed, 9 Apr 2014 22:45:37 +0000 (15:45 -0700)]
add using std::isnan and use this-> when calling Test{For,Back}ward
Evan Shelhamer [Wed, 9 Apr 2014 22:44:07 +0000 (15:44 -0700)]
fix osx 10.9 condition in Makefile
Evan Shelhamer [Wed, 9 Apr 2014 21:33:31 +0000 (14:33 -0700)]
include vecLib BLAS dir on osx
Evan Shelhamer [Wed, 9 Apr 2014 20:31:18 +0000 (13:31 -0700)]
Merge pull request #286 from longjon/pycaffe-solver
Expose SGDSolver to pycaffe, switch from inheritance to overriding for caffe.Net
Jeff Donahue [Wed, 9 Apr 2014 18:11:04 +0000 (11:11 -0700)]
change true_std to intended bernoulli_std
Evan Shelhamer [Wed, 9 Apr 2014 18:04:12 +0000 (11:04 -0700)]
Merge pull request #297 from jeffdonahue/rng-bug
Fix persistence of random state with Boost RNG
Jeff Donahue [Wed, 9 Apr 2014 02:45:31 +0000 (19:45 -0700)]
more rng test cleanup
Evan Shelhamer [Wed, 9 Apr 2014 04:52:08 +0000 (21:52 -0700)]
re-time imagenet example on k20, instead of my laptop
Jeff Donahue [Wed, 9 Apr 2014 00:15:28 +0000 (17:15 -0700)]
change *Plus* tests to *Times* tests because the Plus tests don't
actually check for uncorrelated RNG results
Jeff Donahue [Tue, 8 Apr 2014 23:24:50 +0000 (16:24 -0700)]
add analogous caffe_gpu_rng_* functions for gaussian and uniform, and
add test cases
Jeff Donahue [Tue, 8 Apr 2014 21:24:48 +0000 (14:24 -0700)]
have rng_stream initialize RNG if not already initialized
Jeff Donahue [Tue, 8 Apr 2014 20:18:29 +0000 (13:18 -0700)]
make RNG function outputs the last argument per Google C++ style guidelines
Jeff Donahue [Tue, 8 Apr 2014 18:57:25 +0000 (11:57 -0700)]
make RNG function names more similar to other caffe math function names
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
Jeff Donahue [Tue, 8 Apr 2014 10:54:27 +0000 (03:54 -0700)]
cleanup RNG unit tests
Jeff Donahue [Tue, 8 Apr 2014 04:16:00 +0000 (21:16 -0700)]
make rng_ a private member of Generator
Jeff Donahue [Tue, 8 Apr 2014 02:05:59 +0000 (19:05 -0700)]
cleanup test_math_functions
Jeff Donahue [Tue, 8 Apr 2014 02:08:27 +0000 (19:08 -0700)]
comment to explain the purpose of Caffe::set_generator
Jeff Donahue [Tue, 8 Apr 2014 00:58:11 +0000 (17:58 -0700)]
fix bernoulli*bernoulli test, now all pass
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
Jeff Donahue [Mon, 7 Apr 2014 19:24:21 +0000 (12:24 -0700)]
add bernoulli*bernoulli test
Jeff Donahue [Mon, 7 Apr 2014 02:57:44 +0000 (19:57 -0700)]
cleanup log messages
Jeff Donahue [Mon, 7 Apr 2014 02:41:14 +0000 (19:41 -0700)]
add analogous test for uniform instead of gaussian
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
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
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
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`.
Evan Shelhamer [Tue, 8 Apr 2014 23:27:49 +0000 (16:27 -0700)]
rename doc deploy script for better tab completion
Evan Shelhamer [Tue, 8 Apr 2014 23:23:33 +0000 (16:23 -0700)]
Drop Lena image in favor of a cute cat photo
Social progress.
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
Evan Shelhamer [Tue, 8 Apr 2014 22:25:04 +0000 (15:25 -0700)]
trivial makefile grooming
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
Jeff Donahue [Tue, 8 Apr 2014 18:46:49 +0000 (11:46 -0700)]
update proto field IDs from placeholder values
Jeff Donahue [Sat, 29 Mar 2014 20:46:20 +0000 (13:46 -0700)]
cleanup power layer test suite
Jeff Donahue [Sat, 29 Mar 2014 20:21:36 +0000 (13:21 -0700)]
minor unit test cleanup
Jeff Donahue [Sat, 29 Mar 2014 20:12:12 +0000 (13:12 -0700)]
cleanup extra LRN method names
Jeff Donahue [Sat, 29 Mar 2014 19:31:49 +0000 (12:31 -0700)]
don't recompute pre_pad
Jeff Donahue [Sat, 29 Mar 2014 19:23:03 +0000 (12:23 -0700)]
remove unnecessary local variables from EltwiseProductLayer
Jeff Donahue [Sat, 29 Mar 2014 19:01:11 +0000 (12:01 -0700)]
minor polishing
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)
Jeff Donahue [Sat, 29 Mar 2014 10:36:28 +0000 (03:36 -0700)]
merge LRNMapLayer into LRNLayer with norm_region proto field
Jeff Donahue [Sat, 29 Mar 2014 09:13:34 +0000 (02:13 -0700)]
fix some param bugs
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