platform/upstream/caffeonacl.git
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 agoMerge pull request #4033 from HeGaoYuan/master
Jeff Donahue [Tue, 26 Apr 2016 23:11:12 +0000 (16:11 -0700)]
Merge pull request #4033 from HeGaoYuan/master

there is a very very small mistake in the LeNet MNIST tutorial

8 years agoMerge pull request #3731 from lukeyeager/lmdb-map-full
Evan Shelhamer [Mon, 25 Apr 2016 21:20:30 +0000 (14:20 -0700)]
Merge pull request #3731 from lukeyeager/lmdb-map-full

dynamically set LMDB map size (double when full)

8 years agoFixed #4029: test the network every 500 iterations, not 1000 iterations
HeGaoYuan [Sat, 23 Apr 2016 06:48:41 +0000 (14:48 +0800)]
Fixed #4029: test the network every 500 iterations, not 1000 iterations

8 years agoUpdate MNIST example to use new DB classes
Luke Yeager [Fri, 26 Feb 2016 04:14:02 +0000 (20:14 -0800)]
Update MNIST example to use new DB classes

8 years agoPrint to stderr for example LMDB code
Luke Yeager [Fri, 26 Feb 2016 04:02:25 +0000 (20:02 -0800)]
Print to stderr for example LMDB code

8 years agoDon't set map_size=1TB in util/db_lmdb
Luke Yeager [Fri, 26 Feb 2016 03:58:01 +0000 (19:58 -0800)]
Don't set map_size=1TB in util/db_lmdb

Instead, double the map size on the MDB_MAP_FULL exception.

8 years agoMerge pull request #4024 from achalddave/finetune-flickr-style-tutorial
Evan Shelhamer [Wed, 20 Apr 2016 21:57:30 +0000 (14:57 -0700)]
Merge pull request #4024 from achalddave/finetune-flickr-style-tutorial

[docs] explicitly point out -weights flag in fine-tuning tutorial

8 years agoMerge pull request #3749 from lukeyeager/bvlc/array_to_datum-default-label
Evan Shelhamer [Wed, 20 Apr 2016 21:56:29 +0000 (14:56 -0700)]
Merge pull request #3749 from lukeyeager/bvlc/array_to_datum-default-label

Don't force datum.label=0 in array_to_datum

8 years agoExplicitly point out -weights flag in tutorial
Achal Dave [Wed, 20 Apr 2016 21:34:29 +0000 (17:34 -0400)]
Explicitly point out -weights flag in tutorial

The -weights flag is somewhat easy to miss as it's only in one command,
but is the crucial thing that anyone searching for 'how to finetune' is
looking for. Hopefully this more clearly points out the '-weights' flag,
which might otherwise be overlooked in this tutorial.

8 years agoMerge pull request #4007 from lukeyeager/bvlc/docs-typo
Evan Shelhamer [Tue, 19 Apr 2016 00:51:52 +0000 (17:51 -0700)]
Merge pull request #4007 from lukeyeager/bvlc/docs-typo

[docs] typo in docs/installation.md

8 years agoTypo in docs/installation.md
Luke Yeager [Mon, 18 Apr 2016 15:54:21 +0000 (08:54 -0700)]
Typo in docs/installation.md

8 years agoMerge pull request #3993 from shelhamer/fix-crop
Evan Shelhamer [Fri, 15 Apr 2016 08:02:02 +0000 (01:02 -0700)]
Merge pull request #3993 from shelhamer/fix-crop

Fix Crop layer dimension checking to only check cropped dimensions

8 years agoCropLayer: groom comments
Evan Shelhamer [Fri, 15 Apr 2016 05:31:38 +0000 (22:31 -0700)]
CropLayer: groom comments

8 years ago[fix] CropLayer: check dimension bounds only for cropped dimensions
Evan Shelhamer [Fri, 15 Apr 2016 05:16:07 +0000 (22:16 -0700)]
[fix] CropLayer: check dimension bounds only for cropped dimensions

check only the dimensions to be cropped for compatible sizes and offsets

