platform/upstream/caffe.git
8 years agoMerge pull request #3272 from ixartz/master
Evan Shelhamer [Thu, 18 Aug 2016 17:42:33 +0000 (10:42 -0700)]
Merge pull request #3272 from ixartz/master

[cmake] OSX 10.10 (and more) use Accelerate Framework instead of veclib

8 years agoMerge pull request #4247 from jklontz/master
Evan Shelhamer [Thu, 18 Aug 2016 17:40:10 +0000 (10:40 -0700)]
Merge pull request #4247 from jklontz/master

[cmake] Fix vecLib search order

8 years agoMerge pull request #4596 from keskarnitish/master
Evan Shelhamer [Tue, 16 Aug 2016 03:45:10 +0000 (20:45 -0700)]
Merge pull request #4596 from keskarnitish/master

[examples] fix comment typo In Sigmoid CIFAR-10 example

8 years agoFixing Typo In Sigmoid CIFAR-10 Examples
Nitish Keskar [Tue, 16 Aug 2016 00:47:34 +0000 (19:47 -0500)]
Fixing Typo In Sigmoid CIFAR-10 Examples

There was a mismatch between the iterations interval in the comment and the actual code.

8 years agoMerge pull request #4379 from alicanb/master
Jeff Donahue [Thu, 11 Aug 2016 22:04:47 +0000 (15:04 -0700)]
Merge pull request #4379 from alicanb/master

add default value to rms_decay and fix documentation

8 years agoMerge pull request #4559 from fyu/loss_reshape
Jeff Donahue [Sun, 7 Aug 2016 04:22:25 +0000 (21:22 -0700)]
Merge pull request #4559 from fyu/loss_reshape

Fix Label Shape Check in LossLayer::Reshape

8 years agonum in blob is deprecated
Fisher Yu [Sun, 7 Aug 2016 03:01:45 +0000 (23:01 -0400)]
num in blob is deprecated

8 years agoMerge pull request #4516 from intelfx/BVLC-work
Jon Long [Thu, 4 Aug 2016 01:25:56 +0000 (18:25 -0700)]
Merge pull request #4516 from intelfx/BVLC-work

CMake: link with ${HDF5_HL_LIBRARIES}

8 years agoMerge pull request #4523 from delftrobotics/cmake-atlas
Jon Long [Thu, 4 Aug 2016 01:22:18 +0000 (18:22 -0700)]
Merge pull request #4523 from delftrobotics/cmake-atlas

Fix search for Atlas on arch.

8 years agoFix search for Atlas on arch.
Hans Gaiser [Tue, 26 Jul 2016 09:44:44 +0000 (11:44 +0200)]
Fix search for Atlas on arch.

8 years agoCMake: link with ${HDF5_HL_LIBRARIES}
Ivan Shapovalov [Mon, 25 Jul 2016 06:01:24 +0000 (09:01 +0300)]
CMake: link with ${HDF5_HL_LIBRARIES}

Fixes issue #3224.

8 years agoMerge pull request #4474 from lukeyeager/bvlc/travis-cache
Jeff Donahue [Sat, 16 Jul 2016 00:45:53 +0000 (17:45 -0700)]
Merge pull request #4474 from lukeyeager/bvlc/travis-cache

Stop setting cache timeout in TravisCI

8 years agoStop setting cache timeout in TravisCI
Luke Yeager [Fri, 15 Jul 2016 21:12:01 +0000 (14:12 -0700)]
Stop setting cache timeout in TravisCI

It refers to the caching command timeout, not how long before the caches
expire as I had thought.

8 years agoMerge pull request #4459 from lukeyeager/bvlc/example-scripts
Jon Long [Thu, 14 Jul 2016 20:01:42 +0000 (13:01 -0700)]
Merge pull request #4459 from lukeyeager/bvlc/example-scripts

Add "set -e" and $@ to example scripts

8 years agoMerge pull request #4455 from ShaggO/spaceSupportILSVRC12MNIST
Jon Long [Thu, 14 Jul 2016 19:57:51 +0000 (12:57 -0700)]
Merge pull request #4455 from ShaggO/spaceSupportILSVRC12MNIST

Support spaces in path when downloading ILSVRC12 and MNIST

