platform/upstream/caffe.git
10 years agofix examples path in mnist leveldb sh
Evan Shelhamer [Fri, 18 Apr 2014 18:51:41 +0000 (11:51 -0700)]
fix examples path in mnist leveldb sh

10 years agoMerge pull request #332 from jeffdonahue/share-trained-layers
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

10 years agoadd ShareTrainedLayersWith method and use for test net in solver
Jeff Donahue [Wed, 16 Apr 2014 17:01:30 +0000 (10:01 -0700)]
add ShareTrainedLayersWith method and use for test net in solver

10 years agoMerge pull request #330 from jeffdonahue/mnist-autoencoder-example
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

10 years agochange to correct next layer id for merge
Jeff Donahue [Wed, 16 Apr 2014 15:14:27 +0000 (08:14 -0700)]
change to correct next layer id for merge

10 years agoclear sigmoid top vec at initialization
Jeff Donahue [Wed, 16 Apr 2014 15:13:20 +0000 (08:13 -0700)]
clear sigmoid top vec at initialization

10 years agoadd sigmoid cross ent layer unit tests
Jeff Donahue [Wed, 16 Apr 2014 05:46:45 +0000 (22:46 -0700)]
add sigmoid cross ent layer unit tests

10 years agomnist_autoencoder_solver cleanup
Jeff Donahue [Wed, 16 Apr 2014 05:26:11 +0000 (22:26 -0700)]
mnist_autoencoder_solver cleanup

10 years agochange lenet dir to 'mnist' in docs
Jeff Donahue [Wed, 16 Apr 2014 05:25:46 +0000 (22:25 -0700)]
change lenet dir to 'mnist' in docs

10 years agomake solver able to compute and display test loss
Jeff Donahue [Tue, 15 Apr 2014 22:38:57 +0000 (15:38 -0700)]
make solver able to compute and display test loss

10 years agomnist autoencoder test proto bugfix: add sigmoid layer before loss
Jeff Donahue [Tue, 15 Apr 2014 22:38:06 +0000 (15:38 -0700)]
mnist autoencoder test proto bugfix: add sigmoid layer before loss

10 years agoenable DataLayer to output unlabeled data
Jeff Donahue [Tue, 15 Apr 2014 22:12:57 +0000 (15:12 -0700)]
enable DataLayer to output unlabeled data

10 years agoadd mnist autoencoder example necessities (sigmoid cross entropy loss
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)

10 years agorename lenet dir to mnist
Jeff Donahue [Tue, 15 Apr 2014 17:56:32 +0000 (10:56 -0700)]
rename lenet dir to mnist

10 years agoGive choice of ATLAS, MKL, and OpenBLAS (with option to override paths)
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.

10 years agorename python include config var to match lib
Evan Shelhamer [Tue, 15 Apr 2014 07:36:18 +0000 (01:36 -0600)]
rename python include config var to match lib

10 years agoMerge pull request #325 from AlOa/OpenBlas
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

10 years agoAdd possibility to use OpenBlas
AlOa [Mon, 14 Apr 2014 14:12:12 +0000 (16:12 +0200)]
Add possibility to use OpenBlas

10 years agoMerge pull request #318 from jeffdonahue/blob-copy-by-reference
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

10 years agoMerge pull request #319 from jeffdonahue/sigmoid-optimization
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

10 years agosigmoid 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

10 years agochange Adopt -> Share as suggested by kloudkl
Jeff Donahue [Sat, 12 Apr 2014 07:52:15 +0000 (00:52 -0700)]
change Adopt -> Share as suggested by kloudkl

10 years agoadd Adopt{Data,Diff} methods to blobs to enable "virtual copying"
Jeff Donahue [Sat, 12 Apr 2014 01:07:08 +0000 (18:07 -0700)]
add Adopt{Data,Diff} methods to blobs to enable "virtual copying"

10 years agoadd unit tests for cpu/gpu copy functions
Jeff Donahue [Fri, 11 Apr 2014 23:07:43 +0000 (16:07 -0700)]
add unit tests for cpu/gpu copy functions

10 years agochange some unnecessary TYPED_TESTs to TEST_Fs
Jeff Donahue [Sat, 12 Apr 2014 06:47:40 +0000 (23:47 -0700)]
change some unnecessary TYPED_TESTs to TEST_Fs

10 years agofix lint errors by adding 'explicit' to new single arg pycaffe
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

