Jeff Donahue [Mon, 17 Mar 2014 08:40:03 +0000 (01:40 -0700)]
set correct bottom blob name in upgraded conv layer
Jeff Donahue [Mon, 17 Mar 2014 08:21:06 +0000 (01:21 -0700)]
function to upgrade padding layers
Jeff Donahue [Sat, 15 Mar 2014 11:12:45 +0000 (04:12 -0700)]
make solver use upgrade_proto (by constructing net with a string) and
fix upgrade_proto bugs
Jeff Donahue [Sat, 15 Mar 2014 11:04:18 +0000 (04:04 -0700)]
add deprecated protos to PROTO_OBJS in makefile so things compile; other
minor cleanup of includes etc
Jeff Donahue [Sat, 15 Mar 2014 09:33:40 +0000 (02:33 -0700)]
make ReadProtoFromTextFile not die on parse failure; add
ReadProtoFromTextFileOrDie which has the old functionality
Jeff Donahue [Sat, 15 Mar 2014 09:15:44 +0000 (02:15 -0700)]
add V0NetParameter and UpgradeV0Net
Jeff Donahue [Sat, 15 Mar 2014 08:44:03 +0000 (01:44 -0700)]
caffe.proto: layer->layers
Jeff Donahue [Sat, 15 Mar 2014 08:11:33 +0000 (01:11 -0700)]
add v0->v1 'bridge' proto and add util that uses it
Jeff Donahue [Sat, 15 Mar 2014 05:24:12 +0000 (22:24 -0700)]
move caffe.proto.v0 -> deprecated/caffe.v0.proto and add separate target
makefile target for it
Jeff Donahue [Sat, 15 Mar 2014 03:56:07 +0000 (20:56 -0700)]
update tests for new proto format; now they compile
Jeff Donahue [Sat, 15 Mar 2014 00:59:28 +0000 (17:59 -0700)]
changes to layers etc to make 'make all' run successfully under new
caffe.proto
Jeff Donahue [Sat, 15 Mar 2014 00:57:26 +0000 (17:57 -0700)]
add duplicated params from InnerProductParam to ConvolutionParam and
PoolingParam etc, create InfogainLossParam
Jeff Donahue [Sat, 15 Mar 2014 00:30:42 +0000 (17:30 -0700)]
HDF5DataParameter message and concat_param
Jeff Donahue [Sat, 15 Mar 2014 00:13:59 +0000 (17:13 -0700)]
NetParameter.layers -> layer
Jeff Donahue [Fri, 14 Mar 2014 23:55:09 +0000 (16:55 -0700)]
remove LayerConnection from proto, bottom and top now in LayerParameter
Jeff Donahue [Fri, 14 Mar 2014 23:50:47 +0000 (16:50 -0700)]
move LayerParameter and individual layer param messages to bottom of
caffe.proto
Jeff Donahue [Fri, 14 Mar 2014 23:44:52 +0000 (16:44 -0700)]
move individual layer parameters to individual proto messages
Jeff Donahue [Fri, 14 Mar 2014 23:18:37 +0000 (16:18 -0700)]
create file caffe.proto.v0 which duplicates current caffe.proto
Jeff Donahue [Fri, 14 Mar 2014 23:15:42 +0000 (16:15 -0700)]
fix caffe.proto style bugs
Evan Shelhamer [Fri, 28 Mar 2014 06:04:08 +0000 (23:04 -0700)]
Merge pull request #266 from longjon/toomanyargs
Passing too many args to tool binaries is an error
Jeff Donahue [Fri, 28 Mar 2014 03:23:45 +0000 (20:23 -0700)]
Merge pull request #268 from longjon/debug
Add DEBUG option to Makefile/Makefile.config.example
Jonathan L Long [Fri, 21 Mar 2014 22:15:00 +0000 (15:15 -0700)]
add DEBUG option to Makefile/Makefile.config.example
This allows debugging to be toggled without dirtying the tree.
Jonathan L Long [Thu, 27 Mar 2014 23:39:05 +0000 (16:39 -0700)]
tools should have nonzero error exit codes
Jonathan L Long [Thu, 27 Mar 2014 22:11:17 +0000 (15:11 -0700)]
passing too many args to tool binaries is an error
Jeff Donahue [Thu, 27 Mar 2014 20:15:34 +0000 (13:15 -0700)]
Merge pull request #265 from jeffdonahue/hdf5-output-tmpfile-fix
Change hdf5 output layer test output file to use tmpnam
Jeff Donahue [Thu, 27 Mar 2014 20:08:00 +0000 (13:08 -0700)]
change hdf5 output layer test output file to a tmpnam rather than
hard-coded path
Evan Shelhamer [Thu, 27 Mar 2014 18:42:04 +0000 (11:42 -0700)]
installation proofreading, split parallel compilation
Evan Shelhamer [Thu, 27 Mar 2014 18:30:24 +0000 (11:30 -0700)]
Merge pull request #255 from shelhamer/copyright-credit
Standardize copyright, add root-level CONTRIBUTORS credit, note copyright assignment
Evan Shelhamer [Thu, 27 Mar 2014 18:29:32 +0000 (11:29 -0700)]
note copyright assignment in development guide
Evan Shelhamer [Mon, 24 Mar 2014 18:22:56 +0000 (11:22 -0700)]
Standardize copyright, add root-level CONTRIBUTORS credit
Jeff Donahue [Wed, 26 Mar 2014 06:10:00 +0000 (23:10 -0700)]
Merge pull request #260 from kloudkl/fix_doc_typos
Fix doc typos
Sergey Karayev [Wed, 26 Mar 2014 02:54:30 +0000 (19:54 -0700)]
removing lena in favor of cat
Kai Li [Wed, 26 Mar 2014 02:53:13 +0000 (10:53 +0800)]
Add packages installation command for CentOS/RHEL
Kai Li [Wed, 26 Mar 2014 02:43:35 +0000 (10:43 +0800)]
Fix imagenet pretrained links
Kai Li [Wed, 26 Mar 2014 02:38:57 +0000 (10:38 +0800)]
Add in doc how to remove leveldb dir if existed
Kai Li [Wed, 26 Mar 2014 02:28:10 +0000 (10:28 +0800)]
Fix feature extraction reference model path and file list command bugs
Sergey Karayev [Tue, 25 Mar 2014 21:48:08 +0000 (14:48 -0700)]
fixed compilation error on window_data_layer.cu in 10.8
Kai Li [Tue, 25 Mar 2014 04:03:06 +0000 (12:03 +0800)]
Add headers to build on OS X
Kai Li [Mon, 24 Mar 2014 01:47:00 +0000 (09:47 +0800)]
Separate WindowDataLayer::Forward_gpu into a cu file
Kai Li [Mon, 24 Mar 2014 01:46:43 +0000 (09:46 +0800)]
Separate ImagesLayer::Forward_gpu into a cu file
Evan Shelhamer [Mon, 24 Mar 2014 23:13:52 +0000 (16:13 -0700)]
Merge pull request #201 from kloudkl/more_math_functions
Add more convenience math functions and all tests pass
Sergey Karayev [Mon, 24 Mar 2014 07:47:58 +0000 (00:47 -0700)]
Merge pull request #252 from kloudkl/hdf5_output_layer
Hdf5 output layer
Kai Li [Mon, 24 Mar 2014 01:37:21 +0000 (09:37 +0800)]
Separate HDF5OutputLayer::Forward_gpu/Backward_gpu into cu file
Kai Li [Tue, 18 Mar 2014 07:22:14 +0000 (15:22 +0800)]
Fixed CPPLint errors related to math funtions
Kai Li [Tue, 11 Mar 2014 09:05:27 +0000 (17:05 +0800)]
Rename signbit in macros to sgnbit to avoid conflicts with std::signbit
Kai Li [Wed, 26 Feb 2014 03:23:20 +0000 (11:23 +0800)]
Add signbit math func, simplify GPU defs & instantiations with a macro
Kai Li [Tue, 25 Feb 2014 12:26:55 +0000 (20:26 +0800)]
Add and test non-in-place scale math functions for CPU and GPU
Kai Li [Tue, 25 Feb 2014 12:06:05 +0000 (20:06 +0800)]
Use macro to simplify element wise cpu math functions
Kai Li [Tue, 25 Feb 2014 11:33:10 +0000 (19:33 +0800)]
Add and test element wise abs math functions for CPU and GPU
Kai Li [Tue, 25 Feb 2014 11:21:18 +0000 (19:21 +0800)]
Instantiate caffe_cpu_sign for float and double
Kai Li [Tue, 25 Feb 2014 11:16:44 +0000 (19:16 +0800)]
Add and test element wise sign math funtions for CPU and GPU
Kai Li [Tue, 25 Feb 2014 10:41:45 +0000 (18:41 +0800)]
Add and test sum of absolute values math functions for CPU and GPU
Kai Li [Sun, 23 Mar 2014 12:30:52 +0000 (20:30 +0800)]
Rebase and change the HDF5OutputLayer::Forward/Backward signatures
Kai Li [Sun, 23 Mar 2014 11:05:05 +0000 (19:05 +0800)]
Add HDF5OutputLayer to the layer factory
Kai Li [Sun, 23 Mar 2014 11:03:21 +0000 (19:03 +0800)]
Implement and test HDF5OutputLayer
Kai Li [Sun, 23 Mar 2014 11:02:53 +0000 (19:02 +0800)]
Implement HDF5 save dataset IO utility function
Evan Shelhamer [Sun, 23 Mar 2014 05:53:42 +0000 (22:53 -0700)]
Merge pull request #165 from BVLC/boost-eigen
MKL/non-MKL Reconciliation
Caffe no longer requires MKL. By default it builds without it, relying on atlas and cblas instead. Set the `USE_MKL` var in your Makefile.config accordingly.
Evan Shelhamer [Sat, 22 Mar 2014 08:27:42 +0000 (01:27 -0700)]
Set copyright to BVLC and contributors.
The exact details of the contributions are recorded by versioning.
Evan Shelhamer [Sat, 22 Mar 2014 06:47:01 +0000 (23:47 -0700)]
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.
Evan Shelhamer [Fri, 21 Mar 2014 22:50:43 +0000 (15:50 -0700)]
lint
Evan Shelhamer [Fri, 21 Mar 2014 21:58:11 +0000 (14:58 -0700)]
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.
James Thewlis [Mon, 3 Mar 2014 17:43:20 +0000 (17:43 +0000)]
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)
jamt9000 [Mon, 3 Mar 2014 17:07:23 +0000 (17:07 +0000)]
Fixed order of cblas and atlas linker flags
They were the wrong way round, causing linking to fail in some cases
Evan Shelhamer [Thu, 27 Feb 2014 06:41:58 +0000 (22:41 -0800)]
comment out stray mkl includes
Evan Shelhamer [Tue, 18 Feb 2014 19:10:23 +0000 (11:10 -0800)]
make MKL switch surprise-proof
Evan Shelhamer [Sat, 15 Feb 2014 05:27:20 +0000 (21:27 -0800)]
rewrite MKL flag note, polish makefile
add MKL dirs conditioned on USE_MKL
include libraries before making LD_FLAGS
Rowland Depp [Wed, 12 Feb 2014 05:41:01 +0000 (21:41 -0800)]
major refactoring allow coexistence of MKL and non-MKL cases
Kai Li [Fri, 7 Feb 2014 10:44:10 +0000 (18:44 +0800)]
Replace atlas with multithreaded OpenBLAS to speed-up on multi-core CPU
issue: #79
Jeff Donahue [Wed, 29 Jan 2014 21:11:34 +0000 (13:11 -0800)]
fix bernoulli generator bug
Jeff Donahue [Wed, 29 Jan 2014 21:03:42 +0000 (13:03 -0800)]
add bernoulli rng test to demonstrate bug (generates all 0s unless p ==
1)
Jeff Donahue [Wed, 22 Jan 2014 20:42:12 +0000 (12:42 -0800)]
change all Rng's to use variate_generator for consistency
Jeff Donahue [Wed, 22 Jan 2014 20:28:01 +0000 (12:28 -0800)]
use boost variate_generator to pass tests w/ boost 1.46 (Gaussian filler
previously filled in all NaNs for me, making many tests fail)
Jeff Donahue [Wed, 22 Jan 2014 20:14:09 +0000 (12:14 -0800)]
make uniform distribution usage compatible with boost 1.46
Alejandro Dubrovsky [Wed, 22 Jan 2014 11:56:57 +0000 (22:56 +1100)]
mean_bound and sample_mean need referencing with this
Alejandro Dubrovsky [Wed, 22 Jan 2014 11:56:17 +0000 (22:56 +1100)]
nextafter templates off one type
Evan Shelhamer [Thu, 9 Jan 2014 00:36:52 +0000 (16:36 -0800)]
relax precision of MultinomialLogisticLossLayer test
Kai Li [Sun, 12 Jan 2014 05:55:26 +0000 (13:55 +0800)]
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]
Kai Li [Sat, 11 Jan 2014 16:39:45 +0000 (00:39 +0800)]
Fix test stochastic pooling stepsize/threshold to be same as max pooling
Kai Li [Sat, 11 Jan 2014 15:57:37 +0000 (23:57 +0800)]
Fixed FlattenLayer Backward_cpu/gpu have no return value
Kai Li [Sat, 11 Jan 2014 15:51:54 +0000 (23:51 +0800)]
Fixed uniform distribution upper bound to be inclusive
Rodrigo Benenson [Sun, 8 Dec 2013 04:55:39 +0000 (15:55 +1100)]
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
Jeff Donahue [Fri, 21 Mar 2014 20:11:36 +0000 (13:11 -0700)]
Merge pull request #247 from jeffdonahue/loss-in-forward-window-data-layer
Loss in forward pass fix for window data layer
Jeff Donahue [Fri, 21 Mar 2014 20:05:59 +0000 (13:05 -0700)]
loss in forward pass fix for window data layer
Jeff Donahue [Fri, 21 Mar 2014 19:52:16 +0000 (12:52 -0700)]
Merge pull request #209 from jeffdonahue/loss-in-forward-pass
Compute loss in the forward pass
Evan Shelhamer [Thu, 20 Mar 2014 05:34:01 +0000 (22:34 -0700)]
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
Evan Shelhamer [Thu, 20 Mar 2014 05:29:17 +0000 (22:29 -0700)]
fix script path incantation
Sergey Karayev [Thu, 20 Mar 2014 05:16:03 +0000 (22:16 -0700)]
convert css indentation to spaces
Evan Shelhamer [Thu, 20 Mar 2014 05:13:24 +0000 (22:13 -0700)]
fix cifar10 leveldb creation path
Evan Shelhamer [Thu, 20 Mar 2014 05:01:45 +0000 (22:01 -0700)]
wget without checking certificate for dropbox (dodge complaint on linux)
Sergey Karayev [Thu, 20 Mar 2014 04:39:52 +0000 (21:39 -0700)]
docs: added list of contributors
Sergey Karayev [Thu, 20 Mar 2014 04:27:22 +0000 (21:27 -0700)]
minor style update of docs
Sergey Karayev [Thu, 20 Mar 2014 04:25:44 +0000 (21:25 -0700)]
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.
Sergey Karayev [Thu, 20 Mar 2014 04:21:28 +0000 (21:21 -0700)]
Merge pull request #161 from kloudkl/simplify_feature_extraction
Feature extraction, feature binarization and image retrieval examples
Jeff Donahue [Thu, 20 Mar 2014 03:50:13 +0000 (20:50 -0700)]
minor cleanup in rcnn-finetuning -- rcnn feature computation tested at
this commit (in addition to all caffe unit tests passing)
Ross Girshick [Tue, 4 Feb 2014 19:00:55 +0000 (11:00 -0800)]
cleanup matlab demo
Ross Girshick [Mon, 13 Jan 2014 21:34:34 +0000 (13:34 -0800)]
add initialization key for verifying state
Ross Girshick [Fri, 20 Dec 2013 22:39:22 +0000 (14:39 -0800)]
demo on how to get net weights using the matlab interface
Ross Girshick [Fri, 6 Dec 2013 04:58:03 +0000 (20:58 -0800)]
return model weights
Evan Shelhamer [Thu, 13 Mar 2014 22:19:43 +0000 (15:19 -0700)]
keep DLOG (revert accidental switch to LOG)
Evan Shelhamer [Thu, 13 Mar 2014 22:10:41 +0000 (15:10 -0700)]
file pascal finetuning prototxt examples and fix paths