Evan Shelhamer [Tue, 17 Feb 2015 20:02:55 +0000 (12:02 -0800)]
Merge pull request #1790 from shelhamer/net-phase
Give phase to Net
Evan Shelhamer [Mon, 26 Jan 2015 06:06:23 +0000 (22:06 -0800)]
[matcaffe] give phase to Net
Evan Shelhamer [Mon, 26 Jan 2015 04:57:23 +0000 (20:57 -0800)]
[pycaffe] give phase to Net
- expose `caffe.{TRAIN,TEST}` constants
- instantiate `caffe.Net`s with phase
- drop singleton phase interface `caffe.set_phase_{train,test}`
Evan Shelhamer [Sat, 24 Jan 2015 06:49:38 +0000 (22:49 -0800)]
tools make net with phase
Evan Shelhamer [Sat, 24 Jan 2015 06:48:42 +0000 (22:48 -0800)]
construct Net from file and phase
Evan Shelhamer [Fri, 23 Jan 2015 09:33:09 +0000 (01:33 -0800)]
no phase for the solver to orchestrate
Evan Shelhamer [Fri, 23 Jan 2015 09:31:53 +0000 (01:31 -0800)]
pass phase to transformer through layer
Evan Shelhamer [Fri, 23 Jan 2015 08:31:28 +0000 (00:31 -0800)]
give phase to Net and Layer
Give the responsibility for phase to Net and Layer, making phase an
immutable choice at instantiation and dropping it from the Caffe
singleton.
Evan Shelhamer [Tue, 17 Feb 2015 09:34:31 +0000 (01:34 -0800)]
Merge pull request #1703 from longjon/pyreformation
Reform the boost::python wrapper, including layers implemented in Python
Evan Shelhamer [Tue, 17 Feb 2015 09:20:42 +0000 (01:20 -0800)]
Merge pull request #1887 from shelhamer/docs
Documentation: README, credits, favicon, installation, and workflow
Jonathan L Long [Tue, 17 Feb 2015 09:19:51 +0000 (01:19 -0800)]
[make] link libcaffe.so before dependencies
Evan Shelhamer [Tue, 17 Feb 2015 09:07:05 +0000 (01:07 -0800)]
[docs] explain one true branch and dev workflow
Evan Shelhamer [Tue, 17 Feb 2015 08:46:14 +0000 (00:46 -0800)]
[docs] update and split installation
Evan Shelhamer [Tue, 10 Feb 2015 21:26:11 +0000 (13:26 -0800)]
switch to V2 proto definitions for pytest
Jonathan L Long [Sat, 10 Jan 2015 09:51:39 +0000 (01:51 -0800)]
[travis] enable Python layer for testing
Evan Shelhamer [Sat, 14 Feb 2015 09:59:43 +0000 (01:59 -0800)]
except PythonLayer from layer factory test
PythonLayer (rightfully) refuses to be instantiated when a module and
class aren't given. It's still covered by tests however through pytest.
Jonathan L Long [Sat, 10 Jan 2015 06:57:26 +0000 (22:57 -0800)]
add WITH_PYTHON_LAYER build option to include Python layer
Currently, this will only work when running from pycaffe (but not the
tool binary), due to static linking conflicts with registration.
Jonathan L Long [Thu, 8 Jan 2015 00:36:35 +0000 (16:36 -0800)]
[pytest] basic test of Python layer
Jonathan L Long [Wed, 7 Jan 2015 05:42:46 +0000 (21:42 -0800)]
[pytest] test that get_solver runs
Jonathan L Long [Thu, 8 Jan 2015 00:56:08 +0000 (16:56 -0800)]
[pycaffe] allow Layer to be extended from Python
This is done by adding PythonLayer as a boost::python HeldType.
Jonathan L Long [Tue, 17 Feb 2015 03:18:15 +0000 (19:18 -0800)]
LayerRegistry uses shared_ptr instead of raw pointers
Sometimes it's useful for CreateLayer to return a Layer already in use
by another object (e.g., by a Python wrapper). With raw pointers, there
is no way to properly share owership.
Jonathan L Long [Tue, 6 Jan 2015 05:53:51 +0000 (21:53 -0800)]
[pycaffe] re-expose SGDSolver, and expose other solvers
Jonathan L Long [Tue, 6 Jan 2015 05:16:51 +0000 (21:16 -0800)]
[pycaffe] re-expose Layer
Jonathan L Long [Tue, 6 Jan 2015 05:02:04 +0000 (21:02 -0800)]
[pycaffe] re-expose Blob
Jonathan L Long [Tue, 6 Jan 2015 03:31:27 +0000 (19:31 -0800)]
[pycaffe] re-expose Net
Jonathan L Long [Thu, 8 Jan 2015 00:47:52 +0000 (16:47 -0800)]
[pycaffe] expose global ("Caffe::") functions
Jonathan L Long [Mon, 5 Jan 2015 23:19:25 +0000 (15:19 -0800)]
[pycaffe] strike down wrappers, momentarily gut all functionality
Jonathan L Long [Tue, 6 Jan 2015 06:19:20 +0000 (22:19 -0800)]
[pycaffe] enable numpy API deprecation warnings
Evan Shelhamer [Tue, 17 Feb 2015 06:38:58 +0000 (22:38 -0800)]
Merge pull request #1842 from shelhamer/dynamic-linking
Dynamic Linking
Evan Shelhamer [Tue, 17 Feb 2015 06:22:49 +0000 (22:22 -0800)]
[docs] groom index and zoo for highlights
Evan Shelhamer [Tue, 17 Feb 2015 05:47:20 +0000 (21:47 -0800)]
[docs] Caffe is by the BVLC, created by Yangqing, and brewed by Evan
Evan Shelhamer [Sat, 20 Sep 2014 07:16:17 +0000 (00:16 -0700)]
[docs] include caffeine favicon for site
Evan Shelhamer [Sat, 7 Feb 2015 08:33:15 +0000 (00:33 -0800)]
only dynamically link the tests
No need to independently test static and dynamic linking.
Evan Shelhamer [Sat, 7 Feb 2015 08:19:54 +0000 (00:19 -0800)]
dynamic linking
Evan Shelhamer [Tue, 17 Feb 2015 05:41:24 +0000 (21:41 -0800)]
[docs] README dispatch
Evan Shelhamer [Tue, 17 Feb 2015 05:03:31 +0000 (21:03 -0800)]
Merge pull request #1878 from philkr/encoded
Groom handling of encoded image inputs
Evan Shelhamer [Tue, 17 Feb 2015 05:00:04 +0000 (21:00 -0800)]
[docs] note new CMake build
Evan Shelhamer [Tue, 17 Feb 2015 04:55:15 +0000 (20:55 -0800)]
Merge pull request #1667 from Nerei/feature/cmake_well_done
Improve CMake build with automation, options, and more.
Anatoly Baksheev [Sun, 1 Feb 2015 14:45:31 +0000 (17:45 +0300)]
cmake 2.8.7. support
Anatoly Baksheev [Sun, 18 Jan 2015 20:22:09 +0000 (23:22 +0300)]
[travis] proper cmake params
Anatoly Baksheev [Sun, 18 Jan 2015 19:55:26 +0000 (22:55 +0300)]
opencv 3.0 compilation (replace #1714)
Anatoly Baksheev [Wed, 17 Dec 2014 09:09:14 +0000 (12:09 +0300)]
improve CMake build
Anatoly Baksheev [Sat, 20 Dec 2014 15:22:47 +0000 (18:22 +0300)]
ignore qtcreator files
philkr [Mon, 16 Feb 2015 19:42:22 +0000 (11:42 -0800)]
Cleaning up the encoded flag. Allowing any image (cropped or gray scale) to be encoded. Allowing for a change in encoded (jpg -> png vice versa) and cleaning up some unused functions.
Evan Shelhamer [Tue, 17 Feb 2015 04:31:52 +0000 (20:31 -0800)]
Merge pull request #1313 from shelhamer/reshape-data-layer
Reshape single input batches for inputs of varying dimension
Evan Shelhamer [Fri, 6 Feb 2015 00:31:52 +0000 (16:31 -0800)]
test reshaping DATA and IMAGE_DATA
Evan Shelhamer [Fri, 17 Oct 2014 05:52:30 +0000 (22:52 -0700)]
reshape DATA + IMAGE_DATA for inputs of varying dimension
To feed inputs of varying dimension, the `DATA` and `IMAGE_DATA` layer
reshapes its prefetch and top blobs when the batch size is 1.
The `BasePrefetchingDataLayer` always reshapes on forward.
Evan Shelhamer [Tue, 17 Feb 2015 00:26:03 +0000 (16:26 -0800)]
Merge pull request #1884 from tnarihi/fix-python-draw
Fix `draw` to support new protobuf format
Takuya Narihira [Tue, 17 Feb 2015 00:06:03 +0000 (16:06 -0800)]
Fix `draw` to support new protobuf format
James Steven Supancic III [Thu, 12 Feb 2015 21:57:25 +0000 (13:57 -0800)]
Fix Draw Net Problem #1709
Introduced by Layer type is a string #1694
Jeff Donahue [Mon, 16 Feb 2015 01:14:11 +0000 (17:14 -0800)]
Merge pull request #1874 from jeffdonahue/blob-math-test-precision
BlobMathTest: fix precision issues
Jeff Donahue [Mon, 16 Feb 2015 01:05:10 +0000 (17:05 -0800)]
BlobMathTest: fixes for numerical precision issues
Jeff Donahue [Sat, 14 Feb 2015 01:41:43 +0000 (17:41 -0800)]
Merge pull request #1757 from jeffdonahue/clip-grads
Gradient clipping
Jeff Donahue [Tue, 7 Oct 2014 06:46:48 +0000 (23:46 -0700)]
Add gradient clipping -- limit L2 norm of parameter gradients
Jeff Donahue [Mon, 19 Jan 2015 22:49:39 +0000 (14:49 -0800)]
add Net::param_owners accessor for param sharing info
Jeff Donahue [Tue, 7 Oct 2014 06:45:43 +0000 (23:45 -0700)]
Blob: add scale_{data,diff} methods and tests
Jeff Donahue [Thu, 5 Feb 2015 22:04:35 +0000 (14:04 -0800)]
SoftmaxWithLossLayer fix: takes exactly 2 bottom blobs (inherited from
LossLayer)
Evan Shelhamer [Tue, 10 Feb 2015 19:43:12 +0000 (11:43 -0800)]
Merge pull request #1841 from shelhamer/no-memory-or-hdf5-transform
HDF5_DATA + MEMORY_DATA refuse loudly to transform
Evan Shelhamer [Tue, 10 Feb 2015 19:21:45 +0000 (11:21 -0800)]
Merge pull request #1851 from jeffdonahue/cudnn-layer-factory-test-fix
Fix for CuDNN layer tests: only destroy handles if setup
Jeff Donahue [Tue, 10 Feb 2015 02:08:50 +0000 (18:08 -0800)]
Fixes for CuDNN layers: only destroy handles if setup
Jon Long [Mon, 9 Feb 2015 09:13:16 +0000 (01:13 -0800)]
Merge pull request #1838 from DmitryUlyanov/dev
Bug in MemoryData that does not allow using arrays with n_ * size_ > 2^31
Evan Shelhamer [Sat, 7 Feb 2015 07:12:33 +0000 (23:12 -0800)]
HDF5_DATA + MEMORY_DATA refuse loudly to transform
These layers are meant for generic inputs so they do not do
transformations. As `transform_param` was pulled out of data layers'
proto definitions for reuse, these layers silently ignored
transformation parameters until now instead of signalling their refusal.
Dmitry Ulyanov [Fri, 6 Feb 2015 07:56:47 +0000 (10:56 +0300)]
Allow using arrays with n_ * size_ > 2^31
uint64_t
size_t
Evan Shelhamer [Sat, 7 Feb 2015 06:05:12 +0000 (22:05 -0800)]
Merge pull request #1416 from mtamburrano/matVector
Feed cv::Mats to MemoryDataLayer and set batch size on-the-fly.
Evan Shelhamer [Sat, 7 Feb 2015 05:37:54 +0000 (21:37 -0800)]
groom #1416
- keep current `DataTransformer` check so that datums can be transformed
into a blob incrementally
- standardize check messages
- include opencv where needed, drop unneeded OS X guards
TODO these tests need to be de-duped
manuele [Mon, 12 Jan 2015 11:22:49 +0000 (12:22 +0100)]
removed needs_reshape_ and ChangeBatchSize is now set_batch_size
manuele [Thu, 8 Jan 2015 18:26:20 +0000 (19:26 +0100)]
small fixes
manuele [Tue, 9 Dec 2014 14:12:28 +0000 (15:12 +0100)]
MemoryDataLayer now correctly consumes batch_size elements
manuele [Mon, 10 Nov 2014 18:24:02 +0000 (19:24 +0100)]
MemoryDataLayer now accepts dynamic batch_size
manuele [Fri, 7 Nov 2014 19:01:33 +0000 (20:01 +0100)]
Added opencv vector<Mat> to memory data layer with tests
Evan Shelhamer [Sat, 7 Feb 2015 04:40:40 +0000 (20:40 -0800)]
Merge pull request #1789 from SaganBolliger/softmax_loss_gpu
GPU version of SoftmaxWithLossLayer
Sagan Bolliger [Fri, 6 Feb 2015 20:54:32 +0000 (12:54 -0800)]
Added GPU implementation of SoftmaxWithLossLayer.
Jeff Donahue [Fri, 6 Feb 2015 19:47:49 +0000 (11:47 -0800)]
Merge pull request #1837 from shelhamer/image-fail-die
Die on inputs that fail to load
Jeff Donahue [Fri, 6 Feb 2015 19:46:48 +0000 (11:46 -0800)]
Merge pull request #1840 from shelhamer/fix-power-test
Fix PowerLayer gradient check failures by reducing step size
Evan Shelhamer [Fri, 6 Feb 2015 09:37:02 +0000 (01:37 -0800)]
reduce step size in PowerLayer gradient checks: fix #1252
The gradient checker fails on certain elements of the PowerLayer checks,
but only 1-3 sometimes fail out of the 120 elements tested. This is not
due to any numerical issue in the PowerLayer, but the distribution of
the random inputs for the checks.
boost 1.56 switched the normal distribution RNG engine from Box-Muller
to Ziggurat.
Evan Shelhamer [Fri, 6 Feb 2015 08:51:25 +0000 (00:51 -0800)]
build with libc++ on Yosmite with CUDA 7
Jeff Donahue [Fri, 6 Feb 2015 04:05:20 +0000 (20:05 -0800)]
Merge pull request #1836 from jeffdonahue/loss-param-upgrade-fix
fix for layer-type-str: loss_param in V1LayerParameter
Jeff Donahue [Fri, 6 Feb 2015 03:28:42 +0000 (19:28 -0800)]
fix for layer-type-str: loss_param and DECONVOLUTION type should have
been included in V1LayerParameter, get upgraded
Evan Shelhamer [Fri, 6 Feb 2015 00:41:46 +0000 (16:41 -0800)]
die on inputs to IMAGE_DATA that fail to load
It's better to know than march silently on.
Jeff Donahue [Fri, 6 Feb 2015 00:06:17 +0000 (16:06 -0800)]
Merge pull request #1694 from jeffdonahue/layer-type-str
Layer type is a string
Jeff Donahue [Thu, 5 Feb 2015 23:17:24 +0000 (15:17 -0800)]
Upgrade existing nets using upgrade_net_proto_text tool
Restore comments afterwards
Jeff Donahue [Thu, 15 Jan 2015 09:43:23 +0000 (01:43 -0800)]
start layer parameter field IDs at 100
(always want them printed at the end, and want to allow more fields to
be added in the future, so reserve fields 10-99 for that purpose)
Jeff Donahue [Thu, 15 Jan 2015 08:13:23 +0000 (00:13 -0800)]
get rid of NetParameterPrettyPrint as layer is now after inputs
(whoohoo)
Jeff Donahue [Thu, 15 Jan 2015 04:17:26 +0000 (20:17 -0800)]
add message ParamSpec to replace param name, blobs_lr, weight_decay, ...
Jeff Donahue [Thu, 15 Jan 2015 03:00:58 +0000 (19:00 -0800)]
add test that all V1 layer type enum values upgrade to valid V2 string
types
Jeff Donahue [Thu, 15 Jan 2015 02:46:21 +0000 (18:46 -0800)]
add v1 to v2 upgrade tests
Jeff Donahue [Thu, 15 Jan 2015 02:31:23 +0000 (18:31 -0800)]
restore test_upgrade_proto to dev version
Jeff Donahue [Thu, 15 Jan 2015 00:55:14 +0000 (16:55 -0800)]
automagic upgrade for v1->v2
Jeff Donahue [Wed, 14 Jan 2015 23:07:20 +0000 (15:07 -0800)]
restore upgrade_proto
Jeff Donahue [Tue, 13 Jan 2015 01:02:15 +0000 (17:02 -0800)]
'layers' -> 'layer'
Jeff Donahue [Mon, 12 Jan 2015 21:42:51 +0000 (13:42 -0800)]
Add unit test for LayerRegistry::CreateLayer
Jeff Donahue [Mon, 12 Jan 2015 22:27:06 +0000 (14:27 -0800)]
DataLayer and HDF5OutputLayer can be constructed and destroyed without
errors
Jeff Donahue [Thu, 8 Jan 2015 04:41:09 +0000 (20:41 -0800)]
Layer type is a string
Evan Shelhamer [Wed, 4 Feb 2015 18:15:21 +0000 (10:15 -0800)]
fix Nesterov typo found by @bamos
Pannous [Fri, 30 Jan 2015 12:38:48 +0000 (13:38 +0100)]
fixed small bug: output label_file -> label_filename
Jeff Donahue [Mon, 2 Feb 2015 20:38:43 +0000 (12:38 -0800)]
add space after "Loading mean file from"
Evan Shelhamer [Mon, 2 Feb 2015 17:45:51 +0000 (09:45 -0800)]
fix GoogLeNet license overwritten by back-merge (see #1650)
Evan Shelhamer [Sun, 1 Feb 2015 07:53:58 +0000 (23:53 -0800)]
Merge pull request #1615 from longjon/deconv-layer
Add deconvolution layer with refactoring of convolution layer to share code
Evan Shelhamer [Fri, 30 Jan 2015 04:58:58 +0000 (20:58 -0800)]
Merge pull request #1748 from longjon/db-wrappers
Simple database wrappers
Evan Shelhamer [Fri, 30 Jan 2015 04:52:32 +0000 (20:52 -0800)]
Merge pull request #1794 from shelhamer/no-dump-net
drop dump_network tool