Takuya Narihira [Thu, 26 Feb 2015 22:49:19 +0000 (14:49 -0800)]
Fix siamese ipynb example
Evan Shelhamer [Thu, 26 Feb 2015 00:37:55 +0000 (16:37 -0800)]
Merge pull request #1955 from philkr/reshaping_encoded
Decoding the datum before feeding it into the reshaping data layer
Jon Long [Wed, 25 Feb 2015 07:00:27 +0000 (23:00 -0800)]
Merge pull request #1960 from gustavla/makefile_fix
Replaced illegal tab in Makefile with spaces.
Evan Shelhamer [Wed, 25 Feb 2015 06:05:06 +0000 (22:05 -0800)]
Merge pull request #1961 from sergeyk/master
fix accelerate / veclib path for OS X 10.10
Sergey Karayev [Wed, 25 Feb 2015 05:52:32 +0000 (21:52 -0800)]
Makefile fix for OS X 10.10
Gustav Larsson [Wed, 25 Feb 2015 05:22:15 +0000 (23:22 -0600)]
Replaced illegal tab in Makefile with spaces.
Commands, such as $(error ...), are not allowed to be indented with tabs
outside of targets, throwing an error instead of outputting the actual
error. The solution is to use innocuous spaces instead. Ideally, spaces
should be used everywhere outside targets, but since make does not mind
it if variable assignments are tab-indented outside targets, a complete
overhaul is not necessary. However, if more errors are added, it might
make more sense to be consistent.
Also, make will already add a period so I removed it.
forresti [Wed, 25 Feb 2015 00:51:56 +0000 (16:51 -0800)]
fixed matcaffe printout to specify num of args (now including train/test phase)
philkr [Wed, 25 Feb 2015 00:02:06 +0000 (16:02 -0800)]
Decoding the datum before feeding it into the reshaping data layer
Jon Long [Tue, 24 Feb 2015 23:00:58 +0000 (15:00 -0800)]
Merge pull request #1923 from philkr/python3_master
Making python3 work with cmake and the new python wrapper
philkr [Tue, 17 Feb 2015 18:50:12 +0000 (10:50 -0800)]
Making python3 work with cmake and the new python wrapper
Jon Long [Tue, 24 Feb 2015 04:04:48 +0000 (20:04 -0800)]
Merge pull request #1926 from shelhamer/test-caffe-tool
Check caffe tool runs
Jon Long [Tue, 24 Feb 2015 04:01:27 +0000 (20:01 -0800)]
Merge pull request #1941 from jsupancic/cpp_lint_python2
fixes: cpp_lint.py fails silently with Python3
Jon Long [Tue, 24 Feb 2015 03:52:12 +0000 (19:52 -0800)]
Merge pull request #1948 from spmallick/patch-1
APPLE was misspelled in Line 27
spmallick [Tue, 24 Feb 2015 00:13:20 +0000 (16:13 -0800)]
APPLE was misspelled. in Line 27
Evan Shelhamer [Sun, 22 Feb 2015 18:35:10 +0000 (10:35 -0800)]
Merge pull request #1939 from Nerei/bugfix/install_rpath_for_pycaffe
[cmake] fix install rpath for pycaffe
James Supancic III [Sun, 22 Feb 2015 18:16:45 +0000 (10:16 -0800)]
cpp_lint.py fails silently with Python3 (which is the default on some systems).
This commit specifies Python2 with which cpp_lint.py works :-)
Anatoly Baksheev [Sun, 22 Feb 2015 17:14:40 +0000 (20:14 +0300)]
minor cmake sumamry log fix
Anatoly Baksheev [Sun, 22 Feb 2015 16:04:22 +0000 (19:04 +0300)]
fixed bug in install-tree: _caffe.so installed by install(TARGET ...) was overwritten with symlink created at build time and installed with install(DIRECTORY ...)
Anatoly Baksheev [Sun, 22 Feb 2015 16:03:47 +0000 (19:03 +0300)]
set proper CMAKE_INSTALL_RPATH for _caffe.so and tools
Anatoly Baksheev [Sun, 22 Feb 2015 15:58:12 +0000 (18:58 +0300)]
ignore pycharm files
Evan Shelhamer [Sat, 21 Feb 2015 04:29:53 +0000 (20:29 -0800)]
check caffe tool runs in runtest
Evan Shelhamer [Fri, 20 Feb 2015 20:20:23 +0000 (12:20 -0800)]
Merge pull request #1921 from shelhamer/fix-tool-linking
[build] fix dynamic linking of tools
Evan Shelhamer [Fri, 20 Feb 2015 19:18:47 +0000 (11:18 -0800)]
[build] fix dynamic linking of tools
set the right rpath for tools and examples respectively
thanks for the report @mees!
Evan Shelhamer [Fri, 20 Feb 2015 06:16:10 +0000 (22:16 -0800)]
Merge pull request #1914 from eerwitt/master
fix Imagenet example path
e3 [Fri, 20 Feb 2015 06:07:27 +0000 (22:07 -0800)]
Updated the path for get_ilsvrc_aux.sh to match what is found in the current project
Evan Shelhamer [Fri, 20 Feb 2015 02:35:23 +0000 (18:35 -0800)]
Merge pull request #1849 from BVLC/next
Next: release candidater
Brandon Amos [Mon, 16 Feb 2015 20:09:24 +0000 (15:09 -0500)]
Correct 'epochs' to 'iterations'
See https://github.com/BVLC/caffe/blob/master/models/bvlc_reference_caffenet/solver.prototxt
Andre Ambrosio Boechat [Fri, 30 Jan 2015 15:57:31 +0000 (13:57 -0200)]
Brief explanation of SLICE layer's attributes
* A sample code was added.
* `slice_dim` and `slice_point` attributes were explained.
Evan Shelhamer [Thu, 29 Jan 2015 18:53:44 +0000 (10:53 -0800)]
[docs] add check mode hint to CPU-only mode error
Evan Shelhamer [Thu, 29 Jan 2015 17:26:12 +0000 (09:26 -0800)]
[docs] send API link to class list
Evan Shelhamer [Fri, 20 Feb 2015 02:14:57 +0000 (18:14 -0800)]
[build] fix rpath for examples
Evan Shelhamer [Fri, 20 Feb 2015 02:01:13 +0000 (18:01 -0800)]
Merge pull request #1910 from philkr/encoded
add force_encoded_color flag to the data layer and warn about
mixed encoding
Evan Shelhamer [Fri, 20 Feb 2015 01:54:49 +0000 (17:54 -0800)]
Repeal revert of #1878
Evan Shelhamer [Fri, 20 Feb 2015 01:49:12 +0000 (17:49 -0800)]
[docs] add gitter chat badge
philkr [Thu, 19 Feb 2015 21:46:21 +0000 (13:46 -0800)]
added a force_encoded_color flag to the data layer. Printing a warning if images of different channel dimensions are encoded together
Evan Shelhamer [Thu, 19 Feb 2015 19:03:23 +0000 (11:03 -0800)]
Revert "Merge pull request #1878 from philkr/encoded"
This reverts the encoding cleanup since it breaks data processing for
existing inputs as discussed in #1901.
Evan Shelhamer [Thu, 19 Feb 2015 18:56:26 +0000 (10:56 -0800)]
Merge pull request #1907 from shelhamer/memory-warn-transform
relax MemoryData transform check to warning
Evan Shelhamer [Thu, 19 Feb 2015 18:31:23 +0000 (10:31 -0800)]
relax MemoryData transform check to warning
warning is still useful to keep from accidentally running data without
pre-processing.
Evan Shelhamer [Thu, 19 Feb 2015 08:37:53 +0000 (00:37 -0800)]
Merge pull request #1899 from philkr/project_source_dir
[cmake] CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR
Evan Shelhamer [Thu, 19 Feb 2015 08:25:18 +0000 (00:25 -0800)]
Merge pull request #1902 from shelhamer/py-stopgap
Stop-gap fixes for pycaffe
Evan Shelhamer [Thu, 19 Feb 2015 04:53:22 +0000 (20:53 -0800)]
[pycaffe] switch examples to Transformer
This is a quick translation of the examples to the caffe.io.Transformer
interface. The results are not strictly identical to the earlier
implementation! The models now use a mean pixel instead of a mean image
for simplicity. The output classifications and detections are preserved
but scores may differ.
Note: the examples will be rewritten to make use of `caffe.Net` alone
since it is the true interface, but not yet.
Evan Shelhamer [Thu, 19 Feb 2015 04:47:12 +0000 (20:47 -0800)]
[pycaffe] take pre-processing from Net and give to Transformer
The pyreformation #1703 aligned pycaffe Net with the real Caffe Net.
This broke the pre-processing helpers that had been bolted on to
`caffe.Net`.
These responsibilities are gathered in `caffe.io.Transformer` instead.
This is only an intermediate step in a real solution to pycaffe IO that
should make use of the same data pipeline as the rest of the framework.
See #1245 for further thoughts on input processing.
Evan Shelhamer [Thu, 19 Feb 2015 04:46:41 +0000 (20:46 -0800)]
[pycaffe] import newline cleanup
philkr [Wed, 18 Feb 2015 16:38:33 +0000 (08:38 -0800)]
Changing CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR
Jonathan L Long [Wed, 18 Feb 2015 02:23:32 +0000 (18:23 -0800)]
comment fix: Decaf -> Caffe
Jonathan L Long [Tue, 17 Feb 2015 23:46:29 +0000 (15:46 -0800)]
[pycaffe] fix bug in Python layer setup
Previously, setup did not correctly override LayerSetUp (and therefore
did not run) due to an incorrect type.
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
Sergio Guadarrama [Mon, 16 Feb 2015 21:42:43 +0000 (13:42 -0800)]
Merge pull request #1879 from bamos/patch-1
Correct 'epochs' to 'iterations'
Brandon Amos [Mon, 16 Feb 2015 20:09:24 +0000 (15:09 -0500)]
Correct 'epochs' to 'iterations'
See https://github.com/BVLC/caffe/blob/master/models/bvlc_reference_caffenet/solver.prototxt
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