8 years agoAdd "set -e" and $@ to example scripts
Luke Yeager [Wed, 13 Jul 2016 22:58:29 +0000 (15:58 -0700)]
Add "set -e" and $@ to example scripts

8 years agoSupport spaces in path when downloading ILSVRC12 and MNIST
Malte Stær Nissen [Wed, 13 Jul 2016 09:17:54 +0000 (11:17 +0200)]
Support spaces in path when downloading ILSVRC12 and MNIST

8 years agoMerge pull request #4343 from nitnelave/python/top_names
Jon Long [Wed, 13 Jul 2016 08:19:32 +0000 (01:19 -0700)]
Merge pull request #4343 from nitnelave/python/top_names

improve top_names and bottom_names in pycaffe

8 years agoMerge pull request #4451 from ShaggO/cifar10space
Jon Long [Wed, 13 Jul 2016 07:04:50 +0000 (00:04 -0700)]
Merge pull request #4451 from ShaggO/cifar10space

Support for spaces in directories when downloading cifar10

8 years agoadd test for top/bottom names
Valentin Tolmer [Wed, 22 Jun 2016 00:17:05 +0000 (17:17 -0700)]
add test for top/bottom names

8 years agoimprove top_names and bottom_names in pycaffe
Valentin Tolmer [Tue, 21 Jun 2016 21:58:43 +0000 (14:58 -0700)]
improve top_names and bottom_names in pycaffe

8 years agoSupport for spaces in directories when downloading cifar10
Malte Stær Nissen [Tue, 12 Jul 2016 11:17:52 +0000 (13:17 +0200)]
Support for spaces in directories when downloading cifar10

8 years agoMerge pull request #4351 from nitnelave/python/set_random_seed
Evan Shelhamer [Mon, 11 Jul 2016 21:03:18 +0000 (14:03 -0700)]
Merge pull request #4351 from nitnelave/python/set_random_seed

[pycaffe] add set_random_seed to the python interface

8 years agoMerge pull request #4448 from lalelale/patch-2
Jeff Donahue [Mon, 11 Jul 2016 20:09:44 +0000 (10:09 -1000)]
Merge pull request #4448 from lalelale/patch-2

Fix comment error in parse_log.py

8 years agoUpdate parse_log.py
Alessandro Giusti [Mon, 11 Jul 2016 18:33:16 +0000 (20:33 +0200)]
Update parse_log.py

Aligned output description in docstring with actual output returned by parse_log

8 years agoadd set_random_seed to the python interface
Valentin Tolmer [Wed, 22 Jun 2016 22:13:54 +0000 (15:13 -0700)]
add set_random_seed to the python interface

8 years agoMerge pull request #4359 from ibmsoe/fix-EmbedLayerTest
Evan Shelhamer [Mon, 11 Jul 2016 16:32:45 +0000 (09:32 -0700)]
Merge pull request #4359 from ibmsoe/fix-EmbedLayerTest

fix equality check in EmbedLayer test

8 years agoFix for a random failure in this test due to floating point comparison. So, instead...
Nishidha Panpaliya [Tue, 17 May 2016 06:14:53 +0000 (01:14 -0500)]
Fix for a random failure in this test due to floating point comparison. So, instead of exact match, used EXPECT_FLOAT_EQ that tolerates some precision while comparing two floats

8 years agoMerge pull request #4348 from nitnelave/python/clear_params
Evan Shelhamer [Mon, 11 Jul 2016 05:30:05 +0000 (22:30 -0700)]
Merge pull request #4348 from nitnelave/python/clear_params

Add clear_param_diffs to the python net interface

8 years agoMerge pull request #2984 from marco-c/dont_squeeze
Evan Shelhamer [Mon, 11 Jul 2016 05:22:05 +0000 (22:22 -0700)]
Merge pull request #2984 from marco-c/dont_squeeze

No need to squeeze the output of the network in detector.py

8 years agoMerge pull request #4433 from lukeyeager/bvlc/cmake-install-python
Jon Long [Mon, 11 Jul 2016 05:11:31 +0000 (22:11 -0700)]
Merge pull request #4433 from lukeyeager/bvlc/cmake-install-python

Fix Python installation with CMake install target

