platform/upstream/caffe.git
9 years agoFix download model binary script to get correct lines on parsing table
Gustavo Serra Scalet [Thu, 6 Aug 2015 17:37:20 +0000 (14:37 -0300)]
Fix download model binary script to get correct lines on parsing table

The base reference of "bottom" variable was relative to the "top+1" and
not to the whole readlines output. It ended up without all the lines.

That could work for some gists however for the model I was looking for (see
below) the sha1 key was not being parsed, as it was missing the last line.

tested with the following gist:
longjon/1bf3aa1e0b8e788d7e1d

9 years agoFix download model script to use zip archive
Gustavo Serra Scalet [Thu, 6 Aug 2015 17:20:55 +0000 (14:20 -0300)]
Fix download model script to use zip archive

Currently GitHub is not using tarballs as archive for downloading gists
therefore the script was broken as actually a zip archive was being downloaded.

9 years agoMerge pull request #2462 from longjon/correct-python-exceptions
Evan Shelhamer [Thu, 6 Aug 2015 07:27:59 +0000 (00:27 -0700)]
Merge pull request #2462 from longjon/correct-python-exceptions

Handle Python layer exceptions correctly

9 years agoMerge pull request #2859 from philkr/image_data
Evan Shelhamer [Tue, 4 Aug 2015 18:57:51 +0000 (11:57 -0700)]
Merge pull request #2859 from philkr/image_data

ImageData layer default batch size of 1, and check for zero batch size

9 years agoImageData layer default batch size of 1, and check for zero batch size
philkr [Tue, 4 Aug 2015 17:27:34 +0000 (10:27 -0700)]
ImageData layer default batch size of 1, and check for zero batch size

9 years agoMerge pull request #2583 from lukeyeager/fix-log-levels
Jeff Donahue [Mon, 3 Aug 2015 23:19:47 +0000 (16:19 -0700)]
Merge pull request #2583 from lukeyeager/fix-log-levels

Change log levels in upgrade_proto

9 years agoChange log levels in upgrade_proto
Luke Yeager [Wed, 10 Jun 2015 00:50:40 +0000 (17:50 -0700)]
Change log levels in upgrade_proto

It's not an error if the upgrade succeeds

9 years agoMerge pull request #2837 from longjon/contributing-file
Jon Long [Sun, 2 Aug 2015 21:34:10 +0000 (14:34 -0700)]
Merge pull request #2837 from longjon/contributing-file

Add a CONTRIBUTING.md file, to appear on new Issue/PR pages

9 years ago[docs] add CONTRIBUTING.md which will appear on GitHub new Issue/PR pages
Jonathan L Long [Thu, 30 Jul 2015 03:16:31 +0000 (20:16 -0700)]
[docs] add CONTRIBUTING.md which will appear on GitHub new Issue/PR pages

9 years ago[docs] fix contrastive loss eq
Evan Shelhamer [Thu, 30 Jul 2015 00:20:31 +0000 (17:20 -0700)]
[docs] fix contrastive loss eq

make documented equation match the correct implementation of the
`max(margin - d, 0)^2` term in the loss. see #2321

9 years ago[docs] fix lmdb fetch url and path
Evan Shelhamer [Tue, 28 Jul 2015 17:27:39 +0000 (10:27 -0700)]
[docs] fix lmdb fetch url and path

9 years ago[docs] clear up PYTHONPATH confusion
Evan Shelhamer [Mon, 27 Jul 2015 17:58:11 +0000 (10:58 -0700)]
[docs] clear up PYTHONPATH confusion

Use the same language as the installation page to explain the Python
module path.

reported by @sdemyanov

9 years agoMerge pull request #2807 from Franck-Dernoncourt/patch-1
Jon Long [Thu, 23 Jul 2015 03:37:17 +0000 (20:37 -0700)]
Merge pull request #2807 from Franck-Dernoncourt/patch-1

Fix path to mnist_autoencoder.prototxt

