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
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.
Sergey Karayev [Mon, 28 Jul 2014 22:09:47 +0000 (15:09 -0700)]
FIX: updating HDF5 input test for new test data
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
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)
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).
Yangqing Jia [Mon, 28 Jul 2014 21:16:25 +0000 (14:16 -0700)]
lint
Evan Shelhamer [Mon, 28 Jul 2014 21:14:03 +0000 (14:14 -0700)]
Merge pull request #733 from longjon/pycaffe-tweaks
pycaffe fixes
Yangqing Jia [Mon, 28 Jul 2014 20:44:40 +0000 (13:44 -0700)]
fixing comment
Yangqing Jia [Mon, 28 Jul 2014 20:38:38 +0000 (13:38 -0700)]
gflags 2.1 bugfix (or rather a hack).
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
Jeff Donahue [Mon, 28 Jul 2014 08:05:46 +0000 (01:05 -0700)]
Merge pull request #807 from qipeng/dev
relaxed timer test requirements
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.
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
Jeff Donahue [Mon, 28 Jul 2014 02:02:58 +0000 (19:02 -0700)]
Only install the minimal CUDA subpackages necessary for building.
alfredtofu [Mon, 28 Jul 2014 02:19:51 +0000 (10:19 +0800)]
Update image_data_layer.cpp
fix bug for getting new width
qipeng [Sun, 27 Jul 2014 22:52:59 +0000 (15:52 -0700)]
relaxed timer test requirements
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
Jeff Donahue [Sun, 27 Jul 2014 19:50:13 +0000 (12:50 -0700)]
Symlink to tool bins without the .bin extension
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
Jeff Donahue [Sun, 27 Jul 2014 03:57:07 +0000 (20:57 -0700)]
Move loss display before lr display in ComputeUpdateValue.
Jeff Donahue [Sun, 27 Jul 2014 00:03:27 +0000 (17:03 -0700)]
Make training iterations 0-indexed.
Jeff Donahue [Sun, 27 Jul 2014 02:53:15 +0000 (19:53 -0700)]
Fix my nonsensical variable names.
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
Jeff Donahue [Sat, 26 Jul 2014 22:18:41 +0000 (15:18 -0700)]
Print just the mean absolute value (no sum/l1norm)
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.
Yangqing Jia [Sat, 26 Jul 2014 15:47:43 +0000 (08:47 -0700)]
Merge pull request #789 from Yangqing/sweep
Consolidate tools.
Yangqing Jia [Sat, 26 Jul 2014 15:37:05 +0000 (08:37 -0700)]
LOG(ERROR)->LOG(FATAL), and misc script changes.
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
Yangqing Jia [Sat, 26 Jul 2014 00:58:35 +0000 (17:58 -0700)]
using caffe::string to be consistent with other string definition.
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.
Yangqing Jia [Fri, 25 Jul 2014 17:11:26 +0000 (10:11 -0700)]
oops, wrong deprecation message (should have --)
Yangqing Jia [Fri, 25 Jul 2014 16:52:30 +0000 (09:52 -0700)]
lint
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
Yangqing Jia [Fri, 25 Jul 2014 16:02:03 +0000 (09:02 -0700)]
include benchmark.hpp
Yangqing Jia [Thu, 24 Jul 2014 21:15:45 +0000 (14:15 -0700)]
Merge pull request #776 from Yangqing/sweep
Gflags dependency & misc
Yangqing Jia [Thu, 24 Jul 2014 18:05:58 +0000 (11:05 -0700)]
travis: gflags still needs -fPIC, otherwise it makes caffe cry.
Yangqing Jia [Thu, 24 Jul 2014 17:53:53 +0000 (10:53 -0700)]
I am really bad at debugging travis.
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.
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.
Yangqing Jia [Thu, 24 Jul 2014 16:28:46 +0000 (09:28 -0700)]
travis
Yangqing Jia [Thu, 24 Jul 2014 05:49:16 +0000 (22:49 -0700)]
gflags should preferrably be installed before glog
Yangqing Jia [Thu, 24 Jul 2014 05:47:58 +0000 (22:47 -0700)]
add gflags dependency doc
Yangqing Jia [Thu, 24 Jul 2014 05:47:25 +0000 (22:47 -0700)]
add gflags dependency to caffe.
Jeff Donahue [Wed, 23 Jul 2014 19:22:09 +0000 (12:22 -0700)]
Merge pull request #773 from qipeng/lrelu
Leaky ReLU numerical stability improvement
qipeng [Wed, 23 Jul 2014 18:48:19 +0000 (11:48 -0700)]
numerical stability improvement
Jeff Donahue [Wed, 23 Jul 2014 18:36:40 +0000 (11:36 -0700)]
Merge pull request #766 from rbgirshick/matcaffe-cxx
Use the same CXX for matcaffe as for the rest of the build
Ross Girshick [Wed, 23 Jul 2014 03:06:48 +0000 (20:06 -0700)]
Use the same CXX for matcaffe as for the rest of the build
Jeff Donahue [Tue, 22 Jul 2014 20:12:18 +0000 (13:12 -0700)]
Merge pull request #762 from rbgirshick/upgrade-pad-pooling-layers
Correctly apply padding to pooling layers when upgrading from V0
Jeff Donahue [Tue, 22 Jul 2014 20:00:45 +0000 (13:00 -0700)]
Merge pull request #760 from bhack/fix_loopcopy
Fix repeated field copy loop
Ross Girshick [Tue, 22 Jul 2014 19:51:48 +0000 (12:51 -0700)]
Correctly apply padding to pooling layers when upgrading from V0
bhack [Tue, 22 Jul 2014 17:25:45 +0000 (19:25 +0200)]
Fix repeated field copy loop
Fix lint algorithm include
Fix spaces
Jeff Donahue [Tue, 22 Jul 2014 08:56:36 +0000 (01:56 -0700)]
Merge pull request #755 from jeffdonahue/bhack-split_dim
Finishing touches on @bhack's SliceLayer (#680)
Jeff Donahue [Tue, 22 Jul 2014 07:44:53 +0000 (00:44 -0700)]
SliceLayer: post-rebase fixes, cleanup, etc. (some from changes
suggested by @sguada). Test for both num & channels in forward &
backward; use GaussianFiller so that tests are non-trivial.
bhack [Sat, 12 Jul 2014 23:09:10 +0000 (01:09 +0200)]
Add split dim layer
Differentiate top test blob vector size
Rename to SplitLayer
Add slicing points
Jeff Donahue [Tue, 22 Jul 2014 04:51:16 +0000 (21:51 -0700)]
Merge pull request #740 from qipeng/lrelu
Leaky ReLU
qipeng [Sun, 20 Jul 2014 00:28:52 +0000 (17:28 -0700)]
reduced multiplications & fixed unit test
qipeng [Sat, 19 Jul 2014 20:24:01 +0000 (13:24 -0700)]
leaky relu + unit test
Jeff Donahue [Mon, 21 Jul 2014 17:25:59 +0000 (10:25 -0700)]
Merge pull request #752 from Yangqing/sweep
reapply namespace change
Jeff Donahue [Sun, 20 Jul 2014 20:23:23 +0000 (13:23 -0700)]
Merge pull request #742 from longjon/direct-blob-buffers
Use Blob directly instead of shared_ptr for internal layer buffers
Jeff Donahue [Sun, 20 Jul 2014 20:13:01 +0000 (13:13 -0700)]
Merge pull request #743 from longjon/make-everything
Add an "everything" target to make for comprehensive build testing
Jonathan L Long [Sun, 20 Jul 2014 10:09:55 +0000 (03:09 -0700)]
Merge pull request #615 from kloudkl/top-k-argmax
Jonathan L Long [Sun, 20 Jul 2014 09:29:15 +0000 (02:29 -0700)]
remove unused includes in AccuracyLayer and ArgMaxLayer
Jonathan L Long [Sun, 20 Jul 2014 02:16:11 +0000 (19:16 -0700)]
Merge pull request #518 from longjon/fromto
Add From/To options for Forward and Backward
Jonathan L Long [Sun, 20 Jul 2014 01:51:15 +0000 (18:51 -0700)]
add an "everything" target to make for comprehensive build testing
The everything target builds all components, checks warnings, runs lint,
and runs tests.
Jonathan L Long [Sun, 20 Jul 2014 01:22:28 +0000 (18:22 -0700)]
use Blob directly instead of shared_ptr for WindowDataLayer buffers
Jonathan L Long [Sun, 20 Jul 2014 01:18:03 +0000 (18:18 -0700)]
use Blob directly instead of shared_ptr for ImageDataLayer buffers
Jonathan L Long [Sun, 20 Jul 2014 01:14:53 +0000 (18:14 -0700)]
use Blob directly instead of shared_ptr for DataLayer buffers
Jonathan L Long [Tue, 1 Jul 2014 19:52:48 +0000 (12:52 -0700)]
use Blob directly instead of shared_ptr for DropoutLayer::rand_vec_
This will simplify the implementation of Reshape by making allocation
automatic. There is no need for shared_ptr here, and this is more
uniform with buffers used by other layers.
Jonathan L Long [Tue, 1 Jul 2014 20:20:01 +0000 (13:20 -0700)]
use Blob directly instead of shared_ptr for PoolingLayer::max_idx_
Again, this is more uniform, and will simplify the implementation of
Reshape.
Jonathan L Long [Sun, 20 Jul 2014 01:02:33 +0000 (18:02 -0700)]
use Blob directly instead of shared_ptr for InnerProductLayer::bias_multiplier_
Jonathan L Long [Tue, 1 Jul 2014 06:11:11 +0000 (23:11 -0700)]
use Blob directly instead of shared_ptr for ConvolutionLayer::bias_multiplier_
This will make layer reshaping easier and more uniform, and is
consistent with col_buffer_.
Kai Li [Sat, 19 Jul 2014 16:42:12 +0000 (00:42 +0800)]
Fix style issues in accuracy & argmax layer
Kai Li [Sat, 12 Jul 2014 16:29:54 +0000 (00:29 +0800)]
Include <utility> for pair in the accuracy layer
Kai Li [Fri, 11 Jul 2014 02:22:01 +0000 (10:22 +0800)]
Limit the comparison functions to have file scope
Kai Li [Thu, 10 Jul 2014 01:38:03 +0000 (09:38 +0800)]
Add more test cases for the accuracy layer
Kai Li [Thu, 10 Jul 2014 01:37:34 +0000 (09:37 +0800)]
Refactor the accuracy layer with std::partial_sort
Kai Li [Thu, 10 Jul 2014 01:06:11 +0000 (09:06 +0800)]
Move compararing function from common_layers to argmax_layer
Kai Li [Wed, 9 Jul 2014 09:30:05 +0000 (17:30 +0800)]
Use std::partial_sort in the ArgMaxLayer as suggested by @shuokay
Kai Li [Tue, 8 Jul 2014 14:24:20 +0000 (22:24 +0800)]
Simplify the top-k argmax layer using std::sort
Kai Li [Sat, 5 Jul 2014 09:17:12 +0000 (17:17 +0800)]
Add the test cases for the mulitple top predictions argmax layer
Kai Li [Fri, 4 Jul 2014 09:19:24 +0000 (17:19 +0800)]
Extend the ArgMaxLayer to output top k results
Jonathan L Long [Fri, 18 Jul 2014 23:45:17 +0000 (16:45 -0700)]
pycaffe: test channel_order and input_scale against None
An input_scale of zero should produce warnings/errors/infinities rather
than being the same as an input_scale of one. A channel_order of () or 0
should not be equivalent to the default ordering.
Jonathan L Long [Fri, 18 Jul 2014 23:32:12 +0000 (16:32 -0700)]
pycaffe: reorder exceptions
It doesn't make sense to complain about input not being batch-sized if
it isn't even 4-d in the first place.
Jonathan L Long [Fri, 18 Jul 2014 23:31:16 +0000 (16:31 -0700)]
pycaffe: allow unspecified mean. Fixes #671.
Jeff Donahue [Fri, 18 Jul 2014 23:37:50 +0000 (16:37 -0700)]
Merge pull request #732 from longjon/travis-pycaffe
Have Travis build pycaffe
Jonathan L Long [Fri, 18 Jul 2014 22:48:36 +0000 (15:48 -0700)]
Travis builds pycaffe
Jonathan L Long [Fri, 18 Jul 2014 23:13:24 +0000 (16:13 -0700)]
use /usr instead of /usr/local for default Python include/lib
This makes the default settings usable with Travis/Ubuntu Python
Jonathan L Long [Fri, 18 Jul 2014 22:39:17 +0000 (15:39 -0700)]
test consistency of From/To Forward/Backward
Jonathan L Long [Fri, 18 Jul 2014 22:36:39 +0000 (15:36 -0700)]
comment in net.hpp to explain subtleties of From/To on DAGs
Jonathan L Long [Thu, 19 Jun 2014 04:03:28 +0000 (21:03 -0700)]
pycaffe: expose Forward/Backward From/To as kwargs start and end
Jonathan L Long [Tue, 18 Feb 2014 00:35:38 +0000 (16:35 -0800)]
add Net::Forward/Backward From/To
Yangqing Jia [Fri, 18 Jul 2014 22:18:14 +0000 (15:18 -0700)]
reapply namespace change
Yangqing Jia [Fri, 18 Jul 2014 20:45:41 +0000 (13:45 -0700)]
Merge pull request #730 from Yangqing/sweep
cosmetics: add syntax = proto2
Yangqing Jia [Fri, 18 Jul 2014 20:32:25 +0000 (13:32 -0700)]
cosmetics: add syntax = proto2
Yangqing Jia [Fri, 18 Jul 2014 00:53:24 +0000 (17:53 -0700)]
Merge pull request #718 from Yangqing/dev
More namespace cleaning.
Yangqing Jia [Fri, 18 Jul 2014 00:01:17 +0000 (17:01 -0700)]
lint
Jeff Donahue [Thu, 17 Jul 2014 19:46:18 +0000 (12:46 -0700)]
Merge pull request #716 from Yangqing/dev
Minor Code Cleaning
Yangqing Jia [Thu, 17 Jul 2014 19:18:27 +0000 (12:18 -0700)]
compute_image_mean namespace fix.
Evan Shelhamer [Thu, 17 Jul 2014 10:35:00 +0000 (12:35 +0200)]
Merge pull request #561 from shelhamer/cpu-only-build
CPU-only build
no GPU, no CUDA, no problem!