platform/upstream/caffe.git
10 years agofix pycaffe input processing
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

10 years ago[example] include prediction in classification, time on GTX 770
Evan Shelhamer [Tue, 29 Jul 2014 03:16:52 +0000 (20:16 -0700)]
[example] include prediction in classification, time on GTX 770

10 years ago[example] fix example outputs
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.

10 years ago[example] add caffe to pythonpath in all examples
Evan Shelhamer [Tue, 29 Jul 2014 03:10:16 +0000 (20:10 -0700)]
[example] add caffe to pythonpath in all examples

10 years agodefine caffe.Net input preprocessing members by boost::python
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.

10 years agoMerge pull request #856 from jeffdonahue/lint-tweaks
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

10 years agoMerge pull request #859 from beam2d/fix-cifar-lrn-region
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

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

10 years agoFix header alphabetization lint errors.
Jeff Donahue [Sat, 2 Aug 2014 03:14:42 +0000 (20:14 -0700)]
Fix header alphabetization lint errors.

10 years agoEnable the 'build/include_alpha' rules to make lint check that the
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.

10 years agoAdd "lintclean" target to remove current lint outputs -- forces lint to
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.

10 years agoMerge pull request #855 from jeffdonahue/sgd-solver-test
Jeff Donahue [Mon, 4 Aug 2014 23:04:38 +0000 (16:04 -0700)]
Merge pull request #855 from jeffdonahue/sgd-solver-test

SGDSolver tests

10 years agoAdd (momentum) SGD solver tests to check that learning rate, weight
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.

10 years agoAdd 'snapshot_after_train' to SolverParameter to override the final
Jeff Donahue [Mon, 4 Aug 2014 20:09:00 +0000 (13:09 -0700)]
Add 'snapshot_after_train' to SolverParameter to override the final
snapshot.

10 years agomodified test_concat_layer.cpp
zszhong [Sun, 3 Aug 2014 05:55:06 +0000 (13:55 +0800)]
modified test_concat_layer.cpp

10 years agoMerge pull request #848 from netheril96/random
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

10 years agoFix and improve multiple places about random number generation and
netheril96 [Mon, 4 Aug 2014 04:28:21 +0000 (12:28 +0800)]
Fix and improve multiple places about random number generation and
shuffling

10 years agoMerge pull request #834 from qipeng/dev
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...

10 years agoMerge pull request #840 from jeffdonahue/fix-net-speedtest
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

10 years agoFix speedtest (and possibly other tools) by setting the net phase to the
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.

10 years agoAdd tests for phase filtering according to Caffe singleton phase
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).

10 years agoAdd script to speedtest imagenet (currently broken as FilterNet ignores
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()).

10 years agoMerge pull request #839 from jeffdonahue/test-dropout-ratio
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

10 years agoTest that DropoutLayer obeys dropout_ratio.
Jeff Donahue [Sat, 2 Aug 2014 02:10:16 +0000 (19:10 -0700)]
Test that DropoutLayer obeys dropout_ratio.

10 years agofix compiler complaint in matcaffe
qipeng [Fri, 1 Aug 2014 21:53:35 +0000 (14:53 -0700)]
fix compiler complaint in matcaffe

10 years agofixed unnecessary conversions in test_solver, and rearraged common.hpp a bit
qipeng [Fri, 1 Aug 2014 21:24:22 +0000 (14:24 -0700)]
fixed unnecessary conversions in test_solver, and rearraged common.hpp a bit

10 years agolint
qipeng [Fri, 1 Aug 2014 15:28:43 +0000 (08:28 -0700)]
lint

10 years agothe compiler complains about solver tests using pointers as bool
qipeng [Fri, 1 Aug 2014 15:10:19 +0000 (08:10 -0700)]
the compiler complains about solver tests using pointers as bool

10 years agoturns out you need using::isnan too
qipeng [Fri, 1 Aug 2014 15:09:18 +0000 (08:09 -0700)]
turns out you need using::isnan too

10 years agoIncluded cmath in common.hpp to avoid isnan complaints from the xcode compiler
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

10 years ago[example] fix imagenet classification typo
Evan Shelhamer [Fri, 1 Aug 2014 01:14:12 +0000 (18:14 -0700)]
[example] fix imagenet classification typo

10 years agoMerge pull request #825 from shelhamer/mailing-list
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

10 years ago[example] include image dimensions for oversampling
Evan Shelhamer [Wed, 30 Jul 2014 07:48:35 +0000 (00:48 -0700)]
[example] include image dimensions for oversampling

10 years ago[docs] announce caffe-users
Evan Shelhamer [Wed, 30 Jul 2014 06:37:09 +0000 (23:37 -0700)]
[docs] announce caffe-users