8 years ago[test] CropLayer: test dimensions check to reveal bounds checking bug
Evan Shelhamer [Fri, 15 Apr 2016 05:56:37 +0000 (22:56 -0700)]
[test] CropLayer: test dimensions check to reveal bounds checking bug

8 years agoMerge pull request #3988 from shelhamer/install-docs
Evan Shelhamer [Thu, 14 Apr 2016 09:19:27 +0000 (02:19 -0700)]
Merge pull request #3988 from shelhamer/install-docs

bring install docs up-to-date and better highlight included details

8 years ago[docs] install: include more lab tested hardware
Evan Shelhamer [Thu, 14 Apr 2016 01:53:28 +0000 (18:53 -0700)]
[docs] install: include more lab tested hardware

8 years ago[docs] install: be more firm about compute capability >= 3.0
Evan Shelhamer [Thu, 14 Apr 2016 01:52:50 +0000 (18:52 -0700)]
[docs] install: be more firm about compute capability >= 3.0

8 years ago[docs] install: include latest versions and platforms, highlight guides
Evan Shelhamer [Wed, 13 Apr 2016 23:43:39 +0000 (16:43 -0700)]
[docs] install: include latest versions and platforms, highlight guides

Caffe runs on Ubuntu, OS X, and RHEL (+ company) in master
with branches for OpenCL and Windows.

Docker is a nice route to out-of-the-box brewing.

8 years ago[docs] install: CUDA 7+ and cuDNN v4 compatible
Evan Shelhamer [Wed, 13 Apr 2016 23:40:30 +0000 (16:40 -0700)]
[docs] install: CUDA 7+ and cuDNN v4 compatible

Latest CUDA versions are all compatible, and
Caffe has been compatible with cuDNN v4 since PR #3439

8 years agoMerge pull request #3982 from mnogu/fix-typo-model-option
Evan Shelhamer [Wed, 13 Apr 2016 01:18:26 +0000 (18:18 -0700)]
Merge pull request #3982 from mnogu/fix-typo-model-option

[docs] typo in help text for "-model" option

8 years agoFix typo in help text for "-model" option
Muneyuki Noguchi [Tue, 12 Apr 2016 14:19:27 +0000 (23:19 +0900)]
Fix typo in help text for "-model" option

8 years agoMerge pull request #3937 from emaggiori/exp
Jeff Donahue [Fri, 8 Apr 2016 22:07:20 +0000 (15:07 -0700)]
Merge pull request #3937 from emaggiori/exp

Issue with the exp layer when the base is e

8 years agoSolving issue with exp layer with base e
emmanuel maggiori [Fri, 8 Apr 2016 08:25:12 +0000 (10:25 +0200)]
Solving issue with exp layer with base e

8 years agoMerge pull request #3942 from jeffdonahue/propagate-down-true
Jeff Donahue [Tue, 5 Apr 2016 17:15:16 +0000 (10:15 -0700)]
Merge pull request #3942 from jeffdonahue/propagate-down-true

Set propagate_down=true to force backprop to a particular bottom

8 years agoNet: setting `propagate_down: true` forces backprop
Jeff Donahue [Wed, 27 Jan 2016 20:55:41 +0000 (12:55 -0800)]
Net: setting `propagate_down: true` forces backprop

8 years agotest_net.cpp: add TestForcePropagateDown
Jeff Donahue [Mon, 4 Apr 2016 18:36:15 +0000 (11:36 -0700)]
test_net.cpp: add TestForcePropagateDown

8 years agoMerge pull request #3891 from danielgordon10/pycaffe-multi-instantiation-fix
Jon Long [Fri, 1 Apr 2016 20:30:54 +0000 (13:30 -0700)]
Merge pull request #3891 from danielgordon10/pycaffe-multi-instantiation-fix

Use lazy initialization to reuse ordered dict/list creations to saveā€¦

8 years agoUse lazy initialization to reuse orderd dict/list creations to save time on repeated...
Daniel Gordon [Wed, 30 Mar 2016 21:27:19 +0000 (14:27 -0700)]
Use lazy initialization to reuse orderd dict/list creations to save time on repeated calls.

8 years agoMerge pull request #3821 from jreniecki/mkl
Evan Shelhamer [Tue, 29 Mar 2016 21:01:00 +0000 (14:01 -0700)]
Merge pull request #3821 from jreniecki/mkl