8 years agoMerge pull request #4408 from cdoersch/draw_net_phase
Evan Shelhamer [Mon, 11 Jul 2016 05:06:12 +0000 (22:06 -0700)]
Merge pull request #4408 from cdoersch/draw_net_phase

Add phase support for draw net

8 years agoMerge pull request #3863 from lukeyeager/bvlc/expose-all-netstate-options
Evan Shelhamer [Mon, 11 Jul 2016 05:04:44 +0000 (22:04 -0700)]
Merge pull request #3863 from lukeyeager/bvlc/expose-all-netstate-options

Expose all netstate options (for all-in-one nets)

8 years agoFix Python installation with CMake install target
Luke Yeager [Fri, 8 Jul 2016 19:05:17 +0000 (12:05 -0700)]
Fix Python installation with CMake install target

8 years agoAdd phase support for draw net
Carl Doersch [Sun, 3 Jul 2016 19:32:19 +0000 (12:32 -0700)]
Add phase support for draw net

8 years agocorrected rmsprop documentation
Alican Bozkurt [Tue, 28 Jun 2016 20:59:36 +0000 (16:59 -0400)]
corrected rmsprop documentation

8 years agoadd default value for rms_decay
Alican Bozkurt [Tue, 28 Jun 2016 20:28:33 +0000 (16:28 -0400)]
add default value for rms_decay

8 years agoadd unit test for clear_param_diffs
Valentin Tolmer [Wed, 22 Jun 2016 00:42:31 +0000 (17:42 -0700)]
add unit test for clear_param_diffs

8 years agoadd clear_param_diffs to the python net interface
Valentin Tolmer [Wed, 22 Jun 2016 00:37:55 +0000 (17:37 -0700)]
add clear_param_diffs to the python net interface

8 years agoMerge pull request #3020 from philkr/python_solver_callback
Jeff Donahue [Fri, 17 Jun 2016 23:35:07 +0000 (16:35 -0700)]
Merge pull request #3020 from philkr/python_solver_callback

Exposing solver callbacks to python

8 years agoExposing solver callbacks to python
philkr [Thu, 3 Sep 2015 21:28:55 +0000 (14:28 -0700)]
Exposing solver callbacks to python

8 years agoAdd level and stages to pycaffe
Luke Yeager [Wed, 1 Jun 2016 17:02:41 +0000 (10:02 -0700)]
Add level and stages to pycaffe

Uses Boost.Python's pattern matching to differentiate between
constructors
Also adds Python tests for all-in-one nets

8 years agoAdd phase, level and stages to tools/caffe
Luke Yeager [Wed, 1 Jun 2016 16:56:51 +0000 (09:56 -0700)]
Add phase, level and stages to tools/caffe

Adds command-line flags for phase, level and stage

train -- override level and stages for test_state from solver
test -- set level and stages
time -- set phase, level and stages

8 years agoAdd level and stages to Net constructor
Luke Yeager [Wed, 1 Jun 2016 16:50:57 +0000 (09:50 -0700)]
Add level and stages to Net constructor

This internal functionality will be exposed through the various
interfaces in subsequent commits
Also adds C++ tests for all-in-one nets

8 years agoMerge pull request #4227 from philkr/save_hdf5
Evan Shelhamer [Fri, 3 Jun 2016 01:29:36 +0000 (18:29 -0700)]
Merge pull request #4227 from philkr/save_hdf5

[pycaffe] expose saving/loading nets as hdf5 to python

8 years agoExposing load_hdf5 and save_hdf5 to python
philkr [Tue, 24 May 2016 03:09:45 +0000 (20:09 -0700)]
Exposing load_hdf5 and save_hdf5 to python

8 years agoMerge pull request #4259 from chuckcho/fixing-typo
Evan Shelhamer [Thu, 2 Jun 2016 19:28:51 +0000 (12:28 -0700)]
Merge pull request #4259 from chuckcho/fixing-typo

Fixing a typo

8 years agoFixing a typo
Chuck Cho [Thu, 2 Jun 2016 18:35:14 +0000 (14:35 -0400)]
Fixing a typo

8 years agoMerge pull request #4254 from lukeyeager/bvlc/travis-caching
Evan Shelhamer [Thu, 2 Jun 2016 00:35:13 +0000 (17:35 -0700)]
Merge pull request #4254 from lukeyeager/bvlc/travis-caching

