Jeff Donahue [Wed, 6 Aug 2014 00:33:19 +0000 (17:33 -0700)]
Fix caffe/alt_fn lint errors.
Jeff Donahue [Tue, 5 Aug 2014 23:59:14 +0000 (16:59 -0700)]
Create caffe_{,gpu_}memset functions to replace {m,cudaM}emset's.
Jeff Donahue [Tue, 5 Aug 2014 23:01:11 +0000 (16:01 -0700)]
Add caffe/alt_fn rule to lint checks to check for functions (like memset
& memcpy) with caffe_* alternatives that should be used instead.
Jeff Donahue [Tue, 5 Aug 2014 23:19:31 +0000 (16:19 -0700)]
lint targets should depend on the lint script itself
Evan Shelhamer [Mon, 11 Aug 2014 23:40:02 +0000 (16:40 -0700)]
[examples] fix links in feature extraction
Evan Shelhamer [Mon, 11 Aug 2014 23:11:58 +0000 (16:11 -0700)]
Merge pull request #910 from sergeyk/dev
web demo updates
Sergey Karayev [Mon, 11 Aug 2014 22:59:48 +0000 (15:59 -0700)]
[docs] ‘maximally accurate’ in the web demo explanation. closes #905
Sergey Karayev [Mon, 11 Aug 2014 22:52:56 +0000 (15:52 -0700)]
[docs] [fix] closes #899
Evan Shelhamer [Mon, 11 Aug 2014 22:17:46 +0000 (15:17 -0700)]
Merge pull request #909 from sergeyk/dev
[docs] sort examples
Sergey Karayev [Mon, 11 Aug 2014 22:09:53 +0000 (15:09 -0700)]
[docs] sorting of examples. if doesn’t work for you, update jekyll.
Yangqing Jia [Mon, 11 Aug 2014 17:35:04 +0000 (10:35 -0700)]
Merge pull request #904 from Yangqing/sweep
Add a leveldb option function in io.hpp/cpp
Yangqing Jia [Mon, 11 Aug 2014 16:16:51 +0000 (09:16 -0700)]
Add a leveldb option function in io.hpp/cpp
Jonathan L Long [Mon, 11 Aug 2014 04:23:34 +0000 (21:23 -0700)]
fix formatting error in blob.hpp
Evan Shelhamer [Sun, 10 Aug 2014 05:24:15 +0000 (22:24 -0700)]
output loss for caffenet and alexnet train/val models
Evan Shelhamer [Sun, 10 Aug 2014 03:43:40 +0000 (20:43 -0700)]
default raw_scale in python scripts to ImageNet model value
Evan Shelhamer [Sat, 9 Aug 2014 21:20:44 +0000 (14:20 -0700)]
Merge pull request #891 from kloudkl/gflags_namespace
Fix the gflags namespace issue
Jeff Donahue [Sat, 9 Aug 2014 19:43:42 +0000 (12:43 -0700)]
Merge pull request #892 from kloudkl/distribute_generated_proto_headers
Distribute the generated proto header files
Kai Li [Sat, 9 Aug 2014 12:41:58 +0000 (20:41 +0800)]
Distribute the generated proto header files
Kai Li [Sat, 9 Aug 2014 12:11:38 +0000 (20:11 +0800)]
Fix the gflags namespace issue
Sergio Guadarrama [Sat, 9 Aug 2014 09:29:05 +0000 (02:29 -0700)]
Merge pull request #888 from ronghanghu/matcaffe-add-check
add necessary input checks for matcaffe
Ronghang Hu [Fri, 8 Aug 2014 22:47:23 +0000 (15:47 -0700)]
add necessary input checks for matcaffe
Evan Shelhamer [Fri, 8 Aug 2014 19:40:42 +0000 (12:40 -0700)]
[example] fix example names
Evan Shelhamer [Fri, 8 Aug 2014 19:01:39 +0000 (12:01 -0700)]
[docs] fix find complaint in example gathering script
Evan Shelhamer [Fri, 8 Aug 2014 18:18:46 +0000 (11:18 -0700)]
[example] fix broken links in ImageNet recipe
Evan Shelhamer [Thu, 7 Aug 2014 21:17:48 +0000 (14:17 -0700)]
Back-merge documentation and fixes
Jeff Donahue [Thu, 7 Aug 2014 20:01:14 +0000 (13:01 -0700)]
Merge pull request #872 from shelhamer/caffe-tool
Improve caffe tool
Evan Shelhamer [Thu, 7 Aug 2014 18:56:45 +0000 (11:56 -0700)]
consolidate gpu and device_id args in caffe tool
Evan Shelhamer [Thu, 7 Aug 2014 06:56:06 +0000 (23:56 -0700)]
update cli usage in examples
Evan Shelhamer [Thu, 7 Aug 2014 06:48:29 +0000 (23:48 -0700)]
fix deprecation warnings
Evan Shelhamer [Thu, 7 Aug 2014 06:38:17 +0000 (23:38 -0700)]
consolidate test into caffe cli
Evan Shelhamer [Thu, 7 Aug 2014 06:22:56 +0000 (23:22 -0700)]
comment caffe cli
Evan Shelhamer [Thu, 7 Aug 2014 06:22:40 +0000 (23:22 -0700)]
check required caffe cli args
Evan Shelhamer [Thu, 7 Aug 2014 06:22:13 +0000 (23:22 -0700)]
rename caffe cli args and revise text
Evan Shelhamer [Thu, 7 Aug 2014 03:17:00 +0000 (20:17 -0700)]
give usage message for caffe cli
- call format
- commands
- flags
Evan Shelhamer [Thu, 7 Aug 2014 03:10:27 +0000 (20:10 -0700)]
output INFO from caffe cli to stderr by default
Evan Shelhamer [Thu, 7 Aug 2014 02:45:05 +0000 (19:45 -0700)]
consolidaet GPU flag for caffe cli
Evan Shelhamer [Thu, 7 Aug 2014 02:22:58 +0000 (19:22 -0700)]
rename tools
Alireza Shafaei [Wed, 6 Aug 2014 04:34:45 +0000 (21:34 -0700)]
Painless binary mean conversion to matlab matrices.
Evan Shelhamer [Thu, 7 Aug 2014 01:39:24 +0000 (18:39 -0700)]
Merge pull request #868 from shelhamer/license-copyright
Clarify the license and copyright terms of the project
Evan Shelhamer [Wed, 6 Aug 2014 07:36:00 +0000 (00:36 -0700)]
lint for copyright
Evan Shelhamer [Wed, 6 Aug 2014 07:34:05 +0000 (00:34 -0700)]
[docs] detail attribution, license, and copyright for development
Evan Shelhamer [Wed, 6 Aug 2014 07:43:17 +0000 (00:43 -0700)]
LICENSE governs the whole project so strip file headers
Evan Shelhamer [Wed, 6 Aug 2014 07:16:36 +0000 (00:16 -0700)]
clarify the license and copyright terms of the project
As has been the case, contributions are copyright their respective
contributors and the project is BSD-2 licensed. By contributing to the
project, contributors release their contributions under these copyright
and license terms as declared in LICENSE.
Evan Shelhamer [Wed, 6 Aug 2014 06:24:41 +0000 (23:24 -0700)]
Merge pull request #816 from shelhamer/pycaffe-labels-grayscale-attrs-examples
Improve and polish pycaffe
Evan Shelhamer [Tue, 5 Aug 2014 17:14:35 +0000 (10:14 -0700)]
drop np.asarray() in favor of declaration (~1.75x speedup)
Evan Shelhamer [Sat, 2 Aug 2014 01:46:17 +0000 (18:46 -0700)]
fix pycaffe context cropping with or without mean
Evan Shelhamer [Sat, 2 Aug 2014 00:55:30 +0000 (17:55 -0700)]
take array in pycaffe `Net.set_mean()` instead of file path
Evan Shelhamer [Thu, 31 Jul 2014 23:19:20 +0000 (16:19 -0700)]
fix pycaffe input processing
- load an image as [0,1] single / np.float32 according to Python convention
- fix input scaling during preprocessing:
- scale input for preprocessing by `raw_scale` e.g. to map an image
to [0, 255] for the CaffeNet and AlexNet ImageNet models
- scale feature space by `input_scale` after mean subtraction
- switch examples to raw scale for ImageNet models
- fix #525
- preserve type after resizing.
- resize 1, 3, or K channel images with special casing between
skimage.transform (1 and 3) and scipy.ndimage (K) for speed
Evan Shelhamer [Tue, 29 Jul 2014 03:16:52 +0000 (20:16 -0700)]
[example] include prediction in classification, time on GTX 770
Evan Shelhamer [Mon, 28 Jul 2014 23:08:44 +0000 (16:08 -0700)]
[example] fix example outputs
With the right input processing, the actual image classification output
is sensible.
- filter visualization example's top prediction is "tabby cat"
- net surgery fully-convolutional output map is better
Fix incorrect class names too.
Evan Shelhamer [Tue, 29 Jul 2014 03:10:16 +0000 (20:10 -0700)]
[example] add caffe to pythonpath in all examples
Evan Shelhamer [Mon, 28 Jul 2014 21:55:13 +0000 (14:55 -0700)]
define caffe.Net input preprocessing members by boost::python
define `Net.{mean, input_scale, channel_swap}` on the boost::python side
so that the members always exist. drop ugly initialization logic.
Jeff Donahue [Tue, 5 Aug 2014 17:51:07 +0000 (10:51 -0700)]
Merge pull request #856 from jeffdonahue/lint-tweaks
add header alphabetization to lint checks
Jeff Donahue [Tue, 5 Aug 2014 16:22:49 +0000 (09:22 -0700)]
Merge pull request #859 from beam2d/fix-cifar-lrn-region
Fix conflict on setting of LRN layers between train/test net and deploy net
Seiya Tokui [Tue, 5 Aug 2014 09:07:19 +0000 (18:07 +0900)]
Fix conflict on setting of LRN layers between train/test net and deploy net
Jeff Donahue [Sat, 2 Aug 2014 03:14:42 +0000 (20:14 -0700)]
Fix header alphabetization lint errors.
Jeff Donahue [Sat, 2 Aug 2014 02:58:56 +0000 (19:58 -0700)]
Enable the 'build/include_alpha' rules to make lint check that the
includes are correctly alphabetized.
Jeff Donahue [Sat, 2 Aug 2014 02:42:41 +0000 (19:42 -0700)]
Add "lintclean" target to remove current lint outputs -- forces lint to
be run again next time "make lint" is run.
Vik Kamath [Mon, 7 Jul 2014 12:01:56 +0000 (15:01 +0300)]
Changed path in description to point to parse_log.sh
It seems that parse_log.sh has moved from /path/to/caffe/scripts/ to /path/to/caffe/tools/extra. The edit changes the description to reflect this change. Nothing major really.
Jeff Donahue [Mon, 4 Aug 2014 23:04:38 +0000 (16:04 -0700)]
Merge pull request #855 from jeffdonahue/sgd-solver-test
SGDSolver tests
Jeff Donahue [Sun, 3 Aug 2014 23:00:46 +0000 (16:00 -0700)]
Add (momentum) SGD solver tests to check that learning rate, weight
decay, and momentum are implemented properly on a least squares problem.
Jeff Donahue [Mon, 4 Aug 2014 20:09:00 +0000 (13:09 -0700)]
Add 'snapshot_after_train' to SolverParameter to override the final
snapshot.
zszhong [Sun, 3 Aug 2014 05:55:06 +0000 (13:55 +0800)]
modified test_concat_layer.cpp
Jeff Donahue [Mon, 4 Aug 2014 19:57:17 +0000 (12:57 -0700)]
Merge pull request #848 from netheril96/random
Fix and improve multiple places about random number generation and shuffling
netheril96 [Mon, 4 Aug 2014 04:28:21 +0000 (12:28 +0800)]
Fix and improve multiple places about random number generation and
shuffling
Yangqing Jia [Sun, 3 Aug 2014 15:53:31 +0000 (08:53 -0700)]
Merge pull request #834 from qipeng/dev
Included cmath in common.hpp to avoid isnan complaints from the xcode co...
Jeff Donahue [Sat, 2 Aug 2014 20:43:39 +0000 (13:43 -0700)]
Merge pull request #840 from jeffdonahue/fix-net-speedtest
Fix speed test tool (and possibly others); add script to speedtest imagenet
Jeff Donahue [Sat, 2 Aug 2014 20:17:15 +0000 (13:17 -0700)]
Fix speedtest (and possibly other tools) by setting the net phase to the
current Caffe::phase() unless explicitly specified in the state.
Jeff Donahue [Sat, 2 Aug 2014 20:10:46 +0000 (13:10 -0700)]
Add tests for phase filtering according to Caffe singleton phase
(currently failing as FilterNet ignores the singleton phase).
Jeff Donahue [Sat, 2 Aug 2014 20:17:09 +0000 (13:17 -0700)]
Add script to speedtest imagenet (currently broken as FilterNet ignores
Caffe::phase()).
Jeff Donahue [Sat, 2 Aug 2014 03:01:12 +0000 (20:01 -0700)]
Merge pull request #839 from jeffdonahue/test-dropout-ratio
Test that DropoutLayer obeys dropout_ratio
Jeff Donahue [Sat, 2 Aug 2014 02:10:16 +0000 (19:10 -0700)]
Test that DropoutLayer obeys dropout_ratio.
qipeng [Fri, 1 Aug 2014 21:53:35 +0000 (14:53 -0700)]
fix compiler complaint in matcaffe
qipeng [Fri, 1 Aug 2014 21:24:22 +0000 (14:24 -0700)]
fixed unnecessary conversions in test_solver, and rearraged common.hpp a bit
qipeng [Fri, 1 Aug 2014 15:28:43 +0000 (08:28 -0700)]
lint
qipeng [Fri, 1 Aug 2014 15:10:19 +0000 (08:10 -0700)]
the compiler complains about solver tests using pointers as bool
qipeng [Fri, 1 Aug 2014 15:09:18 +0000 (08:09 -0700)]
turns out you need using::isnan too
qipeng [Thu, 31 Jul 2014 23:43:21 +0000 (16:43 -0700)]
Included cmath in common.hpp to avoid isnan complaints from the xcode compiler
Evan Shelhamer [Fri, 1 Aug 2014 01:14:12 +0000 (18:14 -0700)]
[example] fix imagenet classification typo
Jeff Donahue [Wed, 30 Jul 2014 19:09:40 +0000 (12:09 -0700)]
Merge pull request #825 from shelhamer/mailing-list
Announce caffe-users mailing list
Evan Shelhamer [Wed, 30 Jul 2014 07:48:35 +0000 (00:48 -0700)]
[example] include image dimensions for oversampling
Evan Shelhamer [Wed, 30 Jul 2014 06:37:09 +0000 (23:37 -0700)]
[docs] announce caffe-users
Evan Shelhamer [Tue, 29 Jul 2014 16:21:39 +0000 (09:21 -0700)]
[example] standardize imagenet leveldb names
Sergey Karayev [Wed, 16 Jul 2014 01:29:19 +0000 (18:29 -0700)]
[fix] adding requirements.txt for web_demo. Closes #704
Sergey Karayev [Tue, 15 Jul 2014 15:13:00 +0000 (08:13 -0700)]
[docs] contact us on webpage
Evan Shelhamer [Wed, 30 Jul 2014 05:57:47 +0000 (22:57 -0700)]
link OpenBLAS as blas
OpenBLAS is most easily configured by `update-alternatives` or other
symlink strategies.
See https://github.com/BVLC/caffe/issues/314#issuecomment-
40703048
Evan Shelhamer [Wed, 30 Jul 2014 05:40:45 +0000 (22:40 -0700)]
[docs] install update: dependencies, CPU-only, Ubuntu 14.04
- update dependency versions
- document CPU-only build
- add Ubuntu 14.04 details
- include LMDB
- warn about defective CUDA driver series 331.*
Jeff Donahue [Wed, 30 Jul 2014 01:30:14 +0000 (18:30 -0700)]
Merge pull request #823 from jeffdonahue/hdf5output-gpu-fix
Apply HDF5OutputLayer fix to GPU version
Jeff Donahue [Wed, 30 Jul 2014 01:13:32 +0000 (18:13 -0700)]
Also apply HDF5OutputLayer fix to GPU version.
Jeff Donahue [Tue, 29 Jul 2014 22:59:49 +0000 (15:59 -0700)]
Set correct solver_mode in SolverTest so Travis build doesn't randomly
fail.
yajiedesign [Fri, 25 Jul 2014 16:01:15 +0000 (00:01 +0800)]
fix some namespace with std::signbit
Jeff Donahue [Tue, 29 Jul 2014 21:10:56 +0000 (14:10 -0700)]
Merge pull request #710 from geenux/dev
Cleanup pthread code for data layers
Jeff Donahue [Tue, 29 Jul 2014 20:53:34 +0000 (13:53 -0700)]
Merge pull request #734 from jeffdonahue/all-in-one-net
All-in-one nets
Jeff Donahue [Fri, 18 Jul 2014 22:07:13 +0000 (15:07 -0700)]
Use unified train/test nets in examples.
Jeff Donahue [Fri, 18 Jul 2014 03:38:53 +0000 (20:38 -0700)]
Incorporate NetState{,Rule} into Solver/Net. Net::FilterNet
includes/excludes layers based on whether the NetState meets each
layer's NetStateRule(s).
Jeff Donahue [Tue, 29 Jul 2014 18:22:52 +0000 (11:22 -0700)]
Add unit tests and skeleton code for Net/Solver filtering functionality.
Jeff Donahue [Fri, 18 Jul 2014 03:12:44 +0000 (20:12 -0700)]
Add NetState message with phase, level, stage; NetStateRule message with
filtering rules for Layers.
Evan Shelhamer [Tue, 29 Jul 2014 16:21:39 +0000 (09:21 -0700)]
[example] standardize imagenet leveldb names
Evan Shelhamer [Tue, 29 Jul 2014 16:03:12 +0000 (09:03 -0700)]
Merge pull request #820 from geenux/dev-fixmake
Fix choice of MKL directory from Makefile.config
TANGUY Arnaud [Tue, 29 Jul 2014 12:08:42 +0000 (14:08 +0200)]
Fix choice MKL directory from Makefile.config