[bulid] correct MKL_DIR to MKLROOT

8 years agoUpdate Makefile: Changed MKL_DIR to MKLROOT
JacekR [Tue, 15 Mar 2016 09:43:34 +0000 (10:43 +0100)]
Update Makefile: Changed MKL_DIR to MKLROOT

MKLROOT variable is set by MKL scripts, so it also should be used in Makefile.

8 years agoMerge pull request #3797 from shelhamer/travis-rm-conda
Evan Shelhamer [Wed, 9 Mar 2016 20:42:24 +0000 (12:42 -0800)]
Merge pull request #3797 from shelhamer/travis-rm-conda

Fix Travis-CI conda/boost issue by workaround: remove conda dir

8 years ago[build] travis: remove existing conda dir
Andy Feng [Wed, 9 Mar 2016 18:39:31 +0000 (18:39 +0000)]
[build] travis: remove existing conda dir

there seems to be a caching issue at the moment;
this is a temporary fix for #3786

8 years agoMerge pull request #3292 from dgolden1/log-parse-no-test
Evan Shelhamer [Mon, 7 Mar 2016 21:55:48 +0000 (13:55 -0800)]
Merge pull request #3292 from dgolden1/log-parse-no-test

parse_log.py bugfix: don't attempt to write CSV if there are no lines to write

8 years agoMerge pull request #3590 from junshi15/GPUUtilities
Jon Long [Sun, 6 Mar 2016 03:32:14 +0000 (19:32 -0800)]
Merge pull request #3590 from junshi15/GPUUtilities

Add functions to check and grab GPU

8 years agoMerge pull request #3588 from junshi15/P2psyncPrepare
Jon Long [Sun, 6 Mar 2016 03:17:14 +0000 (19:17 -0800)]
Merge pull request #3588 from junshi15/P2psyncPrepare

Refine P2PSync

8 years agoMerge pull request #3613 from longjon/py-coord-map
Evan Shelhamer [Sat, 5 Mar 2016 19:35:56 +0000 (11:35 -0800)]
Merge pull request #3613 from longjon/py-coord-map

Python/net spec coordinate map and crop offset computation

8 years agoMerge pull request #3570 from BlGene/crop-nd
Evan Shelhamer [Sat, 5 Mar 2016 19:34:50 +0000 (11:34 -0800)]
Merge pull request #3570 from BlGene/crop-nd

ND Crop layer

8 years agosplit p2psync::run()
Jun Shi [Fri, 22 Jan 2016 17:58:37 +0000 (09:58 -0800)]
split p2psync::run()

8 years agoCrop: more tests and test tuning.
Evan Shelhamer [Fri, 4 Mar 2016 10:20:13 +0000 (02:20 -0800)]
Crop: more tests and test tuning.

Changes are:
  reduce test blob dims for speed
  use standard Gaussian filler,
  polish formatting and rename tests,
  test HW crop and 5D crop,
  standard gradient checks

8 years agoCrop: fixes, tests and negative axis indexing.
max argus [Mon, 29 Feb 2016 11:24:25 +0000 (11:24 +0000)]
Crop: fixes, tests and negative axis indexing.

8 years agoExtend Crop to N-D, changed CropParameter.
max argus [Tue, 19 Jan 2016 18:35:04 +0000 (18:35 +0000)]
Extend Crop to N-D, changed CropParameter.

8 years agoadd CropLayer: crop blob to another blob's dimensions with offsets
Jonathan L Long [Sat, 27 Dec 2014 09:44:36 +0000 (01:44 -0800)]
add CropLayer: crop blob to another blob's dimensions with offsets

configure offset(s) through proto definition.

8 years agoadd check and find GPU device utilities
Jun Shi [Fri, 22 Jan 2016 17:50:31 +0000 (09:50 -0800)]
add check and find GPU device utilities

8 years ago[pycaffe] test coord_map
Evan Shelhamer [Fri, 4 Mar 2016 00:39:18 +0000 (16:39 -0800)]
[pycaffe] test coord_map

