platform/upstream/caffe.git
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 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

8 years agofix library install name on OSX for relative path linking
Evan Shelhamer [Sat, 20 Feb 2016 23:45:31 +0000 (15:45 -0800)]
fix library install name on OSX for relative path linking

for linking of the caffe tools, tests, etc. the library install name
needs to include the @rpath set for the executables and interfaces

this was broken on OSX by #3311

8 years agotranpose parameter added to IP layer to support tied weights in an autoencoder. Argum...
Youssef Kashef [Fri, 29 Jan 2016 18:21:48 +0000 (19:21 +0100)]
tranpose parameter added to IP layer to support tied weights in an autoencoder. Arguments to matrix multiplication function are conditioned on this parameter, no actual transposing takes place.

test ip gradient computation with transpose on

8 years agoMerge pull request #3676 from flx42/leveldb_include_fix
Jeff Donahue [Thu, 18 Feb 2016 07:30:12 +0000 (23:30 -0800)]
Merge pull request #3676 from flx42/leveldb_include_fix

Remove useless LevelDB include

8 years agoMerge pull request #3687 from pra85/patch-2
Jeff Donahue [Thu, 18 Feb 2016 04:54:02 +0000 (20:54 -0800)]
Merge pull request #3687 from pra85/patch-2

Fix a typo in docs

8 years agoFix a typo in docs
Prayag Verma [Thu, 18 Feb 2016 04:43:34 +0000 (10:13 +0530)]
Fix a typo in docs

`peformance` → `performance`

8 years agoRemove useless LevelDB include
Felix Abecassis [Tue, 16 Feb 2016 00:52:32 +0000 (16:52 -0800)]
Remove useless LevelDB include

The tests could not compile with USE_LEVELDB=0 and LevelDB missing from the system

8 years agoMerge pull request #3451 from intelcaffe/cmake-clang-fix
Evan Shelhamer [Thu, 11 Feb 2016 21:19:50 +0000 (13:19 -0800)]
Merge pull request #3451 from intelcaffe/cmake-clang-fix

Fix to cmake build for clang on linux

8 years agoMerge pull request #3650 from intbots/cmake-matlab-fix
Jeff Donahue [Tue, 9 Feb 2016 18:27:35 +0000 (10:27 -0800)]
Merge pull request #3650 from intbots/cmake-matlab-fix

bugfix for incorrect behaviour in `caffe_parse_linker_libs`

8 years agobugfix for incorrect behaviour in caffe_parse_linker_libs function while extracting...
Abhijit Kundu [Tue, 9 Feb 2016 07:45:46 +0000 (02:45 -0500)]
bugfix for incorrect behaviour in caffe_parse_linker_libs function while extracting libflags from absolute library path with multiple (dots)

8 years agoMerge pull request #3624 from drnikolaev/bvlc-print-gpu-names
Jeff Donahue [Wed, 3 Feb 2016 06:05:07 +0000 (22:05 -0800)]
Merge pull request #3624 from drnikolaev/bvlc-print-gpu-names

Nicely prints gpu names

8 years agoNicely prints GPU names
Sergei Nikolaev [Tue, 2 Feb 2016 21:48:18 +0000 (13:48 -0800)]
Nicely prints GPU names

8 years agoMerge pull request #3587 from junshi15/distribute_proto
Evan Shelhamer [Sat, 30 Jan 2016 03:02:45 +0000 (19:02 -0800)]
Merge pull request #3587 from junshi15/distribute_proto

Include proto definition in distribute dir

8 years agoMerge pull request #3545 from gdh1995/relative-path-for-soft-links
Jeff Donahue [Fri, 29 Jan 2016 08:59:23 +0000 (00:59 -0800)]
Merge pull request #3545 from gdh1995/relative-path-for-soft-links

use relative paths on making build/tools/ links

8 years agouse relative paths on making build/tools/ links
gdh1995 [Wed, 13 Jan 2016 10:20:41 +0000 (18:20 +0800)]
use relative paths on making build/tools/ links