[build] Cache protobuf3 build in TravisCI

8 years agoMerge pull request #3948 from jeffdonahue/recurrent-layer
Jeff Donahue [Thu, 2 Jun 2016 00:28:25 +0000 (17:28 -0700)]
Merge pull request #3948 from jeffdonahue/recurrent-layer

RNN + LSTM Layers

8 years agoAdd LSTMLayer and LSTMUnitLayer, with tests
Jeff Donahue [Tue, 5 Apr 2016 16:56:04 +0000 (09:56 -0700)]
Add LSTMLayer and LSTMUnitLayer, with tests

8 years agoAdd RNNLayer, with tests
Jeff Donahue [Sun, 15 Feb 2015 22:56:50 +0000 (14:56 -0800)]
Add RNNLayer, with tests

8 years agoAdd RecurrentLayer: an abstract superclass for other recurrent layer types
Jeff Donahue [Sun, 15 Feb 2015 22:28:01 +0000 (14:28 -0800)]
Add RecurrentLayer: an abstract superclass for other recurrent layer types

8 years agoCache protobuf3 build in TravisCI
Luke Yeager [Wed, 1 Jun 2016 17:37:14 +0000 (10:37 -0700)]
Cache protobuf3 build in TravisCI

8 years agoFix vecLib search order for clients with both the old vecLib framework and the new...
Josh Klontz [Wed, 1 Jun 2016 00:08:04 +0000 (18:08 -0600)]
Fix vecLib search order for clients with both the old vecLib framework and the new Accelerate framework

8 years agoMerge pull request #4236 from CDLuminate/fix-spelling-error
Evan Shelhamer [Tue, 31 May 2016 00:04:16 +0000 (17:04 -0700)]
Merge pull request #4236 from CDLuminate/fix-spelling-error

fix spelling error in memory_data_layer.cpp

8 years agoMerge pull request #4218 from malreddysid/master
Jon Long [Mon, 30 May 2016 21:10:05 +0000 (14:10 -0700)]
Merge pull request #4218 from malreddysid/master

Resolve SIGSEGV error in image_data_layer.cpp

8 years agofix spelling error in memory_data_layer.cpp
Lumin Zhou [Mon, 30 May 2016 04:14:42 +0000 (04:14 +0000)]
fix spelling error in memory_data_layer.cpp

8 years agoCheck for non-empty ImageData filelist.
Siddarth Malreddy [Thu, 26 May 2016 18:01:31 +0000 (23:31 +0530)]
Check for non-empty ImageData filelist.

8 years agoMerge pull request #4214 from lukeyeager/bvlc/remove-comment-in-tests
Evan Shelhamer [Thu, 26 May 2016 01:11:15 +0000 (18:11 -0700)]
Merge pull request #4214 from lukeyeager/bvlc/remove-comment-in-tests

Remove misleading comment from a test file

8 years agoRemove misleading comment from a test file
Luke Yeager [Wed, 25 May 2016 23:39:55 +0000 (16:39 -0700)]
Remove misleading comment from a test file

8 years agoMerge pull request #4207 from lukeyeager/bvlc/travis-overhaul
Evan Shelhamer [Wed, 25 May 2016 21:45:19 +0000 (14:45 -0700)]
Merge pull request #4207 from lukeyeager/bvlc/travis-overhaul

[testing] Overhaul TravisCI

8 years agoOverhaul TravisCI
Luke Yeager [Tue, 24 May 2016 17:36:23 +0000 (10:36 -0700)]
Overhaul TravisCI

* Run on Ubuntu 14.04
* Test cuDNN builds
* Build with OpenBLAS

NOTE: Python3 build only works with CMake

8 years agoMerge pull request #4059 from crazytan/master
Jon Long [Wed, 18 May 2016 18:36:18 +0000 (11:36 -0700)]
Merge pull request #4059 from crazytan/master

handle spaces in image file names

Thanks @bchu for an earlier implementation.

8 years agohandle image names with spaces
crazytan [Wed, 27 Apr 2016 05:01:30 +0000 (01:01 -0400)]
handle image names with spaces

8 years agoMerge pull request #4070 from crazytan/ipython
Jon Long [Tue, 17 May 2016 22:51:52 +0000 (15:51 -0700)]
Merge pull request #4070 from crazytan/ipython