10 years agopolished ignore
Evan Shelhamer [Fri, 11 Apr 2014 05:49:50 +0000 (22:49 -0700)]
polished ignore

10 years agoBack-merge docs and example image changes from `master` to `dev`
Evan Shelhamer [Thu, 10 Apr 2014 00:11:49 +0000 (17:11 -0700)]
Back-merge docs and example image changes from `master` to `dev`

10 years agoMerge pull request #310 from jeffdonahue/clang-test-power-layer-fixes
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

10 years agoadd using std::isnan and use this-> when calling Test{For,Back}ward
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

10 years agofix osx 10.9 condition in Makefile
Evan Shelhamer [Wed, 9 Apr 2014 22:44:07 +0000 (15:44 -0700)]
fix osx 10.9 condition in Makefile

10 years agoinclude vecLib BLAS dir on osx
Evan Shelhamer [Wed, 9 Apr 2014 21:33:31 +0000 (14:33 -0700)]
include vecLib BLAS dir on osx

10 years agoMerge pull request #286 from longjon/pycaffe-solver
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

10 years agochange true_std to intended bernoulli_std
Jeff Donahue [Wed, 9 Apr 2014 18:11:04 +0000 (11:11 -0700)]
change true_std to intended bernoulli_std

10 years agoMerge pull request #297 from jeffdonahue/rng-bug
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

10 years agomore rng test cleanup
Jeff Donahue [Wed, 9 Apr 2014 02:45:31 +0000 (19:45 -0700)]
more rng test cleanup

10 years agore-time imagenet example on k20, instead of my laptop
Evan Shelhamer [Wed, 9 Apr 2014 04:52:08 +0000 (21:52 -0700)]
re-time imagenet example on k20, instead of my laptop

10 years agochange *Plus* tests to *Times* tests because the Plus tests don't
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

10 years agoadd analogous caffe_gpu_rng_* functions for gaussian and uniform, and
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

10 years agohave rng_stream initialize RNG if not already initialized
Jeff Donahue [Tue, 8 Apr 2014 21:24:48 +0000 (14:24 -0700)]
have rng_stream initialize RNG if not already initialized

10 years agomake RNG function outputs the last argument per Google C++ style guidelines
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

10 years agomake RNG function names more similar to other caffe math function names
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

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 agorename doc deploy script for better tab completion
Evan Shelhamer [Tue, 8 Apr 2014 23:27:49 +0000 (16:27 -0700)]
rename doc deploy script for better tab completion

10 years agoDrop Lena image in favor of a cute cat photo
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.

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 agopycaffe: expose SGDSolver.solve
Jonathan L Long [Wed, 2 Apr 2014 21:40:09 +0000 (14:40 -0700)]
pycaffe: expose SGDSolver.solve

10 years agopycaffe: introduce CheckFile helper
Jonathan L Long [Wed, 2 Apr 2014 21:36:20 +0000 (14:36 -0700)]
pycaffe: introduce CheckFile helper

10 years agopycaffe: expose SGDSolver.net
Jonathan L Long [Wed, 2 Apr 2014 04:24:55 +0000 (21:24 -0700)]
pycaffe: expose SGDSolver.net

10 years agoswitch from inheritance to directly overriding methods for caffe.Net
Jonathan L Long [Fri, 4 Apr 2014 05:21:13 +0000 (22:21 -0700)]
switch from inheritance to directly overriding methods for caffe.Net

Also, internally drop the "Caffe" prefix for classes exported by the
internal _caffe module. This change means that SGDSolver will
automatically return a Net with the "nice" Python interface rather than
the internal one, (and avoids the extra layer of method wrapping that
results from switching to composition).

10 years agomake Solver::net return a shared_ptr rather than a raw pointer
Jonathan L Long [Wed, 2 Apr 2014 04:20:40 +0000 (21:20 -0700)]
make Solver::net return a shared_ptr rather than a raw pointer

This makes it possible to manage the Net pointer externally (e.g., from
the Python interface) using a shared_ptr. No existing code is affected.

10 years agopycaffe: expose SGDSolver
Jonathan L Long [Wed, 2 Apr 2014 03:14:15 +0000 (20:14 -0700)]
pycaffe: expose SGDSolver

10 years agoadd string constructor to Solver (analogous to Net)
Jonathan L Long [Wed, 2 Apr 2014 02:14:00 +0000 (19:14 -0700)]
add string constructor to Solver (analogous to Net)

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