- test known mappings: conv-pool-deconv stack, ReLU and 1x1 conv
- test effects of padding
- test rectangular/anisotropic coordinate mapping, test N-D
- catch error cases: negative crop, scale mismatch, tops that are not
  spatially connected

8 years ago[pycaffe] align coord_map and #3570 Crop layer
Evan Shelhamer [Sun, 28 Feb 2016 19:51:52 +0000 (11:51 -0800)]
[pycaffe] align coord_map and #3570 Crop layer

- crop -> offset
- adjust crop axis by 1

8 years ago[pycaffe] document, style, and complete coord_map
Evan Shelhamer [Sun, 28 Feb 2016 07:57:42 +0000 (23:57 -0800)]
[pycaffe] document, style, and complete coord_map

- document by docstring and comment
- pep8
- add latest layers and alphabetize
- respect default crop params
- handle graphs with compositions of crops by walking only the
  first, cropped bottom of Crop layers
- make python3 happy by replacing arg tuple unpacking

8 years agoMerge pull request #3770 from BlGene/lint_fix
Evan Shelhamer [Sat, 5 Mar 2016 02:53:21 +0000 (18:53 -0800)]
Merge pull request #3770 from BlGene/lint_fix

Removed lint script reference to non-existant caffe_memcpy function.

8 years ago[pycaffe] add coord_map.py for computing induced coordinate transform
Jonathan L Long [Sat, 30 Jan 2016 02:41:12 +0000 (18:41 -0800)]
[pycaffe] add coord_map.py for computing induced coordinate transform

This provides a framework for automatically aligning different layers of
a net despite up/downsampling, padding, and output size rounding.

8 years agoMerge pull request #3773 from longjon/travis-protobuf3-fix
Jon Long [Fri, 4 Mar 2016 21:58:03 +0000 (13:58 -0800)]
Merge pull request #3773 from longjon/travis-protobuf3-fix

Travis: force protobuf 3.0.0b2 for Python 3

8 years ago[travis] force protobuf 3.0.0b2 for Python 3
Jonathan L Long [Fri, 4 Mar 2016 20:53:49 +0000 (12:53 -0800)]
[travis] force protobuf 3.0.0b2 for Python 3

This is temporary measure to avoid an apparent upstream issue with
protobuf 3.0.0b2.post1.

8 years agoRemoved lint script reference to non-existant caffe_memcpy function.
max argus [Fri, 4 Mar 2016 01:59:48 +0000 (01:59 +0000)]
Removed lint script reference to non-existant caffe_memcpy function.

8 years agoMerge pull request #3575 from errord/fix-boost-shared_ptr-caffe-Blob-float-no-register
Evan Shelhamer [Fri, 4 Mar 2016 00:42:00 +0000 (16:42 -0800)]
Merge pull request #3575 from errord/fix-boost-shared_ptr-caffe-Blob-float-no-register

[pycaffe] fix boost 1.60 compatibility issue; close #3494

8 years agoMerge pull request #3716 from ttdt/master
Jon Long [Thu, 3 Mar 2016 00:23:14 +0000 (16:23 -0800)]
Merge pull request #3716 from ttdt/master

Use six library to ensure pycaffe.py python3 compliance

8 years agoMerge pull request #3759 from vivkul/patch-1
Jeff Donahue [Wed, 2 Mar 2016 05:11:22 +0000 (21:11 -0800)]
Merge pull request #3759 from vivkul/patch-1

minor mistakes removed

8 years agominor mistakes removed
Viveka Kulharia [Wed, 2 Mar 2016 05:07:56 +0000 (10:37 +0530)]
minor mistakes removed

8 years ago[example] groom multilabel notebook title, order
Evan Shelhamer [Tue, 1 Mar 2016 23:41:33 +0000 (15:41 -0800)]
[example] groom multilabel notebook title, order

8 years agoMerge pull request #3755 from shelhamer/fix-upgrade-proto
Evan Shelhamer [Tue, 1 Mar 2016 20:18:57 +0000 (12:18 -0800)]
Merge pull request #3755 from shelhamer/fix-upgrade-proto

Fix Upgrade Net Tools