fix problems in net_surgery.ipynb

8 years agoMerge pull request #4146 from yalesong/fix-makefile-osx-yosemite
Jon Long [Tue, 17 May 2016 22:33:21 +0000 (15:33 -0700)]
Merge pull request #4146 from yalesong/fix-makefile-osx-yosemite

Fix Makefile CUDA_VERSION extraction on OSX Yosemite

8 years agoMerge pull request #4148 from bobpoekert/window_data_nonzero_check
Jon Long [Tue, 17 May 2016 22:07:42 +0000 (15:07 -0700)]
Merge pull request #4148 from bobpoekert/window_data_nonzero_check

Window data foreground/background nonzero check

8 years agoMerge pull request #4159 from flx42/cudnn_v5_support
Evan Shelhamer [Tue, 17 May 2016 19:14:39 +0000 (12:14 -0700)]
Merge pull request #4159 from flx42/cudnn_v5_support

Add cuDNN v5 support, drop cuDNN v3 support

8 years agoUpdate supported cuDNN version in the documentation
Felix Abecassis [Mon, 16 May 2016 21:35:40 +0000 (14:35 -0700)]
Update supported cuDNN version in the documentation

8 years agoUpdate Dockerfile to cuDNN v5
Felix Abecassis [Mon, 16 May 2016 21:32:34 +0000 (14:32 -0700)]
Update Dockerfile to cuDNN v5

8 years agoAdd cuDNN v5 support, drop cuDNN v3 support
Felix Abecassis [Mon, 16 May 2016 21:03:38 +0000 (14:03 -0700)]
Add cuDNN v5 support, drop cuDNN v3 support

cuDNN v4 is still supported.

8 years agoadd check for background and foreground window size > 0 in WindowData layer
Bob Poekert [Sat, 14 May 2016 05:06:33 +0000 (22:06 -0700)]
add check for background and foreground window size > 0 in WindowData layer

8 years agoMerge pull request #4144 from millskyle/python_io_typo
Evan Shelhamer [Fri, 13 May 2016 20:16:25 +0000 (13:16 -0700)]
Merge pull request #4144 from millskyle/python_io_typo

[bug] typo in io.py

8 years agoFix Makefile CUDA_VERSION extraction on OSX Yosemite
Yale Song [Fri, 13 May 2016 20:06:59 +0000 (16:06 -0400)]
Fix Makefile CUDA_VERSION extraction on OSX Yosemite

8 years agofixed typo in io.py
Kyle Mills [Fri, 13 May 2016 15:15:33 +0000 (11:15 -0400)]
fixed typo in io.py

8 years agoMerge pull request #4128 from gdh1995/master
Jon Long [Thu, 12 May 2016 06:04:22 +0000 (23:04 -0700)]
Merge pull request #4128 from gdh1995/master

a comment misses a space char

8 years agoa comment misses a space char
gdh1995 [Wed, 11 May 2016 12:51:07 +0000 (20:51 +0800)]
a comment misses a space char

8 years agoMerge pull request #4121 from rayglover-ibm/cmake
Evan Shelhamer [Tue, 10 May 2016 23:55:31 +0000 (16:55 -0700)]
Merge pull request #4121 from rayglover-ibm/cmake

[build] CMake customisable version/soversion

8 years ago[build] (CMake) customisable Caffe version/soversion
ray glover [Tue, 10 May 2016 14:44:47 +0000 (15:44 +0100)]
[build] (CMake) customisable Caffe version/soversion

8 years agoMerge pull request #4117 from lukeyeager/bvlc/fix-lmdb-pr
Evan Shelhamer [Mon, 9 May 2016 21:26:52 +0000 (14:26 -0700)]
Merge pull request #4117 from lukeyeager/bvlc/fix-lmdb-pr

[bug] Catch MDB_MAP_FULL errors from mdb_txn_commit

8 years agoCatch MDB_MAP_FULL errors from mdb_txn_commit
Luke Yeager [Mon, 9 May 2016 18:21:26 +0000 (11:21 -0700)]
Catch MDB_MAP_FULL errors from mdb_txn_commit

