Граф коммитов

921 Коммитов

Автор SHA1 Сообщение Дата
Jeff Donahue 9d29f7217e move LayerParameter and individual layer param messages to bottom of
caffe.proto
2014-03-27 23:42:28 -07:00
Jeff Donahue 1dc3374913 move individual layer parameters to individual proto messages 2014-03-27 23:42:28 -07:00
Jeff Donahue 53ca9cde3f create file caffe.proto.v0 which duplicates current caffe.proto 2014-03-27 23:42:28 -07:00
Jeff Donahue 38cab75c0d fix caffe.proto style bugs 2014-03-27 23:42:28 -07:00
Evan Shelhamer bbfaa69df0 Merge pull request #266 from longjon/toomanyargs
Passing too many args to tool binaries is an error
2014-03-27 23:04:08 -07:00
Jeff Donahue 2338027414 Merge pull request #268 from longjon/debug
Add DEBUG option to Makefile/Makefile.config.example
2014-03-27 20:23:45 -07:00
Jonathan L Long c8ec12c5cb add DEBUG option to Makefile/Makefile.config.example
This allows debugging to be toggled without dirtying the tree.
2014-03-27 20:15:32 -07:00
Jonathan L Long 48cbcb617f tools should have nonzero error exit codes 2014-03-27 16:40:10 -07:00
Jonathan L Long 71136b0bb7 passing too many args to tool binaries is an error 2014-03-27 15:17:51 -07:00
Jeff Donahue 18d1e96edc Merge pull request #265 from jeffdonahue/hdf5-output-tmpfile-fix
Change hdf5 output layer test output file to use tmpnam
2014-03-27 13:15:34 -07:00
Jeff Donahue 7946e3b96f change hdf5 output layer test output file to a tmpnam rather than
hard-coded path
2014-03-27 13:08:00 -07:00
Evan Shelhamer a2f75c21ea installation proofreading, split parallel compilation 2014-03-27 11:42:51 -07:00
Evan Shelhamer f15f2396d6 Merge pull request #255 from shelhamer/copyright-credit
Standardize copyright, add root-level CONTRIBUTORS credit, note copyright assignment
2014-03-27 11:30:24 -07:00
Evan Shelhamer ee9673acb5 note copyright assignment in development guide 2014-03-27 11:29:32 -07:00
Evan Shelhamer 6db92e838b Standardize copyright, add root-level CONTRIBUTORS credit 2014-03-27 11:20:35 -07:00
Jeff Donahue 923a847b21 Merge pull request #260 from kloudkl/fix_doc_typos
Fix doc typos
2014-03-25 23:10:00 -07:00
Sergey Karayev 85bafd5ff9 removing lena in favor of cat 2014-03-25 19:54:30 -07:00
Kai Li 6ef936e14a Add packages installation command for CentOS/RHEL 2014-03-26 10:53:13 +08:00
Kai Li fcbe69f599 Fix imagenet pretrained links 2014-03-26 10:43:35 +08:00
Kai Li cd645fbd31 Add in doc how to remove leveldb dir if existed 2014-03-26 10:38:57 +08:00
Kai Li b1c8b2936c Fix feature extraction reference model path and file list command bugs 2014-03-26 10:28:10 +08:00
Sergey Karayev 69c620e84f fixed compilation error on window_data_layer.cu in 10.8 2014-03-25 14:48:08 -07:00
Kai Li 62df365836 Add headers to build on OS X 2014-03-25 12:03:06 +08:00
Kai Li af26a549cd Separate WindowDataLayer::Forward_gpu into a cu file 2014-03-25 11:56:06 +08:00
Kai Li 3f33c202ce Separate ImagesLayer::Forward_gpu into a cu file 2014-03-25 11:56:05 +08:00
Evan Shelhamer 91483aef03 Merge pull request #201 from kloudkl/more_math_functions
Add more convenience math functions and all tests pass
2014-03-24 16:13:52 -07:00
Sergey Karayev d3e4c21d91 Merge pull request #252 from kloudkl/hdf5_output_layer
Hdf5 output layer
2014-03-24 00:47:58 -07:00
Kai Li ebf90c31c4 Separate HDF5OutputLayer::Forward_gpu/Backward_gpu into cu file 2014-03-24 09:37:21 +08:00
Kai Li 4d53804846 Fixed CPPLint errors related to math funtions 2014-03-23 21:41:25 +08:00
Kai Li a288d9538a Rename signbit in macros to sgnbit to avoid conflicts with std::signbit 2014-03-23 21:26:00 +08:00
Kai Li dc552e058f Add signbit math func, simplify GPU defs & instantiations with a macro 2014-03-23 21:25:58 +08:00
Kai Li b1f6eb0b91 Add and test non-in-place scale math functions for CPU and GPU 2014-03-23 21:25:01 +08:00
Kai Li b458b41d68 Use macro to simplify element wise cpu math functions 2014-03-23 21:25:01 +08:00
Kai Li ccae3fa587 Add and test element wise abs math functions for CPU and GPU 2014-03-23 21:24:59 +08:00
Kai Li f634899f44 Instantiate caffe_cpu_sign for float and double 2014-03-23 21:21:57 +08:00
Kai Li 348a338e7f Add and test element wise sign math funtions for CPU and GPU 2014-03-23 21:21:55 +08:00
Kai Li 910f3128c7 Add and test sum of absolute values math functions for CPU and GPU 2014-03-23 21:20:50 +08:00
Kai Li 2b28b2090d Rebase and change the HDF5OutputLayer::Forward/Backward signatures 2014-03-23 20:30:52 +08:00
Kai Li dd9e05bff4 Add HDF5OutputLayer to the layer factory 2014-03-23 20:12:54 +08:00
Kai Li e2beba9b55 Implement and test HDF5OutputLayer 2014-03-23 20:12:54 +08:00
Kai Li e2685eb08d Implement HDF5 save dataset IO utility function 2014-03-23 20:12:54 +08:00
Evan Shelhamer 699b557c75 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.
2014-03-22 22:53:42 -07:00
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