8 years agoMerge pull request #3471 from beijbom/clean-datalayer-tutorial
Evan Shelhamer [Tue, 1 Mar 2016 18:29:15 +0000 (10:29 -0800)]
Merge pull request #3471 from beijbom/clean-datalayer-tutorial

[example] tutorial on python data layers and multilabel classification

8 years agoMerge pull request #3756 from intelcaffe/mkl-cosmetic-imprvmnts
Evan Shelhamer [Tue, 1 Mar 2016 18:00:33 +0000 (10:00 -0800)]
Merge pull request #3756 from intelcaffe/mkl-cosmetic-imprvmnts

[build] MKL support improvements

8 years ago- doc and cmake update MKL related
Jacek Czaja [Tue, 1 Mar 2016 10:32:21 +0000 (11:32 +0100)]
- doc and cmake update MKL related

- cosmetic change to mkl related doc

8 years agorefuse to upgrade net with layer/layers inconsistency
Evan Shelhamer [Tue, 1 Mar 2016 05:18:50 +0000 (21:18 -0800)]
refuse to upgrade net with layer/layers inconsistency

die loudly if a net definition (prototxt) mixes proto formats by
defining both `layer` and `layers` fields instead of complaining but
discarding and continuing.

fix #3381

8 years agofix input field -> input layer net upgrade: only convert full defs
Evan Shelhamer [Tue, 1 Mar 2016 05:17:21 +0000 (21:17 -0800)]
fix input field -> input layer net upgrade: only convert full defs

convert inputs in legacy definitions (prototxt), but simply strip inputs
from legacy weights (caffemodel).

fix #3750

8 years agocheck all net upgrade conditions
Evan Shelhamer [Tue, 1 Mar 2016 05:15:56 +0000 (21:15 -0800)]
check all net upgrade conditions

check all conditions all the time; V0 -> V1 and V1 -> V2 do not suffice.

8 years agooutput all logging from upgrade net tools
Evan Shelhamer [Tue, 1 Mar 2016 05:13:27 +0000 (21:13 -0800)]
output all logging from upgrade net tools

output info, warnings, and errors for fuller description of the upgrade

8 years agoFinalized tutorial. Removed asyncronous layer.
Oscar Beijbom [Sat, 27 Feb 2016 03:17:21 +0000 (19:17 -0800)]
Finalized tutorial. Removed asyncronous layer.

8 years agoRefactor and improve code style.
Evan Lezar [Thu, 18 Feb 2016 10:50:15 +0000 (11:50 +0100)]
Refactor and improve code style.

Fix some typos. Correct imports. Refactor data layers. Apply PEP8 formatting.

8 years agoAdded tutorial on how to use python datalayers and multilabel classification.
Oscar Beijbom [Mon, 21 Dec 2015 07:02:42 +0000 (23:02 -0800)]
Added tutorial on how to use python datalayers and multilabel classification.

8 years agoDon't force datum.label=0 in array_to_datum
Luke Yeager [Mon, 29 Feb 2016 20:28:15 +0000 (12:28 -0800)]
Don't force datum.label=0 in array_to_datum

8 years agoMerge pull request #3747 from Nerei/master
Evan Shelhamer [Mon, 29 Feb 2016 17:13:01 +0000 (09:13 -0800)]
Merge pull request #3747 from Nerei/master

[pycaffe] NetSpec: set tops by attribute or dictionary

8 years agoNetSpec: allow setting blob names by string
Anatoly Baksheev [Mon, 29 Feb 2016 15:01:07 +0000 (18:01 +0300)]
NetSpec: allow setting blob names by string

8 years agoUse 'six' library to ensure python3 compliance.
Thibault Deregnaucourt [Mon, 29 Feb 2016 09:21:07 +0000 (10:21 +0100)]
Use 'six' library to ensure python3 compliance.
Use '//' instead of '/' for entire division.

8 years agoMerge pull request #3725 from shaibagon/drop_nd_blobs
Jeff Donahue [Sun, 28 Feb 2016 08:31:17 +0000 (00:31 -0800)]
Merge pull request #3725 from shaibagon/drop_nd_blobs

supporting N-D Blobs in Dropout layer Reshape