10 years ago[example] standardize imagenet leveldb names
Evan Shelhamer [Tue, 29 Jul 2014 16:21:39 +0000 (09:21 -0700)]
[example] standardize imagenet leveldb names

10 years ago[fix] adding requirements.txt for web_demo. Closes #704
Sergey Karayev [Wed, 16 Jul 2014 01:29:19 +0000 (18:29 -0700)]
[fix] adding requirements.txt for web_demo. Closes #704

10 years ago[docs] contact us on webpage
Sergey Karayev [Tue, 15 Jul 2014 15:13:00 +0000 (08:13 -0700)]
[docs] contact us on webpage

10 years agolink OpenBLAS as blas
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

10 years ago[docs] install update: dependencies, CPU-only, Ubuntu 14.04
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.*

10 years agoMerge pull request #823 from jeffdonahue/hdf5output-gpu-fix
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

10 years agoAlso 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.

10 years agoSet correct solver_mode in SolverTest so Travis build doesn't randomly
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.

10 years agofix some namespace with std::signbit
yajiedesign [Fri, 25 Jul 2014 16:01:15 +0000 (00:01 +0800)]
fix some namespace with std::signbit

10 years agoMerge pull request #710 from geenux/dev
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

10 years agoMerge pull request #734 from jeffdonahue/all-in-one-net
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

10 years agoUse unified train/test nets in examples.
Jeff Donahue [Fri, 18 Jul 2014 22:07:13 +0000 (15:07 -0700)]
Use unified train/test nets in examples.

10 years agoIncorporate NetState{,Rule} into Solver/Net. Net::FilterNet
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).

10 years agoAdd unit tests and skeleton code for Net/Solver filtering functionality.
Jeff Donahue [Tue, 29 Jul 2014 18:22:52 +0000 (11:22 -0700)]
Add unit tests and skeleton code for Net/Solver filtering functionality.

10 years agoAdd NetState message with phase, level, stage; NetStateRule message with
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.

10 years agoMerge pull request #820 from geenux/dev-fixmake
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

10 years agoFix choice 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

10 years agoMerge pull request #505 from shelhamer/non-square-filters
Evan Shelhamer [Tue, 29 Jul 2014 08:37:54 +0000 (01:37 -0700)]
Merge pull request #505 from shelhamer/non-square-filters

Non-square Filters and Separated Stride and Padding

10 years agotest non-square filters by separable convolution of Sobel operator
Evan Shelhamer [Tue, 29 Jul 2014 05:43:06 +0000 (22:43 -0700)]
test non-square filters by separable convolution of Sobel operator

Compute the G_x kernel of the Sobel operator as a full filter and as
separable filters to check the rectangular filter output.

10 years agofix GPU indexing
Evan Shelhamer [Tue, 29 Jul 2014 04:47:34 +0000 (21:47 -0700)]
fix GPU indexing

Thanks to @ejaz-izy's debugging in
https://github.com/BVLC/caffe/pull/505#issuecomment-50287608

10 years agotest rectangular im2col
Evan Shelhamer [Wed, 18 Jun 2014 05:08:00 +0000 (22:08 -0700)]
test rectangular im2col

10 years agoim2col + convolve non-square filters, padding, and stride
Evan Shelhamer [Mon, 30 Jun 2014 19:06:27 +0000 (12:06 -0700)]
im2col + convolve non-square filters, padding, and stride

10 years agoadd h/w kernel size, stride, and pad for non-square filtering
Evan Shelhamer [Mon, 16 Jun 2014 07:38:50 +0000 (00:38 -0700)]
add h/w kernel size, stride, and pad for non-square filtering

while keeping everything working as-is.

10 years ago[docs] compile gflags with -fPIC for linking
Evan Shelhamer [Tue, 29 Jul 2014 02:53:44 +0000 (19:53 -0700)]
[docs] compile gflags with -fPIC for linking

10 years ago[docs] install glog first given incompatibility
Evan Shelhamer [Tue, 29 Jul 2014 02:49:10 +0000 (19:49 -0700)]
[docs] install glog first given incompatibility

10 years ago[docs] fix missing glog install cd
Evan Shelhamer [Tue, 29 Jul 2014 02:45:09 +0000 (19:45 -0700)]
[docs] fix missing glog install cd

10 years agoMerge pull request #813 from sergeyk/dev
Sergey Karayev [Mon, 28 Jul 2014 22:29:22 +0000 (15:29 -0700)]
Merge pull request #813 from sergeyk/dev

Fix for bug in HDF5 Output Layer

10 years agomake "all" the default target
Evan Shelhamer [Mon, 28 Jul 2014 22:22:43 +0000 (15:22 -0700)]
make "all" the default target

