Evan Shelhamer [Sat, 7 Mar 2015 03:36:29 +0000 (19:36 -0800)]
[pycaffe] align web demo with #1728 and #1902
Evan Shelhamer [Sat, 7 Mar 2015 03:34:32 +0000 (19:34 -0800)]
[pycaffe] classifier + detector only have one input
Evan Shelhamer [Sat, 7 Mar 2015 02:53:29 +0000 (18:53 -0800)]
[pycaffe] fix CPU / GPU switch in example scripts
ariandyy [Tue, 4 Nov 2014 15:48:02 +0000 (16:48 +0100)]
[pycaffe] make classify.py print input + output file paths
...and fix up detector quote convention.
Evan Shelhamer [Sat, 7 Mar 2015 00:23:43 +0000 (16:23 -0800)]
[pycaffe] no need to squeeze output after #1970
fix #2041 reported by @dgmp88
Christos Nikolaou [Wed, 5 Nov 2014 16:09:47 +0000 (18:09 +0200)]
Fix references to plural names in API documentation
Changed each "&" character that conected the class name and the "s"
character to "%", so that it is properly displayed.
Evan Shelhamer [Sat, 7 Mar 2015 06:17:47 +0000 (22:17 -0800)]
Merge pull request #1987 from tnarihi/fix-siam-example
[docs] fix siamese ipynb example
Evan Shelhamer [Sat, 7 Mar 2015 06:08:28 +0000 (22:08 -0800)]
Merge pull request #2059 from philkr/python_layer_cmake
[cmake] add Python layer
Evan Shelhamer [Sat, 7 Mar 2015 06:07:04 +0000 (22:07 -0800)]
Merge pull request #2056 from philkr/hdf5
[cmake] add missing hdf5 include directory
Evan Shelhamer [Sat, 7 Mar 2015 06:05:59 +0000 (22:05 -0800)]
Merge pull request #2055 from tishibas/iss1506
compute mean from lmdb for imagenet example
philkr [Sat, 7 Mar 2015 00:49:19 +0000 (16:49 -0800)]
Making python layer work with cmake
Evan Shelhamer [Sat, 7 Mar 2015 00:26:30 +0000 (16:26 -0800)]
Merge pull request #2010 from danielhamngren/update_python_requirements
[pycaffe] Add Pillow to requirements.txt
Evan Shelhamer [Sat, 7 Mar 2015 00:25:09 +0000 (16:25 -0800)]
Merge pull request #2037 from shelhamer/expose-solver-restore
Expose Solver::Restore() as public for restoring without solving
tishibas67 [Fri, 6 Mar 2015 14:48:27 +0000 (23:48 +0900)]
fix #1506
philkr [Thu, 5 Mar 2015 23:00:23 +0000 (15:00 -0800)]
Adding correct hdf5 path
Evan Shelhamer [Thu, 5 Mar 2015 21:55:01 +0000 (13:55 -0800)]
[docs] include boost-python in OSX pycaffe install
Jonathan L Long [Thu, 5 Mar 2015 07:00:45 +0000 (23:00 -0800)]
[pycaffe] add missing import sys
Evan Shelhamer [Thu, 5 Mar 2015 01:18:26 +0000 (17:18 -0800)]
expose Solver::Restore() as public and Solver.restore() in pycaffe
The solver can restore its state without entering the Solve() loop.
Evan Shelhamer [Thu, 5 Mar 2015 01:13:38 +0000 (17:13 -0800)]
[pycaffe] check mean channels for transformation
follow-up to #2031: check that the input and mean channels are
compatible in the broadcast channels case.
Jeff Donahue [Wed, 4 Mar 2015 23:53:17 +0000 (15:53 -0800)]
Merge pull request #2035 from jeffdonahue/include-climits
add <climits> for INT_MAX
Jeff Donahue [Wed, 4 Mar 2015 23:22:46 +0000 (15:22 -0800)]
include/caffe/common.hpp: add <climits> for INT_MAX (now in blob.hpp)
Jeff Donahue [Wed, 4 Mar 2015 19:17:51 +0000 (11:17 -0800)]
fix comment I forgot about from @shelhamer's review of #1970
Evan Shelhamer [Wed, 4 Mar 2015 17:43:15 +0000 (09:43 -0800)]
Merge pull request #2031 from NVIDIA/image_mean
Check shape of input mean
Luke Yeager [Mon, 23 Feb 2015 17:18:31 +0000 (09:18 -0800)]
Add error checking for image mean
When setting the mean, assert that it is either one pixel or an array with
shape equal to the input data size.
Jon Long [Wed, 4 Mar 2015 11:33:13 +0000 (03:33 -0800)]
Merge pull request #1966 from philkr/python_fixes
cmake and python3 bugfixes for #1939 and #1923
Evan Shelhamer [Wed, 4 Mar 2015 06:27:55 +0000 (22:27 -0800)]
Merge pull request #1970 from jeffdonahue/tensor-blob
Blobs are N-D arrays (for N not necessarily equals 4)
Jonathan L Long [Mon, 2 Mar 2015 23:54:11 +0000 (15:54 -0800)]
[pytest] use non-4d blobs in test_python_layer
Jonathan L Long [Mon, 2 Mar 2015 23:27:45 +0000 (15:27 -0800)]
[pycaffe] expose Blob.reshape as *args function
Jeff Donahue [Sat, 31 Jan 2015 07:16:44 +0000 (23:16 -0800)]
Add option not to reshape to Blob::FromProto; use when loading Blobs
from saved NetParameter
Want to keep the param Blob shape the layer has set, and not necessarily
adopt the one from the saved net (e.g. want to keep new 1D bias shape,
rather than take the (1 x 1 x 1 x D) shape from a legacy net).
Jeff Donahue [Fri, 2 Jan 2015 01:32:38 +0000 (17:32 -0800)]
PyBlobs support generalized axes
Jeff Donahue [Fri, 16 Jan 2015 03:50:42 +0000 (19:50 -0800)]
Add CHECK_EQ(4, ...)s to "vision layers" to enforce that the
num/channnels/height/width indexing is valid.
Jeff Donahue [Thu, 1 Jan 2015 00:06:46 +0000 (16:06 -0800)]
DummyDataLayer outputs blobs of arbitrary shape
Jeff Donahue [Sun, 30 Nov 2014 02:00:44 +0000 (18:00 -0800)]
EuclideanLossLayer: generalized Blob axes
Jeff Donahue [Wed, 26 Nov 2014 20:57:15 +0000 (12:57 -0800)]
WindowDataLayer outputs 1D labels
Jeff Donahue [Wed, 26 Nov 2014 20:56:14 +0000 (12:56 -0800)]
ImageDataLayer outputs 1D labels
Jeff Donahue [Wed, 26 Nov 2014 13:42:50 +0000 (05:42 -0800)]
MemoryDataLayer outputs 1D labels
Jeff Donahue [Wed, 26 Nov 2014 13:34:47 +0000 (05:34 -0800)]
DataLayer outputs 1D labels
Jeff Donahue [Wed, 26 Nov 2014 13:42:11 +0000 (05:42 -0800)]
HDF5DataLayer shapes output according to HDF5 shape
Jeff Donahue [Wed, 26 Nov 2014 13:02:15 +0000 (05:02 -0800)]
SplitLayer: change Reshape(n,h,c,w) to ReshapeLike(...)
Jeff Donahue [Sat, 31 Jan 2015 07:22:26 +0000 (23:22 -0800)]
SoftmaxLossLayer generalized like SoftmaxLayer
Jeff Donahue [Tue, 10 Feb 2015 02:12:54 +0000 (18:12 -0800)]
CuDNNSoftmaxLayer: generalized Blob axes
Jeff Donahue [Sun, 15 Feb 2015 21:26:36 +0000 (13:26 -0800)]
SoftmaxLayer: generalized Blob axes
Jeff Donahue [Wed, 26 Nov 2014 11:22:59 +0000 (03:22 -0800)]
SliceLayer: generalized Blob axes
Jeff Donahue [Wed, 26 Nov 2014 08:03:36 +0000 (00:03 -0800)]
ConcatLayer: generalized Blob axes
Jeff Donahue [Wed, 26 Nov 2014 10:24:41 +0000 (02:24 -0800)]
TestConcatLayer: add forward/gradient tests for concatenation along num
Jeff Donahue [Wed, 26 Nov 2014 10:12:09 +0000 (02:12 -0800)]
TestConcatLayer: fix style errors
Jeff Donahue [Wed, 26 Nov 2014 11:23:42 +0000 (03:23 -0800)]
common_layers.hpp: remove unused "Blob col_bob_"
Jeff Donahue [Wed, 26 Nov 2014 08:11:06 +0000 (00:11 -0800)]
FlattenLayer: generalized Blob axes
Jeff Donahue [Wed, 26 Nov 2014 07:47:10 +0000 (23:47 -0800)]
EltwiseLayer need not assume old 4D dim names
Jeff Donahue [Fri, 13 Feb 2015 23:52:39 +0000 (15:52 -0800)]
Test{Net,Solver} fixes for AccuracyLayer generalization
Jeff Donahue [Sat, 31 Jan 2015 07:23:27 +0000 (23:23 -0800)]
AccuracyLayer generalized to N instance axes
Jeff Donahue [Sun, 30 Nov 2014 00:48:32 +0000 (16:48 -0800)]
AccuracyLayer output is 0D (scalar)
Jeff Donahue [Wed, 26 Nov 2014 07:46:57 +0000 (23:46 -0800)]
LossLayer output is 0D (scalar)
Jeff Donahue [Sun, 30 Nov 2014 01:02:18 +0000 (17:02 -0800)]
ConvLayer biases are 1D
Jeff Donahue [Sat, 29 Nov 2014 22:26:48 +0000 (14:26 -0800)]
InnerProductLayer can multiply along any axis
Jeff Donahue [Mon, 16 Feb 2015 09:29:17 +0000 (01:29 -0800)]
Fix sparse GaussianFiller for new IPLayer weight axes
Jeff Donahue [Wed, 26 Nov 2014 06:48:03 +0000 (22:48 -0800)]
InnerProductLayer weights are 2D; biases are 1D
Jeff Donahue [Sun, 30 Nov 2014 00:11:07 +0000 (16:11 -0800)]
TestBlob: test that legacy BlobProtos are correctly handled by ShapeEquals
Jeff Donahue [Wed, 4 Feb 2015 23:00:03 +0000 (15:00 -0800)]
add offset, {data,diff}_at nd blob accessors
Jeff Donahue [Thu, 1 Jan 2015 00:05:52 +0000 (16:05 -0800)]
Add BlobShape message; use for Net input shapes
Jeff Donahue [Wed, 26 Nov 2014 02:17:45 +0000 (18:17 -0800)]
Blobs are ND arrays (for N not necessarily equals 4).
vector<int> shape_ instead of (num, channels, height, width).
Daniel Hamngren [Sun, 1 Mar 2015 22:06:03 +0000 (23:06 +0100)]
Added Pillow to requirements.txt
Jon Long [Fri, 27 Feb 2015 18:32:49 +0000 (10:32 -0800)]
Merge pull request #1999 from boechat107/patch-2
Small fix (visualization) on SLICE layer's documentation
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
Andre Ambrosio Boechat [Wed, 25 Feb 2015 17:56:18 +0000 (14:56 -0300)]
Small fix (visualization) on SLICE layer's documentation
The sample was missing some additional spaces to be correctly rendered on the HTML. The mistake was mine.
philkr [Wed, 25 Feb 2015 16:17:06 +0000 (08:17 -0800)]
Fixing two bugs related to python3 and PROJECT_SOURCE_DIR
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