8 years agosupporting N-D Blobs in Dropout layer Reshape
shai [Thu, 25 Feb 2016 10:09:45 +0000 (12:09 +0200)]
supporting N-D Blobs in Dropout layer Reshape

fixing lint errors

8 years agoMerge pull request #3740 from shelhamer/fix-docker-flags
Evan Shelhamer [Sat, 27 Feb 2016 20:12:24 +0000 (12:12 -0800)]
Merge pull request #3740 from shelhamer/fix-docker-flags

Fix flags for nvidia-docker from #3518

8 years agofix flags in #3518 for nvidia-docker
Evan Shelhamer [Sat, 27 Feb 2016 20:10:16 +0000 (12:10 -0800)]
fix flags in #3518 for nvidia-docker

nvidia-docker requires long args with equal sign as of docker 1.10:
see https://github.com/BVLC/caffe/pull/3518#issuecomment-189576419

8 years agoMerge pull request #3518 from zalando/feature/docker_images
Evan Shelhamer [Sat, 27 Feb 2016 20:08:39 +0000 (12:08 -0800)]
Merge pull request #3518 from zalando/feature/docker_images

[build] Add docker images for running caffe out-of-the-box (caffe:cpu, caffe:gpu)

8 years agoAdd Dockerfiles for creating Caffe executable images.
Evan Lezar [Tue, 5 Jan 2016 15:27:28 +0000 (16:27 +0100)]
Add Dockerfiles for creating Caffe executable images.

These can be used as direct replacements for the Caffe executable.

8 years agoMerge pull request #3211 from shelhamer/input-layer
Evan Shelhamer [Sat, 27 Feb 2016 07:20:39 +0000 (23:20 -0800)]
Merge pull request #3211 from shelhamer/input-layer

Add Input Layer to Replace `input`s

8 years agoDeprecate ForwardPrefilled(), Forward(bottom, loss) in lieu of dropping
Evan Shelhamer [Sat, 27 Feb 2016 06:20:50 +0000 (22:20 -0800)]
Deprecate ForwardPrefilled(), Forward(bottom, loss) in lieu of dropping

Relax removal of `Forward()` variations by deprecating instead.

8 years ago[examples] switch examples + models to Input layers
Evan Shelhamer [Fri, 4 Dec 2015 03:39:19 +0000 (19:39 -0800)]
[examples] switch examples + models to Input layers

8 years agocollect Net inputs from Input layers
Evan Shelhamer [Thu, 3 Dec 2015 02:31:26 +0000 (18:31 -0800)]
collect Net inputs from Input layers

Restore the list of net inputs for compatibility with the
pycaffe and matcaffe interfaces and downstream C++.

8 years agodrop Net inputs + Forward with bottoms
Evan Shelhamer [Sat, 17 Oct 2015 04:11:32 +0000 (21:11 -0700)]
drop Net inputs + Forward with bottoms

Drop special cases for `input` fields, the `Net` input members,
and the `Net` interface for Forward with bottoms along with
Forward() / ForwardPrefilled() distinction.

8 years agodeprecate input fields and upgrade automagically
Evan Shelhamer [Fri, 16 Oct 2015 23:44:45 +0000 (16:44 -0700)]
deprecate input fields and upgrade automagically

8 years agoadd InputLayer for Net input
Evan Shelhamer [Fri, 16 Oct 2015 23:44:23 +0000 (16:44 -0700)]
add InputLayer for Net input

Create an input layer to replace oddball Net `input` fields.

8 years agoMerge pull request #3612 from kashefy/tied_weights_ip_transpose
Jeff Donahue [Thu, 25 Feb 2016 19:17:19 +0000 (11:17 -0800)]
Merge pull request #3612 from kashefy/tied_weights_ip_transpose

Tied weights with transpose flag for InnerProduct layer

8 years agoMerge pull request #3715 from olesalscheider/master
Evan Shelhamer [Thu, 25 Feb 2016 07:21:44 +0000 (23:21 -0800)]
Merge pull request #3715 from olesalscheider/master

CMake: Do not include "${PROJECT_BINARY_DIR}/include" with SYSTEM option

