Evan Shelhamer
bece205114
Set copyright to BVLC and contributors.
...
The exact details of the contributions are recorded by versioning.
2014-03-22 12:09:39 -07:00
Evan Shelhamer
19bcf2b29b
Hide boost rng behind facade for osx compatibility
...
Split boost random number generation from the common Caffe singleton and
add a helper function for rng. This resolves a build conflict in OSX
between boost rng and nvcc compilation of cuda code.
Refer to #165 for a full discussion.
Thanks to @satol for suggesting a random number generation facade rather
than a total split of cpp and cu code, which is far more involved.
2014-03-22 12:08:26 -07:00
Evan Shelhamer
aaa26466eb
lint
2014-03-21 23:44:35 -07:00
Evan Shelhamer
453fcf9095
clean up residual mkl comments and code
...
The FIXMEs about RNG were addressed by caffe_nextafter for
uniform distributions and the normal distribution concern is surely a
typo in the boost documentation, since the normal pdf is correctly
stated elsewhere in the documentation.
2014-03-21 15:26:09 -07:00
James Thewlis
a9e772f8f7
Added extern C wrapper to cblas.h include
...
This ensures that it works with ATLAS's header file, which doesn't include such
a guard itself (whereas the reference version from Ubuntu's libblas-dev does)
2014-03-21 13:52:36 -07:00
jamt9000
40aa12aa18
Fixed order of cblas and atlas linker flags
...
They were the wrong way round, causing linking to fail in some cases
2014-03-21 13:52:36 -07:00
Evan Shelhamer
ff27988995
comment out stray mkl includes
2014-03-21 13:52:36 -07:00
Evan Shelhamer
f6cbe2c5ce
make MKL switch surprise-proof
2014-03-21 13:52:36 -07:00
Evan Shelhamer
c028d09ca6
rewrite MKL flag note, polish makefile
...
add MKL dirs conditioned on USE_MKL
include libraries before making LD_FLAGS
2014-03-21 13:52:36 -07:00
Rowland Depp
a8c9b66b7f
major refactoring allow coexistence of MKL and non-MKL cases
2014-03-21 13:52:36 -07:00
Kai Li
1cf822e53b
Replace atlas with multithreaded OpenBLAS to speed-up on multi-core CPU
...
issue: #79
2014-03-21 13:52:35 -07:00
Jeff Donahue
4f6b26632a
fix bernoulli generator bug
2014-03-21 13:52:35 -07:00
Jeff Donahue
6cbf9f189b
add bernoulli rng test to demonstrate bug (generates all 0s unless p ==
...
1)
2014-03-21 13:52:35 -07:00
Jeff Donahue
b3e4ac55fe
change all Rng's to use variate_generator for consistency
2014-03-21 13:52:35 -07:00
Jeff Donahue
4b1fba7be3
use boost variate_generator to pass tests w/ boost 1.46 (Gaussian filler
...
previously filled in all NaNs for me, making many tests fail)
2014-03-21 13:52:35 -07:00
Jeff Donahue
93c9f151dc
make uniform distribution usage compatible with boost 1.46
2014-03-21 13:52:35 -07:00
Alejandro Dubrovsky
b9257396d6
mean_bound and sample_mean need referencing with this
2014-03-21 13:52:35 -07:00
Alejandro Dubrovsky
2ae2683fb8
nextafter templates off one type
2014-03-21 13:52:35 -07:00
Evan Shelhamer
d37a995b96
relax precision of MultinomialLogisticLossLayer test
2014-03-21 13:52:35 -07:00
Kai Li
788f070d06
Fix math funcs, add tests, change Eigen Map to unaligned for lrn_layer
...
[shelhamer: removed math function tests, since they were merged via
other branches]
2014-03-21 13:52:34 -07:00
Kai Li
38457e1c1f
Fix test stochastic pooling stepsize/threshold to be same as max pooling
2014-03-21 13:52:34 -07:00
Kai Li
d666bdc9d3
Fixed FlattenLayer Backward_cpu/gpu have no return value
2014-03-21 13:52:34 -07:00
Kai Li
04ca88ac15
Fixed uniform distribution upper bound to be inclusive
2014-03-21 13:52:34 -07:00
Rodrigo Benenson
e4e93f4d12
compile caffe without MKL (dependency replaced by boost::random, Eigen3)
...
- examples, test and pycaffe compile without problem (matcaffe not tested)
- tests show some errors (on cpu gradient tests), to be investigated
- random generators need to be double checked
- mkl commented code needs to be removed
2014-03-21 13:52:34 -07:00
Jeff Donahue
510b3c028f
Merge pull request #247 from jeffdonahue/loss-in-forward-window-data-layer
...
Loss in forward pass fix for window data layer
2014-03-21 13:11:36 -07:00
Jeff Donahue
a123130cb3
loss in forward pass fix for window data layer
2014-03-21 13:05:59 -07:00
Jeff Donahue
e6ef9ca4c8
Merge pull request #209 from jeffdonahue/loss-in-forward-pass
...
Compute loss in the forward pass
2014-03-21 12:52:16 -07:00
Evan Shelhamer
50862880dd
Back-merge documentation and script fixes
...
fix script path incantation
convert css indentation to spaces
fix cifar10 leveldb creation path
wget without checking certificate for dropbox (dodge complaint on linux)
docs: added list of contributors
minor style update of docs
2014-03-19 22:34:01 -07:00
Evan Shelhamer
19a7e23ccc
fix script path incantation
2014-03-19 22:31:59 -07:00
Sergey Karayev
aa0a52f9e6
convert css indentation to spaces
2014-03-19 22:17:28 -07:00
Evan Shelhamer
9312fe0be2
fix cifar10 leveldb creation path
2014-03-19 22:13:24 -07:00
Evan Shelhamer
62a4ba88f7
wget without checking certificate for dropbox (dodge complaint on linux)
2014-03-19 22:03:40 -07:00
Sergey Karayev
45b31bf5c9
docs: added list of contributors
2014-03-19 21:39:52 -07:00
Sergey Karayev
fd47362deb
minor style update of docs
2014-03-19 21:27:22 -07:00
Sergey Karayev
3b51aab66d
Fix to #161
...
- signficantly change the documentation file
- link to it from index.md
- remove the image resizing script, since (a) it does not work, (b) is obviated by using ImagesLayer
- add sample prototxt that uses ImagesLayer.
2014-03-19 21:25:44 -07:00
Sergey Karayev
c10ba54f0f
Merge pull request #161 from kloudkl/simplify_feature_extraction
...
Feature extraction, feature binarization and image retrieval examples
2014-03-19 21:21:28 -07:00
Jeff Donahue
ec6f3b8466
minor cleanup in rcnn-finetuning -- rcnn feature computation tested at
...
this commit (in addition to all caffe unit tests passing)
2014-03-19 20:50:13 -07:00
Ross Girshick
dfec9471ea
cleanup matlab demo
2014-03-19 19:17:40 -07:00
Ross Girshick
9c7a993947
add initialization key for verifying state
2014-03-19 19:12:57 -07:00
Ross Girshick
ba10066aff
demo on how to get net weights using the matlab interface
2014-03-19 19:12:57 -07:00
Ross Girshick
dee9ce76ff
return model weights
2014-03-19 19:12:54 -07:00
Evan Shelhamer
b68cf5ee13
keep DLOG (revert accidental switch to LOG)
2014-03-19 19:09:57 -07:00
Evan Shelhamer
32cea65d8a
file pascal finetuning prototxt examples and fix paths
2014-03-19 19:09:57 -07:00
Ross Girshick
6f653798f0
set default to the best value
2014-03-19 19:09:54 -07:00
Ross Girshick
f1a64b7bc1
some cleanup
2014-03-19 19:09:20 -07:00
Ross Girshick
458fa2b6b4
fix paths
2014-03-19 19:08:30 -07:00
Ross Girshick
13392972d9
support for tightest square mode while finetuning
2014-03-19 19:08:28 -07:00
Ross Girshick
5cb7c23367
10x learning rate for fine tuning makes a big difference
2014-03-19 19:07:23 -07:00
Ross Girshick
17a0c1686b
support for adding padding to windows in the window_data_layer
2014-03-19 19:07:20 -07:00
Ross Girshick
bb0e72c817
Code that was used to finetune with reasonable success
2014-03-19 19:06:05 -07:00