9 years agoFix path to mnist_autoencoder.prototxt
Franck Dernoncourt [Thu, 23 Jul 2015 00:32:12 +0000 (17:32 -0700)]
Fix path to mnist_autoencoder.prototxt

9 years ago[docs] set lmdb url to github mirror
Eric Zeiberg [Wed, 22 Jul 2015 05:12:48 +0000 (22:12 -0700)]
[docs] set lmdb url to github mirror

9 years ago[docs] matlab 2015a compatible
Evan Shelhamer [Tue, 21 Jul 2015 17:33:31 +0000 (10:33 -0700)]
[docs] matlab 2015a compatible

9 years agoMerge pull request #2740 from philkr/travis_python3
Evan Shelhamer [Tue, 21 Jul 2015 05:19:46 +0000 (22:19 -0700)]
Merge pull request #2740 from philkr/travis_python3

[build] Travis scripts for python3 and pytest for cmake.

9 years agoTravis scripts for python3 and pytest for cmake. Also fixes CUDA CMake build issue...
philkr [Wed, 8 Jul 2015 21:30:29 +0000 (14:30 -0700)]
Travis scripts for python3 and pytest for cmake. Also fixes CUDA CMake build issue #2722.

9 years ago[examples] fix link to point to new tutorial notebook
Evan Shelhamer [Fri, 17 Jul 2015 04:30:37 +0000 (21:30 -0700)]
[examples] fix link to point to new tutorial notebook

9 years agoMerge pull request #2762 from kashefy/fix_method_doc
Jon Long [Thu, 16 Jul 2015 03:39:19 +0000 (20:39 -0700)]
Merge pull request #2762 from kashefy/fix_method_doc

tiny fix in Layer::Backward documentation

9 years agotiny fix in Layer::Backward documentation
Youssef Kashef [Tue, 14 Jul 2015 09:26:03 +0000 (11:26 +0200)]
tiny fix in Layer::Backward documentation

9 years agoMerge pull request #2739 from AdamStelmaszczyk/patch-2
Jon Long [Mon, 13 Jul 2015 01:35:25 +0000 (18:35 -0700)]
Merge pull request #2739 from AdamStelmaszczyk/patch-2

One command less in CIFAR10 documentation

9 years agoMerge pull request #2748 from glebm/patch-1
Jon Long [Mon, 13 Jul 2015 00:44:44 +0000 (17:44 -0700)]
Merge pull request #2748 from glebm/patch-1

examples/imagenet: fix broken link

9 years agoMerge pull request #2750 from yosssi/patch-1
Jon Long [Mon, 13 Jul 2015 00:43:56 +0000 (17:43 -0700)]
Merge pull request #2750 from yosssi/patch-1

Update net_layer_blob.md

9 years agoUpdate net_layer_blob.md
Keiji Yoshida [Sun, 12 Jul 2015 11:06:31 +0000 (20:06 +0900)]
Update net_layer_blob.md

9 years agoexamples/imagenet: fix broken link
Gleb Mazovetskiy [Sun, 12 Jul 2015 03:16:14 +0000 (04:16 +0100)]
examples/imagenet: fix broken link

9 years agoMerge pull request #2742 from philkr/absval_warning
Jeff Donahue [Sat, 11 Jul 2015 00:28:51 +0000 (17:28 -0700)]
Merge pull request #2742 from philkr/absval_warning

Removes a unused variable warning

9 years agoRemoves a unused variable warning
philkr [Sat, 11 Jul 2015 00:03:03 +0000 (17:03 -0700)]
Removes a unused variable warning

9 years agoOne command less
AdamStelmaszczyk [Fri, 10 Jul 2015 20:41:46 +0000 (21:41 +0100)]
One command less

Also more readable and compatible with format of instructions for MNIST https://github.com/BVLC/caffe/tree/master/examples/mnist

9 years agoMerge pull request #2712 from semitrivial/master
Jeff Donahue [Fri, 10 Jul 2015 03:42:42 +0000 (20:42 -0700)]
Merge pull request #2712 from semitrivial/master