8 years agoMerge pull request #3703 from shaibagon/pycaffe_nd_blobs
Evan Shelhamer [Thu, 25 Feb 2016 01:37:56 +0000 (17:37 -0800)]
Merge pull request #3703 from shaibagon/pycaffe_nd_blobs

[pycaffe] make pycaffe support N-D blobs throughout

8 years agoMerge pull request #3719 from shelhamer/new-tutorial-notebooks
Evan Shelhamer [Thu, 25 Feb 2016 00:41:12 +0000 (16:41 -0800)]
Merge pull request #3719 from shelhamer/new-tutorial-notebooks

[example] Improve Tutorial Notebooks on Classification, Learning LeNet, and Fine-tuning

8 years agoCMake: Do not include "${PROJECT_BINARY_DIR}/include" with SYSTEM option
Niels Ole Salscheider [Wed, 24 Feb 2016 16:00:58 +0000 (17:00 +0100)]
CMake: Do not include "${PROJECT_BINARY_DIR}/include" with SYSTEM option

This is important for the include order. Without this patch, a
previously installed caffe.pb.h might be included instead of the one
that is generated during the build.

8 years ago[example] improve brewing logreg notebook
Jeff Donahue [Wed, 24 Feb 2016 07:42:11 +0000 (23:42 -0800)]
[example] improve brewing logreg notebook

- create solvers inline through python protobuf
- drop manually written solver prototxt
- remove ordering prefix, since there is no real sequencing constraint
  for this example

8 years ago[example] improve fine-tuning notebook
Jeff Donahue [Wed, 24 Feb 2016 07:43:31 +0000 (23:43 -0800)]
[example] improve fine-tuning notebook

- add headings and text detail
- make nets by net spec
- define solvers inline through python protobuf
- do two-stage fine-tuning (first last layer alone, then end-to-end)
- show sample results

8 years ago[example] improve learning LeNet notebook
Jonathan L Long [Wed, 24 Feb 2016 07:46:49 +0000 (23:46 -0800)]
[example] improve learning LeNet notebook

- add subheadings and list steps for structure
- edit text and comments for clarity
- switch paths and use chdir for idempotency of scripts [shelhamer]
- title accuracy plots, rename ip -> fc to fit common naming, and
  rename output layer -> score [shelhamer]
- add experimentation section [shelhamer]

8 years ago[data] get_mnist.sh rewrite; prevents prompt in tutorial notebooks
Jonathan L Long [Fri, 5 Feb 2016 03:41:55 +0000 (19:41 -0800)]
[data] get_mnist.sh rewrite; prevents prompt in tutorial notebooks

8 years ago[example] improve classification notebook
Jonathan L Long [Wed, 24 Feb 2016 07:34:46 +0000 (23:34 -0800)]
[example] improve classification notebook

- add subheadings and list steps
- edit text, add comments, and try to make the code more understandable
- add new section for summary and encouragement to try your own image

8 years agoremoving all references to Blob.num property (that assumes Blob is 4D). Replacing...
shai [Tue, 23 Feb 2016 08:42:54 +0000 (10:42 +0200)]
removing all references to Blob.num property (that assumes Blob is 4D). Replacing it with accessing Blob.shape[0] - for Blobs with num_axes() != 4

8 years agoMerge pull request #3696 from shelhamer/fix-osx-install-name
Evan Shelhamer [Sun, 21 Feb 2016 06:42:05 +0000 (22:42 -0800)]
Merge pull request #3696 from shelhamer/fix-osx-install-name

fix library install name on OS X for @rpath linking

8 years agoMerge pull request #3695 from shelhamer/fix-osx-elcap-cuda-link
Evan Shelhamer [Sun, 21 Feb 2016 06:39:30 +0000 (22:39 -0800)]
Merge pull request #3695 from shelhamer/fix-osx-elcap-cuda-link

Fix OS X El Capitan linking for CUDA

8 years agoFix OSX El Capitan CUDA incompatibility, by adding lib to rpath
Mohamed Ezz [Fri, 5 Feb 2016 00:54:31 +0000 (01:54 +0100)]
Fix OSX El Capitan CUDA incompatibility, by adding lib to rpath