"all" is the right default since it builds the library itself.
define "everything" after it.

10 years agoFIX: updating HDF5 input test for new test data
Sergey Karayev [Mon, 28 Jul 2014 22:09:47 +0000 (15:09 -0700)]
FIX: updating HDF5 input test for new test data

10 years agoFIX: both data and label now copied correctly in HDF5 output layer
Sergey Karayev [Mon, 28 Jul 2014 21:55:05 +0000 (14:55 -0700)]
FIX: both data and label now copied correctly in HDF5 output layer

10 years agoFIX: tests now catch bug reported in #750 (in HDF5 output layer)
Sergey Karayev [Mon, 28 Jul 2014 21:54:03 +0000 (14:54 -0700)]
FIX: tests now catch bug reported in #750 (in HDF5 output layer)

10 years agoMerge pull request #812 from Yangqing/sweep
Sergey Karayev [Mon, 28 Jul 2014 21:28:09 +0000 (14:28 -0700)]
Merge pull request #812 from Yangqing/sweep

gflags 2.1 bugfix (or rather a hack).

10 years agolint
Yangqing Jia [Mon, 28 Jul 2014 21:16:25 +0000 (14:16 -0700)]
lint

10 years agoMerge pull request #733 from longjon/pycaffe-tweaks
Evan Shelhamer [Mon, 28 Jul 2014 21:14:03 +0000 (14:14 -0700)]
Merge pull request #733 from longjon/pycaffe-tweaks

pycaffe fixes

10 years agofixing comment
Yangqing Jia [Mon, 28 Jul 2014 20:44:40 +0000 (13:44 -0700)]
fixing comment

10 years agogflags 2.1 bugfix (or rather a hack).
Yangqing Jia [Mon, 28 Jul 2014 20:38:38 +0000 (13:38 -0700)]
gflags 2.1 bugfix (or rather a hack).

10 years agoMerge pull request #805 from alfredtofu/dev
Yangqing Jia [Mon, 28 Jul 2014 15:12:18 +0000 (08:12 -0700)]
Merge pull request #805 from alfredtofu/dev

Update image_data_layer.cpp

10 years agoMerge pull request #807 from qipeng/dev
Jeff Donahue [Mon, 28 Jul 2014 08:05:46 +0000 (01:05 -0700)]
Merge pull request #807 from qipeng/dev

relaxed timer test requirements

10 years agoset_mode to CPU in ArgMaxLayerTest constructor to avoid random Travis
Jeff Donahue [Sun, 27 Jul 2014 22:02:38 +0000 (15:02 -0700)]
set_mode to CPU in ArgMaxLayerTest constructor to avoid random Travis
failures.

10 years agoMerge pull request #806 from jeffdonahue/travis-minimal-cuda
Jeff Donahue [Mon, 28 Jul 2014 04:10:31 +0000 (21:10 -0700)]
Merge pull request #806 from jeffdonahue/travis-minimal-cuda

speed up Travis build by installing only the CUDA subpackages necessary for building

10 years agoOnly install the minimal CUDA subpackages necessary for building.
Jeff Donahue [Mon, 28 Jul 2014 02:02:58 +0000 (19:02 -0700)]
Only install the minimal CUDA subpackages necessary for building.

10 years agoUpdate image_data_layer.cpp
alfredtofu [Mon, 28 Jul 2014 02:19:51 +0000 (10:19 +0800)]
Update image_data_layer.cpp

fix bug for getting new width

10 years agorelaxed timer test requirements
qipeng [Sun, 27 Jul 2014 22:52:59 +0000 (15:52 -0700)]
relaxed timer test requirements

10 years agoMerge pull request #802 from jeffdonahue/caffe-bin-symlink
Yangqing Jia [Sun, 27 Jul 2014 20:04:33 +0000 (13:04 -0700)]
Merge pull request #802 from jeffdonahue/caffe-bin-symlink

Symlink to tool bins without the .bin extension

10 years agoSymlink to tool bins without the .bin extension
Jeff Donahue [Sun, 27 Jul 2014 19:50:13 +0000 (12:50 -0700)]
Symlink to tool bins without the .bin extension

10 years agoMerge pull request #800 from jeffdonahue/zero-indexed-train-iter
Jeff Donahue [Sun, 27 Jul 2014 19:13:03 +0000 (12:13 -0700)]
Merge pull request #800 from jeffdonahue/zero-indexed-train-iter

Make training iterations 0-indexed to display training loss in 0th iter

10 years agoMove loss display before lr display in ComputeUpdateValue.
Jeff Donahue [Sun, 27 Jul 2014 03:57:07 +0000 (20:57 -0700)]
Move loss display before lr display in ComputeUpdateValue.