List protobuf-compiler dependency in the correct place (it is in the …

9 years agoMerge pull request #2714 from philkr/python3_netspec
Jon Long [Wed, 8 Jul 2015 23:12:53 +0000 (16:12 -0700)]
Merge pull request #2714 from philkr/python3_netspec

Making the net_spec python3 compatible

9 years agoMaking the net_spec python3 compatible
philkr [Tue, 7 Jul 2015 23:32:46 +0000 (16:32 -0700)]
Making the net_spec python3 compatible

9 years agoMerge pull request #2716 from lukeyeager/cmake-typos
Evan Shelhamer [Wed, 8 Jul 2015 12:04:27 +0000 (14:04 +0200)]
Merge pull request #2716 from lukeyeager/cmake-typos

[build] fix CMake typos

9 years agoFix CMake typos
Luke Yeager [Wed, 8 Jul 2015 04:30:33 +0000 (21:30 -0700)]
Fix CMake typos

No functional changes, just fixing whitespace errors and typos in
comments

9 years agoList protobuf-compiler dependency in the correct place (it is in the package managers...
semitrivial [Tue, 7 Jul 2015 07:29:16 +0000 (08:29 +0100)]
List protobuf-compiler dependency in the correct place (it is in the package managers for both 14.04 and 12.04)

9 years agoMerge pull request #2676 from lukeyeager/update-docs-boost
Evan Shelhamer [Thu, 2 Jul 2015 23:40:25 +0000 (01:40 +0200)]
Merge pull request #2676 from lukeyeager/update-docs-boost

[docs] install boost without recommends to avoid conflicts -- close #2454

9 years agoUpdate installation docs for boost - close #2454
Luke Yeager [Wed, 1 Jul 2015 23:44:05 +0000 (16:44 -0700)]
Update installation docs for boost - close #2454

9 years agoMerge pull request #2213 from tnarihi/bilinear-upsampling-filler
Evan Shelhamer [Wed, 1 Jul 2015 00:01:31 +0000 (17:01 -0700)]
Merge pull request #2213 from tnarihi/bilinear-upsampling-filler

add bilinear interpolation filler

9 years agobilinear filler -- useful for interpolation with DeconvolutionLayer
Takuya Narihira [Fri, 27 Mar 2015 02:04:15 +0000 (19:04 -0700)]
bilinear filler -- useful for interpolation with DeconvolutionLayer

This filler is a convenience for interpolating with DeconvolutionLayer
or smoothing + downsampling with ConvolutionLayer for stride > 1.

9 years agoMerge pull request #2667 from BVLC/tutorial
Evan Shelhamer [Tue, 30 Jun 2015 22:37:33 +0000 (15:37 -0700)]
Merge pull request #2667 from BVLC/tutorial

bundle CVPR15 tutorial notebooks

9 years ago[examples] add Euclidean loss PythonLayer
Evan Shelhamer [Tue, 30 Jun 2015 22:35:21 +0000 (15:35 -0700)]
[examples] add Euclidean loss PythonLayer

9 years ago[examples] sequence and revise notebooks
Evan Shelhamer [Wed, 18 Mar 2015 02:01:02 +0000 (19:01 -0700)]
[examples] sequence and revise notebooks

- combine classification + filter visualization
- order by classification, learning LeNet, brewing logreg, and
  fine-tuning to flickr style
- improve flow of content in classification + filter visualization
- include solver needed for learning LeNet
- edit notebook descriptions for site catalogue

9 years ago[examples] flickr fine-tuning notebook
Yangqing Jia [Tue, 17 Mar 2015 17:50:42 +0000 (10:50 -0700)]
[examples] flickr fine-tuning notebook

9 years ago[examples] draft Python solving example
Jonathan L Long [Thu, 12 Mar 2015 08:03:51 +0000 (01:03 -0700)]
[examples] draft Python solving example

9 years agoMerge pull request #2086 from longjon/python-net-spec
Evan Shelhamer [Tue, 30 Jun 2015 20:33:54 +0000 (13:33 -0700)]
Merge pull request #2086 from longjon/python-net-spec

Python net specification

9 years ago[pytest] minimal testing of net specification
Jonathan L Long [Thu, 18 Jun 2015 20:25:08 +0000 (13:25 -0700)]
[pytest] minimal testing of net specification

9 years ago[examples] caffenet python spec
Jonathan L Long [Tue, 10 Mar 2015 00:43:53 +0000 (17:43 -0700)]
[examples] caffenet python spec

9 years ago[pycaffe] basic net specification
Jonathan L Long [Thu, 15 Jan 2015 09:27:42 +0000 (01:27 -0800)]
[pycaffe] basic net specification

9 years agoMerge pull request #2611 from dpaiton/test_net_bugfix
Evan Shelhamer [Tue, 23 Jun 2015 21:48:24 +0000 (14:48 -0700)]
Merge pull request #2611 from dpaiton/test_net_bugfix

[compatibility] fix syntax for old protobuf

9 years agocopyright 2015
Evan Shelhamer [Tue, 23 Jun 2015 16:59:22 +0000 (09:59 -0700)]
copyright 2015

9 years agoMerge pull request #2579 from lukeyeager/draw-fix
Evan Shelhamer [Tue, 23 Jun 2015 16:54:26 +0000 (09:54 -0700)]
Merge pull request #2579 from lukeyeager/draw-fix

small platform-specific bugfix for draw.py

9 years agoMerge pull request #2636 from berleon/master
Sergio Guadarrama [Mon, 22 Jun 2015 15:36:33 +0000 (08:36 -0700)]
Merge pull request #2636 from berleon/master

fixed _force_color check, fixes #2635

9 years agofixed _force_color check, fixes #2635
berleon [Mon, 22 Jun 2015 12:41:59 +0000 (14:41 +0200)]
fixed _force_color check, fixes #2635

9 years agoMerge pull request #2609 from lukeyeager/doc-fixes
Evan Shelhamer [Fri, 19 Jun 2015 22:39:59 +0000 (15:39 -0700)]
Merge pull request #2609 from lukeyeager/doc-fixes

[docs] fix "the life of a branch" formatting

9 years agofixed two bugs with prototext format
Dylan Paiton [Wed, 17 Jun 2015 00:57:07 +0000 (17:57 -0700)]
fixed two bugs with prototext format

The first bug was in InitUnsharedWeightsNet. Proto var was of type
ostringstream, which converted the bool bias_term into an int. I
wrote an inline conditional to convert the term into a string.
This allows backwards compatibility with earlier prototext
versions (e.g. version 2.3.0 on Redhat was failing without this).

The second bug was in the syntax for repeated bool parameters,
assigned to the propagate_down parameter. The style used for e.g.
propagate_down: [true,true] does not work with earlier prototext
versions (failed with version 2.3.0 on Redhat). New syntax works
for all versions.

9 years agoFix HTML display for docs
Luke Yeager [Tue, 16 Jun 2015 16:12:32 +0000 (09:12 -0700)]
Fix HTML display for docs

Doesn't change display in Markdown

9 years agoMerge pull request #2605 from ajschumacher/patch-2
Jeff Donahue [Tue, 16 Jun 2015 00:21:34 +0000 (17:21 -0700)]
Merge pull request #2605 from ajschumacher/patch-2

typo: "a fixed steps" to "at fixed steps"

9 years agotypo: "a fixed steps" to "at fixed steps"
Aaron Schumacher [Mon, 15 Jun 2015 23:53:05 +0000 (19:53 -0400)]
typo: "a fixed steps" to "at fixed steps"

fixing in the correct place as per @shelhamer's advice from #2602

9 years agoMerge pull request #2278 from sguada/db_split
Sergio Guadarrama [Mon, 15 Jun 2015 20:59:02 +0000 (13:59 -0700)]
Merge pull request #2278 from sguada/db_split

Db split

9 years ago[docs] drop out-of-date reference to dev branch
Evan Shelhamer [Wed, 10 Jun 2015 21:43:30 +0000 (17:43 -0400)]
[docs] drop out-of-date reference to dev branch

9 years agoSmall platform-specific bugfix for draw.py
Luke Yeager [Tue, 9 Jun 2015 17:45:16 +0000 (10:45 -0700)]
Small platform-specific bugfix for draw.py

Close #2376

On Gentoo and CentOS (and others?), you get this error:
    Warning: /tmp/tmpjqPQBC:6: string ran past end of line

9 years agoSplit db.hpp into leveldb_db.hpp and lmdb_db.hpp
Sergio Guadarrama [Tue, 31 Mar 2015 00:29:50 +0000 (17:29 -0700)]
Split db.hpp into leveldb_db.hpp and lmdb_db.hpp

9 years agoMerge pull request #2551 from ShaggO/loglayer
Evan Shelhamer [Thu, 4 Jun 2015 19:14:43 +0000 (12:14 -0700)]
Merge pull request #2551 from ShaggO/loglayer

LogLayer gpu functionality moved to .cu file

9 years agoLogLayer gpu functionality moved to .cu file
Malte Stær Nissen [Thu, 4 Jun 2015 09:13:45 +0000 (11:13 +0200)]
LogLayer gpu functionality moved to .cu file

9 years ago[bug] fix double instantiation of GPU methods in LogLayer
Evan Shelhamer [Wed, 3 Jun 2015 17:46:53 +0000 (10:46 -0700)]
[bug] fix double instantiation of GPU methods in LogLayer

9 years agoMerge pull request #2089 from jeffdonahue/reduction-layer
Jeff Donahue [Wed, 3 Jun 2015 04:24:02 +0000 (21:24 -0700)]
Merge pull request #2089 from jeffdonahue/reduction-layer

ReductionLayer

9 years agoAdd ReductionLayer to reduce any number of "tail" axes to a scalar value
Jeff Donahue [Mon, 3 Nov 2014 01:21:37 +0000 (17:21 -0800)]
Add ReductionLayer to reduce any number of "tail" axes to a scalar value

Currently implements operations SUM, MEAN, ASUM (sum of absolute
values), and SUMSQ (sum of squares)

9 years agoMerge pull request #2082 from jeffdonahue/flatten-layer-axis
Jeff Donahue [Wed, 3 Jun 2015 03:01:48 +0000 (20:01 -0700)]
Merge pull request #2082 from jeffdonahue/flatten-layer-axis

FlattenLayer gets a FlattenParameter with an axis, end_axis

9 years agoFlattenLayer gets a FlattenParameter with an axis, end_axis
Jeff Donahue [Thu, 1 Jan 2015 02:02:12 +0000 (18:02 -0800)]
FlattenLayer gets a FlattenParameter with an axis, end_axis

9 years agoMerge pull request #2090 from jeffdonahue/log-layer
Jeff Donahue [Wed, 3 Jun 2015 02:17:21 +0000 (19:17 -0700)]
Merge pull request #2090 from jeffdonahue/log-layer

LogLayer

9 years agoAdd LogLayer
Jeff Donahue [Fri, 2 Jan 2015 07:07:44 +0000 (23:07 -0800)]
Add LogLayer

9 years agoMerge pull request #2054 from mtamburrano/filter_layer_rebased
Jeff Donahue [Wed, 3 Jun 2015 01:32:01 +0000 (18:32 -0700)]
Merge pull request #2054 from mtamburrano/filter_layer_rebased

9 years agoFilterLayer cleanup and bugfix for GPU backward
Jeff Donahue [Wed, 3 Jun 2015 01:21:15 +0000 (18:21 -0700)]
FilterLayer cleanup and bugfix for GPU backward

-caffe_set -> caffe_gpu_set (backward was segfaulting before)
-remove uses of 'offset' (to support >4D blobs)
-change var++ -> ++var (per Google style guide)
-cleanup comments/whitespace

9 years agoFilter Layer implemented
manuele [Fri, 29 May 2015 13:54:38 +0000 (15:54 +0200)]
Filter Layer implemented

9 years agoMerge pull request #2532 from shelhamer/accum-prelu
Jeff Donahue [Tue, 2 Jun 2015 22:23:31 +0000 (15:23 -0700)]
Merge pull request #2532 from shelhamer/accum-prelu

PReLU accumulates grad

9 years agoMerge pull request #2536 from kibum14/master
Jeff Donahue [Tue, 2 Jun 2015 22:23:00 +0000 (15:23 -0700)]
Merge pull request #2536 from kibum14/master

Remove unnecessary filler parameter in the sample model

9 years agoRemove unnecessary filler parameter in the sample model
Kibum Bae [Tue, 2 Jun 2015 13:20:27 +0000 (22:20 +0900)]
Remove unnecessary filler parameter in the sample model

In bvlc_googlenet model, unnecessary filler parameters, 'std', were used
for Xavier weight fillers.

9 years agoPReLU accumulates grad
Takuya Narihira [Fri, 27 Feb 2015 02:59:27 +0000 (18:59 -0800)]
PReLU accumulates grad

9 years agoMerge pull request #2245 from dwt/add_homebrew_comments_to_makefile_config_example
Evan Shelhamer [Mon, 1 Jun 2015 02:33:44 +0000 (19:33 -0700)]
Merge pull request #2245 from dwt/add_homebrew_comments_to_makefile_config_example

[build] add commented out helpers for homebrew users

9 years agoMerge pull request #2064 from drohit92/patch-1
Evan Shelhamer [Mon, 1 Jun 2015 02:19:44 +0000 (19:19 -0700)]
Merge pull request #2064 from drohit92/patch-1

[docs] fix solverstate filename in ImageNet example

9 years agoMerge pull request #2163 from jeffdonahue/slice-concat-kernels
Evan Shelhamer [Mon, 1 Jun 2015 02:17:53 +0000 (19:17 -0700)]
Merge pull request #2163 from jeffdonahue/slice-concat-kernels

CUDA kernels for {Slice,Concat}Layer

9 years agoMerge pull request #2107 from 5kg/fix_mac_doc
Evan Shelhamer [Mon, 1 Jun 2015 02:16:29 +0000 (19:16 -0700)]
Merge pull request #2107 from 5kg/fix_mac_doc

[docs] fix OS X homebrew commands

9 years agoMerge pull request #2400 from cnDelbert/master
Evan Shelhamer [Mon, 1 Jun 2015 02:11:52 +0000 (19:11 -0700)]
Merge pull request #2400 from cnDelbert/master

Correct the REPO_DIRNAME in `examples/web_demo/app.py`

9 years agoMerge pull request #2350 from drdan14/log-parser-python-improved
Evan Shelhamer [Sat, 30 May 2015 07:26:27 +0000 (00:26 -0700)]
Merge pull request #2350 from drdan14/log-parser-python-improved

Python log parser improvements

9 years agoMerge pull request #2522 from MartinThoma/moose
Evan Shelhamer [Sat, 30 May 2015 07:25:07 +0000 (00:25 -0700)]
Merge pull request #2522 from MartinThoma/moose

[pycaffe] groom caffe.draw and draw_net.py

9 years agoMerge pull request #2498 from flx42/cpp_classification_example
Evan Shelhamer [Sat, 30 May 2015 07:22:35 +0000 (00:22 -0700)]
Merge pull request #2498 from flx42/cpp_classification_example

Add a simple C++ classification example

9 years agoMerge pull request #2528 from shelhamer/travis-lmdb-git
Evan Shelhamer [Sat, 30 May 2015 06:58:59 +0000 (23:58 -0700)]
Merge pull request #2528 from shelhamer/travis-lmdb-git

Fix lmdb install for travis

9 years agoMerge pull request #2527 from ronghanghu/matcaffe-update-mean-format
Evan Shelhamer [Sat, 30 May 2015 06:52:15 +0000 (23:52 -0700)]
Merge pull request #2527 from ronghanghu/matcaffe-update-mean-format

switch ilsvrc_2012_mean.mat to W x H x C, update demo and add comments

9 years ago[travis] install lmdb through git mirror
Evan Shelhamer [Sat, 30 May 2015 06:33:26 +0000 (23:33 -0700)]
[travis] install lmdb through git mirror

switch to github mirror of latest tag as tarball to fix stale url.

9 years agoUpdate ilsvrc_2012_mean.mat to W x H x C, update demo and add comments
Ronghang Hu [Sat, 30 May 2015 01:37:32 +0000 (09:37 +0800)]
Update ilsvrc_2012_mean.mat to W x H x C, update demo and add comments

Update previously ilsvrc_2012_mean.mat stores 'image_mean' variable in
H x W x C with BGR channels, which is inconsistent with Caffe's data format
and inconsistent with caffe.io.read_mean(..). Replace 'image_mean' with
'mean_data' variable in W x H x C and update classification_demo.m. Also add
some comments.

9 years agoMerge pull request #2511 from flx42/fix_illegal_mode_changes
Evan Shelhamer [Sat, 30 May 2015 06:11:35 +0000 (23:11 -0700)]
Merge pull request #2511 from flx42/fix_illegal_mode_changes

Fix invalid mode changes during tests

9 years agoMerge pull request #1977 from shelhamer/accum-grad
Evan Shelhamer [Sat, 30 May 2015 05:50:16 +0000 (22:50 -0700)]
Merge pull request #1977 from shelhamer/accum-grad

Decouple the computational batch size and minibatch size by accumulating gradients

9 years agoAdd a simple C++ classification example
Felix Abecassis [Sat, 30 May 2015 05:32:25 +0000 (22:32 -0700)]
Add a simple C++ classification example

Closes #2487

Example usage:
./build/examples/cpp_classification/classification.bin \
  models/bvlc_reference_caffenet/deploy.prototxt \
  models/bvlc_reference_caffenet/bvlc_reference_caffenet.caffemodel \
  data/ilsvrc12/imagenet_mean.binaryproto \
  data/ilsvrc12/synset_words.txt \
  examples/images/cat.jpg

9 years agoMerge pull request #2410 from sguada/datum_transform
Jeff Donahue [Sat, 30 May 2015 04:35:30 +0000 (21:35 -0700)]
Merge pull request #2410 from sguada/datum_transform

Datum transform

9 years ago Merge pull request #2294 from TorosFanny/master
Evan Shelhamer [Sat, 30 May 2015 04:23:22 +0000 (21:23 -0700)]
 Merge pull request #2294 from TorosFanny/master

  [example] fix path for diff in net surgery

9 years ago[example] fix path for diff in net surgery
TorosFanny [Sat, 30 May 2015 04:19:56 +0000 (21:19 -0700)]
[example] fix path for diff in net surgery

9 years agoMerge pull request #2240 from nsubtil/cmake-build-dependencies
Evan Shelhamer [Sat, 30 May 2015 01:23:42 +0000 (18:23 -0700)]
Merge pull request #2240 from nsubtil/cmake-build-dependencies

Wrangle (some) Caffe dependencies through CMake

9 years agoMerge pull request #2468 from Nerei/feature/minor_fix_in_cmake_config_generation
Evan Shelhamer [Sat, 30 May 2015 01:10:18 +0000 (18:10 -0700)]
Merge pull request #2468 from Nerei/feature/minor_fix_in_cmake_config_generation

[build] minor Cmake fix to clear python / numpy in CaffeConfig.cmake generation

9 years agoMerge pull request #2493 from longjon/sketchy-cuda-kernel-loop
Evan Shelhamer [Sat, 30 May 2015 01:08:27 +0000 (18:08 -0700)]
Merge pull request #2493 from longjon/sketchy-cuda-kernel-loop

Fix dangerous state in pooling and LRN CUDA kernels -- thanks @gustavla for the report in #2145

9 years agoMerge pull request #2514 from norouzi/master
Evan Shelhamer [Sat, 30 May 2015 00:56:09 +0000 (17:56 -0700)]
Merge pull request #2514 from norouzi/master

[bug] fix extract_features: zero pad keys + fix multi-feature dbtype bug