8 years agoMerge pull request #2079 from longjon/parameter-layer
Jon Long [Mon, 9 May 2016 01:13:11 +0000 (18:13 -0700)]
Merge pull request #2079 from longjon/parameter-layer

Add parameter layer for learning any bottom

8 years agoMerge pull request #4101 from erictzeng/reshape_zero
Jeff Donahue [Fri, 6 May 2016 03:00:34 +0000 (20:00 -0700)]
Merge pull request #4101 from erictzeng/reshape_zero

Allow reshaping blobs to size 0.

8 years agoAllow reshaping blobs to size 0.
Eric Tzeng [Fri, 6 May 2016 01:29:30 +0000 (18:29 -0700)]
Allow reshaping blobs to size 0.

Also add a test that reshapes a blob to shape (0, 5).

8 years agofix problems in net_surgery.ipynb
crazytan [Thu, 28 Apr 2016 22:45:13 +0000 (18:45 -0400)]
fix problems in net_surgery.ipynb

8 years agoadd parameter layer for learning any bottom
Jonathan L Long [Thu, 9 Jul 2015 22:49:48 +0000 (15:49 -0700)]
add parameter layer for learning any bottom

8 years agoMerge pull request #4094 from shelhamer/make-clean-clears-distribute
Evan Shelhamer [Wed, 4 May 2016 20:47:05 +0000 (13:47 -0700)]
Merge pull request #4094 from shelhamer/make-clean-clears-distribute

Note that `make clean` clears build and distribute dirs

8 years ago[build] note that `make clean` clears build and distribute dirs
Evan Shelhamer [Wed, 4 May 2016 20:31:35 +0000 (13:31 -0700)]
[build] note that `make clean` clears build and distribute dirs

8 years agoMerge pull request #4048 from achalddave/python_plot_exit_properly
Jon Long [Wed, 4 May 2016 20:15:24 +0000 (13:15 -0700)]
Merge pull request #4048 from achalddave/python_plot_exit_properly

(Minor) Exit on error and report argument error details

8 years agoMerge pull request #3995 from ZhouYzzz/python-phase
Jon Long [Wed, 4 May 2016 20:06:03 +0000 (13:06 -0700)]
Merge pull request #3995 from ZhouYzzz/python-phase

Allow the python layer have attribute "phase"

8 years agoMerge pull request #4082 from flx42/pin_base_docker_image
Evan Shelhamer [Wed, 4 May 2016 17:19:46 +0000 (10:19 -0700)]
Merge pull request #4082 from flx42/pin_base_docker_image

Pin the base image version for the GPU Dockerfile

8 years agoFix typo (indecies->indices)
Achal Dave [Wed, 4 May 2016 15:56:05 +0000 (11:56 -0400)]
Fix typo (indecies->indices)

8 years agoReformat to fit in 79 columns
Achal Dave [Wed, 4 May 2016 15:55:43 +0000 (11:55 -0400)]
Reformat to fit in 79 columns

8 years agoRemove trailing spaces
Achal Dave [Wed, 4 May 2016 15:52:06 +0000 (11:52 -0400)]
Remove trailing spaces

8 years agoExit on error and report argument error details.
Achal Dave [Wed, 4 May 2016 15:51:00 +0000 (11:51 -0400)]
Exit on error and report argument error details.

The statement 'exit' has no effect in Python scripts. Use 'sys.exit()'
instead.

8 years agoAdd test for attribute "phase" in python layer
ZhouYzzz [Wed, 4 May 2016 10:00:12 +0000 (18:00 +0800)]
Add test for attribute "phase" in python layer

8 years agoMerge pull request #3977 from tpwrules/master
Jon Long [Wed, 4 May 2016 06:32:22 +0000 (23:32 -0700)]
Merge pull request #3977 from tpwrules/master

Fix protobuf message generation

8 years agoMerge pull request #4040 from ebadawy/master
Jon Long [Wed, 4 May 2016 06:01:45 +0000 (23:01 -0700)]
Merge pull request #4040 from ebadawy/master

Read the data as a binary

8 years agoMerge pull request #4056 from wk910930/fix-ReshapeParameter-example
Jeff Donahue [Wed, 4 May 2016 05:55:01 +0000 (22:55 -0700)]
Merge pull request #4056 from wk910930/fix-ReshapeParameter-example

Fix an error in the example of ReshapeParameter.