10 years agoMake training iterations 0-indexed.
Jeff Donahue [Sun, 27 Jul 2014 00:03:27 +0000 (17:03 -0700)]
Make training iterations 0-indexed.

10 years agoFix my nonsensical variable names.
Jeff Donahue [Sun, 27 Jul 2014 02:53:15 +0000 (19:53 -0700)]
Fix my nonsensical variable names.

10 years agoMerge pull request #796 from jeffdonahue/solver-debug-info
Jeff Donahue [Sat, 26 Jul 2014 23:37:06 +0000 (16:37 -0700)]
Merge pull request #796 from jeffdonahue/solver-debug-info

Print blob debug info during training if SolverParameter "debug_info" field is set

10 years agoPrint just the mean absolute value (no sum/l1norm)
Jeff Donahue [Sat, 26 Jul 2014 22:18:41 +0000 (15:18 -0700)]
Print just the mean absolute value (no sum/l1norm)

10 years agoPrint blob L1 norms during forward/backward passes and updates if
Jeff Donahue [Sat, 26 Jul 2014 03:40:07 +0000 (20:40 -0700)]
Print blob L1 norms during forward/backward passes and updates if
new "debug_info" field in SolverParameter is set.

10 years agoMerge pull request #789 from Yangqing/sweep
Yangqing Jia [Sat, 26 Jul 2014 15:47:43 +0000 (08:47 -0700)]
Merge pull request #789 from Yangqing/sweep

Consolidate tools.

10 years agoLOG(ERROR)->LOG(FATAL), and misc script changes.
Yangqing Jia [Sat, 26 Jul 2014 15:37:05 +0000 (08:37 -0700)]
LOG(ERROR)->LOG(FATAL), and misc script changes.

10 years agoMerge pull request #793 from jeffdonahue/infogain-test
Jeff Donahue [Sat, 26 Jul 2014 02:18:47 +0000 (19:18 -0700)]
Merge pull request #793 from jeffdonahue/infogain-test

Add gradient checks for InfogainLossLayer

10 years agousing caffe::string to be consistent with other string definition.
Yangqing Jia [Sat, 26 Jul 2014 00:58:35 +0000 (17:58 -0700)]
using caffe::string to be consistent with other string definition.

10 years agoAdd gradient checks for infogain loss layer, letting it take the
Jeff Donahue [Thu, 24 Jul 2014 02:22:11 +0000 (19:22 -0700)]
Add gradient checks for infogain loss layer, letting it take the
infogain matrix as the third bottom blob.

10 years agooops, wrong deprecation message (should have --)
Yangqing Jia [Fri, 25 Jul 2014 17:11:26 +0000 (10:11 -0700)]
oops, wrong deprecation message (should have --)

10 years agolint
Yangqing Jia [Fri, 25 Jul 2014 16:52:30 +0000 (09:52 -0700)]
lint

10 years agoAdding new caffe binary that does everything in one binary; deprecating device_query...
Yangqing Jia [Fri, 25 Jul 2014 16:02:37 +0000 (09:02 -0700)]
Adding new caffe binary that does everything in one binary; deprecating device_query, finetune_net, net_speed_benchmark, train_net

10 years agoinclude benchmark.hpp
Yangqing Jia [Fri, 25 Jul 2014 16:02:03 +0000 (09:02 -0700)]
include benchmark.hpp

10 years agoMerge pull request #776 from Yangqing/sweep
Yangqing Jia [Thu, 24 Jul 2014 21:15:45 +0000 (14:15 -0700)]
Merge pull request #776 from Yangqing/sweep

Gflags dependency & misc

10 years agotravis: gflags still needs -fPIC, otherwise it makes caffe cry.
Yangqing Jia [Thu, 24 Jul 2014 18:05:58 +0000 (11:05 -0700)]
travis: gflags still needs -fPIC, otherwise it makes caffe cry.

10 years agoI am really bad at debugging travis.
Yangqing Jia [Thu, 24 Jul 2014 17:53:53 +0000 (10:53 -0700)]
I am really bad at debugging travis.

10 years agoturns out that glog does not compile with gflags 2.1 - compiling glog first and then...
Yangqing Jia [Thu, 24 Jul 2014 17:48:04 +0000 (10:48 -0700)]
turns out that glog does not compile with gflags 2.1 - compiling glog first and then gflags.

10 years agotravis - does adding cflags help? want to keep minimal invasion into gflags installation.
Yangqing Jia [Thu, 24 Jul 2014 17:28:06 +0000 (10:28 -0700)]
travis - does adding cflags help? want to keep minimal invasion into gflags installation.