The old uses `abspath`, which I think is so harmful:
* If I `cp -a` the whole project, `build/tools/caffe` still refer to
    the old file, until `make clean`, making debugging very hard
* For `tar` and `scp`, the soft links can not work
    unless the target project folder has the same path

8 years agoMerge pull request #2917 from ajkl/patch-2
Jeff Donahue [Wed, 27 Jan 2016 18:43:29 +0000 (10:43 -0800)]
Merge pull request #2917 from ajkl/patch-2

fixing the database param

8 years agoMerge pull request #3022 from jeffdonahue/expose-param-display-names
Jeff Donahue [Wed, 27 Jan 2016 18:37:48 +0000 (10:37 -0800)]
Merge pull request #3022 from jeffdonahue/expose-param-display-names

Net: expose param_display_names_

8 years agoMerge pull request #3605 from jeffdonahue/bias-gemm-type-fix
Jeff Donahue [Wed, 27 Jan 2016 18:34:20 +0000 (10:34 -0800)]
Merge pull request #3605 from jeffdonahue/bias-gemm-type-fix

Remove incorrect cast of gemm int arg to Dtype in BiasLayer

8 years agoRemove incorrect cast of gemm int arg to Dtype in BiasLayer
Jeff Donahue [Wed, 27 Jan 2016 07:09:27 +0000 (23:09 -0800)]
Remove incorrect cast of gemm int arg to Dtype in BiasLayer

8 years agoMerge pull request #3591 from jeffdonahue/scale-bias-layer
Evan Shelhamer [Wed, 27 Jan 2016 01:43:14 +0000 (17:43 -0800)]
Merge pull request #3591 from jeffdonahue/scale-bias-layer

Scale and Bias Layers

8 years agoMerge pull request #2651 from keir/master
Jeff Donahue [Tue, 26 Jan 2016 23:34:42 +0000 (15:34 -0800)]
Merge pull request #2651 from keir/master

8 years agoMake the two separate build systems clearer in the documentation
Keir Mierle [Fri, 26 Jun 2015 07:10:21 +0000 (00:10 -0700)]
Make the two separate build systems clearer in the documentation

8 years agoMerge pull request #3602 from jeffdonahue/rm-cuda-props
Jeff Donahue [Tue, 26 Jan 2016 23:20:07 +0000 (15:20 -0800)]
Merge pull request #3602 from jeffdonahue/rm-cuda-props

Remove unnecessary CAFFE_TEST_CUDA_PROP declarations

8 years agoMerge pull request #2144 from tishibas/load_image-improved
Jeff Donahue [Tue, 26 Jan 2016 23:17:00 +0000 (15:17 -0800)]
Merge pull request #2144 from tishibas/load_image-improved

improved to load RGB image as grayscale image

8 years agoMerge pull request #2810 from madan-ram/patch-2
Jeff Donahue [Tue, 26 Jan 2016 23:07:43 +0000 (15:07 -0800)]
Merge pull request #2810 from madan-ram/patch-2

8 years agoUpdate mnist readme.md: scale moved to transform_param
Madan Ram [Thu, 23 Jul 2015 11:12:15 +0000 (16:42 +0530)]
Update mnist readme.md: scale moved to transform_param

8 years agoMerge pull request #3297 from sjbrown/patch-1
Jeff Donahue [Tue, 26 Jan 2016 22:32:39 +0000 (14:32 -0800)]
Merge pull request #3297 from sjbrown/patch-1

Add a -c to wget so that it continues interrupted downloads

8 years agoMerge pull request #3132 from bwilbertz/LastIterationLoss
Jeff Donahue [Tue, 26 Jan 2016 22:27:27 +0000 (14:27 -0800)]
Merge pull request #3132 from bwilbertz/LastIterationLoss

Fix loss of last iteration when average_loss > 1

8 years agoRemove unnecessary CAFFE_TEST_CUDA_PROP declarations
Jeff Donahue [Tue, 26 Jan 2016 21:58:58 +0000 (13:58 -0800)]
Remove unnecessary CAFFE_TEST_CUDA_PROP declarations