platform/upstream/caffe.git
9 years ago[example] update paths in net surgery
Evan Shelhamer [Tue, 16 Sep 2014 15:13:17 +0000 (08:13 -0700)]
[example] update paths in net surgery

9 years agoMerge pull request #1083 from longjon/fix-solver-gpu-init
Evan Shelhamer [Mon, 15 Sep 2014 22:59:17 +0000 (15:59 -0700)]
Merge pull request #1083 from longjon/fix-solver-gpu-init

Fix solver GPU initialization order (e.g., training with cuDNN on non-default device)

9 years agofix caffe train GPU initialization
Jonathan L Long [Mon, 15 Sep 2014 21:15:58 +0000 (14:15 -0700)]
fix caffe train GPU initialization

Previously, the solver constructed nets before the caffe train tool read
the --gpu flag, which can cause errors due to LayerSetUp executing on
the wrong device (breaking cuDNN, for example).

10 years agoMerge pull request #1077 from bhack/glog_ppa
Jeff Donahue [Sun, 14 Sep 2014 22:14:46 +0000 (15:14 -0700)]
Merge pull request #1077 from bhack/glog_ppa

Add ppa for gflag and glog

10 years agoMerge pull request #1076 from kloudkl/cuda-6.5
Evan Shelhamer [Sun, 14 Sep 2014 21:18:52 +0000 (14:18 -0700)]
Merge pull request #1076 from kloudkl/cuda-6.5

Update CUDA to version 6.5 in the Travis install script

10 years agoFix a little typo
bhack [Sun, 14 Sep 2014 20:19:51 +0000 (22:19 +0200)]
Fix a little typo

10 years agoFix comments
bhack [Sun, 14 Sep 2014 19:16:38 +0000 (21:16 +0200)]
Fix comments

10 years agofix spelling error in caffe.proto
Jonathan L Long [Sun, 14 Sep 2014 01:30:52 +0000 (18:30 -0700)]
fix spelling error in caffe.proto

10 years agofix out-of-date next ID comment for SolverParameter
Jonathan L Long [Sun, 14 Sep 2014 01:30:32 +0000 (18:30 -0700)]
fix out-of-date next ID comment for SolverParameter

10 years agoUpdate CUDA to version 6.5 in the Travis install script
Kai Li [Fri, 12 Sep 2014 16:21:06 +0000 (00:21 +0800)]
Update CUDA to version 6.5 in the Travis install script

10 years agoAdd ppa for gflag and glog
bhack [Fri, 12 Sep 2014 17:50:15 +0000 (19:50 +0200)]
Add ppa for gflag and glog

10 years agoMerge pull request #1051 from jeffdonahue/travis-red-errors
Jeff Donahue [Thu, 11 Sep 2014 15:45:09 +0000 (17:45 +0200)]
Merge pull request #1051 from jeffdonahue/travis-red-errors

restore "red X" build failures in Travis

10 years agoadd -fPIC flag to CMake build
Jeff Donahue [Thu, 11 Sep 2014 14:08:12 +0000 (16:08 +0200)]
add -fPIC flag to CMake build

10 years agorestore "red X" build failures in Travis
Jeff Donahue [Mon, 8 Sep 2014 09:11:41 +0000 (11:11 +0200)]
restore "red X" build failures in Travis

10 years agoMerge pull request #1067 from bhack/lmdb
Jeff Donahue [Thu, 11 Sep 2014 05:00:33 +0000 (07:00 +0200)]
Merge pull request #1067 from bhack/lmdb

Get lmdb from openldap

10 years agoFix lmbdb travis with openldap
bhack [Wed, 10 Sep 2014 22:36:04 +0000 (00:36 +0200)]
Fix lmbdb travis with openldap

10 years agoMerge pull request #1053 from jeffdonahue/to3i-elem_max_layer
Jeff Donahue [Wed, 10 Sep 2014 13:49:45 +0000 (15:49 +0200)]
Merge pull request #1053 from jeffdonahue/to3i-elem_max_layer

rebase and fixup #688 from @to3i: elementwise max

10 years agolint & reduce gradient check stepsize to pass checks
Jeff Donahue [Mon, 8 Sep 2014 15:49:42 +0000 (17:49 +0200)]
lint & reduce gradient check stepsize to pass checks

10 years agoImplemented elementwise max layer
to3i [Fri, 11 Jul 2014 11:19:23 +0000 (13:19 +0200)]
Implemented elementwise max layer

10 years agoBack-merge to dev for slides
Evan Shelhamer [Mon, 8 Sep 2014 10:47:47 +0000 (12:47 +0200)]
Back-merge to dev for slides

10 years agoMerge pull request #1052 from shelhamer/caffe-presentation
Evan Shelhamer [Mon, 8 Sep 2014 10:46:21 +0000 (12:46 +0200)]
Merge pull request #1052 from shelhamer/caffe-presentation

Caffe tutorial slides

10 years ago[docs] replace intro slides with caffe tutorial
Evan Shelhamer [Mon, 8 Sep 2014 10:44:21 +0000 (12:44 +0200)]
[docs] replace intro slides with caffe tutorial

10 years agoRevert "call __signbit for CUDA >= 6.5 implementation" -- doesn't
Jeff Donahue [Mon, 8 Sep 2014 09:02:31 +0000 (11:02 +0200)]
Revert "call __signbit for CUDA >= 6.5 implementation" -- doesn't
compile on OSX w/ CUDA 6.5

This reverts commit 8819f5953b903ec8b48e541271737e89a2cd24e6.

10 years agoMerge pull request #1050 from jeffdonahue/linecount-more
Jeff Donahue [Mon, 8 Sep 2014 08:49:06 +0000 (10:49 +0200)]
Merge pull request #1050 from jeffdonahue/linecount-more

linecount counts more dirs than just src/

10 years agoMerge pull request #1044 from jeffdonahue/no-tmpnam
Jeff Donahue [Mon, 8 Sep 2014 08:48:49 +0000 (10:48 +0200)]
Merge pull request #1044 from jeffdonahue/no-tmpnam

change uses of tmpnam to mkstemp/mkdtemp

10 years agolinecount counts more dirs than just src/
Jeff Donahue [Mon, 8 Sep 2014 08:42:55 +0000 (10:42 +0200)]
linecount counts more dirs than just src/

10 years ago[lint] cuDNN conv declaration
Evan Shelhamer [Mon, 8 Sep 2014 08:03:55 +0000 (10:03 +0200)]
[lint] cuDNN conv declaration

10 years agoMerge pull request #1046 from shelhamer/cudnn
Evan Shelhamer [Mon, 8 Sep 2014 07:57:44 +0000 (09:57 +0200)]
Merge pull request #1046 from shelhamer/cudnn

cuDNN acceleration

10 years agoMerge pull request #1049 from niuzhiheng/dev
Jeff Donahue [Mon, 8 Sep 2014 07:28:49 +0000 (09:28 +0200)]
Merge pull request #1049 from niuzhiheng/dev

Fixed CMake script of FindOpenBLAS.

10 years agoFixed CMake script of FindOpenBLAS.
ZhiHeng NIU [Mon, 8 Sep 2014 06:46:43 +0000 (14:46 +0800)]
Fixed CMake script of FindOpenBLAS.

10 years agoMerge pull request #1045 from akosiorek/origin/dev
Jeff Donahue [Mon, 8 Sep 2014 06:41:38 +0000 (08:41 +0200)]
Merge pull request #1045 from akosiorek/origin/dev

Fixed CMake building test objects multiple times

10 years agoMerge pull request #1048 from jyegerlehner/conv_layer-init-weight
Jeff Donahue [Mon, 8 Sep 2014 05:34:46 +0000 (07:34 +0200)]
Merge pull request #1048 from jyegerlehner/conv_layer-init-weight

Conv layer: fix crash by setting weight pointer

10 years agoFix more lint.
J Yegerlehner [Mon, 8 Sep 2014 04:10:33 +0000 (23:10 -0500)]
Fix more lint.

10 years agoRepair crash in conv_layer due to weight pointer being NULL.
J Yegerlehner [Mon, 8 Sep 2014 02:46:38 +0000 (21:46 -0500)]
Repair crash in conv_layer due to weight pointer being NULL.

10 years ago[docs] include cuDNN in installation and performance reference
Evan Shelhamer [Sun, 7 Sep 2014 16:59:40 +0000 (18:59 +0200)]
[docs] include cuDNN in installation and performance reference

10 years agoreport cuDNN error string
Evan Shelhamer [Sat, 6 Sep 2014 07:27:51 +0000 (00:27 -0700)]
report cuDNN error string

10 years agoCUDNN_CHECK
Evan Shelhamer [Sat, 6 Sep 2014 07:18:10 +0000 (00:18 -0700)]
CUDNN_CHECK

10 years agostrategize cuDNN softmax
Evan Shelhamer [Sat, 6 Sep 2014 06:53:04 +0000 (23:53 -0700)]
strategize cuDNN softmax

10 years agostrategize cuDNN activations: ReLU, Sigmoid, TanH
Evan Shelhamer [Sat, 6 Sep 2014 05:43:58 +0000 (22:43 -0700)]
strategize cuDNN activations: ReLU, Sigmoid, TanH

10 years agostrategize cuDNN pooling
Evan Shelhamer [Sat, 6 Sep 2014 04:47:56 +0000 (21:47 -0700)]
strategize cuDNN pooling

10 years agostrategize cuDNN convolution
Evan Shelhamer [Tue, 2 Sep 2014 05:05:43 +0000 (22:05 -0700)]
strategize cuDNN convolution

10 years agocall __signbit for CUDA >= 6.5 implementation
Evan Shelhamer [Thu, 4 Sep 2014 00:45:14 +0000 (17:45 -0700)]
call __signbit for CUDA >= 6.5 implementation

10 years agoadd cuDNN to build
Evan Shelhamer [Mon, 1 Sep 2014 21:51:24 +0000 (14:51 -0700)]
add cuDNN to build

10 years agoadded common.cpp explicitly to tests
Adam Kosiorek [Sun, 7 Sep 2014 17:03:44 +0000 (19:03 +0200)]
added common.cpp explicitly to tests

10 years agocpp and cu files processed separately in test build
Adam Kosiorek [Sat, 6 Sep 2014 12:40:54 +0000 (14:40 +0200)]
cpp and cu files processed separately in test build

10 years agoenabled object file reusing in test builds
Adam Kosiorek [Fri, 5 Sep 2014 23:23:02 +0000 (01:23 +0200)]
enabled object file reusing in test builds

10 years agoadd <cuda>/lib64 only if exists to suppress linker warnings
Jeff Donahue [Sun, 7 Sep 2014 09:47:31 +0000 (11:47 +0200)]
add <cuda>/lib64 only if exists to suppress linker warnings

10 years agoremove uses of tmpnam
Jeff Donahue [Fri, 5 Sep 2014 12:01:46 +0000 (05:01 -0700)]
remove uses of tmpnam

10 years agofix transform_param in mnist_autoencoder.prototxt
Jeff Donahue [Sun, 7 Sep 2014 07:44:58 +0000 (09:44 +0200)]
fix transform_param in mnist_autoencoder.prototxt

10 years ago[docs] tutorial/layers: fix inner product sample
Jonathan L Long [Sun, 7 Sep 2014 05:10:29 +0000 (22:10 -0700)]
[docs] tutorial/layers: fix inner product sample

10 years ago[docs] tutorial/layers: describe some more data layers
Jonathan L Long [Sun, 7 Sep 2014 05:09:13 +0000 (22:09 -0700)]
[docs] tutorial/layers: describe some more data layers

10 years ago[docs] tutorial/layers: clean up sample markdown
Jonathan L Long [Sun, 7 Sep 2014 04:42:35 +0000 (21:42 -0700)]
[docs] tutorial/layers: clean up sample markdown

10 years ago[docs] tutorial/layers: brief descriptions of some loss layers
Jonathan L Long [Sun, 7 Sep 2014 04:39:56 +0000 (21:39 -0700)]
[docs] tutorial/layers: brief descriptions of some loss layers

10 years ago[docs] in tutorial/layers, Options -> Parameters
Jonathan L Long [Sun, 7 Sep 2014 04:22:23 +0000 (21:22 -0700)]
[docs] in tutorial/layers, Options -> Parameters

It sounds funny to have optional options, and "parameters" is more in
line with the internal usage.

10 years ago[docs] split layer params in required/optional
Jonathan L Long [Sun, 7 Sep 2014 04:20:36 +0000 (21:20 -0700)]
[docs] split layer params in required/optional

Also, make the parameter name come first. This makes it much easier to
find/scan parameters.

10 years ago[docs] add LRN layer to tutorial/layers
Jonathan L Long [Sun, 7 Sep 2014 04:05:56 +0000 (21:05 -0700)]
[docs] add LRN layer to tutorial/layers

10 years ago[docs] fix pooling markdown and add some comments in tutorial
Jonathan L Long [Sun, 7 Sep 2014 03:28:02 +0000 (20:28 -0700)]
[docs] fix pooling markdown and add some comments in tutorial

10 years ago[doc] minor edits to convolution layer in tutorial
Jonathan L Long [Sun, 7 Sep 2014 03:23:55 +0000 (20:23 -0700)]
[doc] minor edits to convolution layer in tutorial

10 years ago[docs] fixup the MathJax notation in tutorial/layers
Jonathan L Long [Sun, 7 Sep 2014 03:14:28 +0000 (20:14 -0700)]
[docs] fixup the MathJax notation in tutorial/layers

10 years agoMerge pull request #1022 from shelhamer/engine
Evan Shelhamer [Sun, 7 Sep 2014 01:47:46 +0000 (03:47 +0200)]
Merge pull request #1022 from shelhamer/engine

Add engine switch to pick computational backend

10 years agorevert separate strategies: engines will extend the caffe standards
Evan Shelhamer [Sat, 6 Sep 2014 02:36:35 +0000 (19:36 -0700)]
revert separate strategies: engines will extend the caffe standards

10 years agorevert engine switch for build to always include caffe engine
Evan Shelhamer [Sat, 6 Sep 2014 02:16:55 +0000 (19:16 -0700)]
revert engine switch for build to always include caffe engine

10 years agodefault engine to Caffe in case config is missing
Evan Shelhamer [Thu, 4 Sep 2014 00:14:59 +0000 (17:14 -0700)]
default engine to Caffe in case config is missing

10 years agodefault engine to Caffe according to compile flag
Evan Shelhamer [Wed, 3 Sep 2014 22:47:35 +0000 (15:47 -0700)]
default engine to Caffe according to compile flag

10 years agogrooming: drop pointless overrides, stub layer comments
Evan Shelhamer [Tue, 2 Sep 2014 05:21:33 +0000 (22:21 -0700)]
grooming: drop pointless overrides, stub layer comments

10 years agostrategize softmax
Evan Shelhamer [Tue, 2 Sep 2014 04:29:50 +0000 (21:29 -0700)]
strategize softmax

10 years agostrategize relu, sigmoid, tanh
Evan Shelhamer [Tue, 2 Sep 2014 04:01:11 +0000 (21:01 -0700)]
strategize relu, sigmoid, tanh

10 years agostrategize pooling
Evan Shelhamer [Tue, 2 Sep 2014 03:27:33 +0000 (20:27 -0700)]
strategize pooling

Scaffold engine switching for pooling.

The Caffe pooling is instantiated without regard for engine in:
- LRNLayer
- PoolingLayer tests
- StochasticPoolingLayer tests
- MaxPoolingDropout tests

10 years agostrategize Caffe convolution
Evan Shelhamer [Tue, 2 Sep 2014 01:56:08 +0000 (18:56 -0700)]
strategize Caffe convolution

10 years agoifdef engine default
Evan Shelhamer [Tue, 2 Sep 2014 00:44:50 +0000 (17:44 -0700)]
ifdef engine default

10 years agoadd engine parameter for multiple computational strategies
Evan Shelhamer [Tue, 2 Sep 2014 00:15:33 +0000 (17:15 -0700)]
add engine parameter for multiple computational strategies

add `engine` switch to layers for selecting a computational backend when
there is a choice. Currently the standard Caffe implementation is the
only backend.

10 years agogroom proto: sort layer type parameters, put loss_weight after basics
Evan Shelhamer [Mon, 1 Sep 2014 23:54:01 +0000 (16:54 -0700)]
groom proto: sort layer type parameters, put loss_weight after basics

10 years agoshift CUDA code out of common
Evan Shelhamer [Mon, 1 Sep 2014 22:43:36 +0000 (15:43 -0700)]
shift CUDA code out of common

10 years agoAdded initial Hinge Loss
Sergio [Sat, 6 Sep 2014 23:30:32 +0000 (16:30 -0700)]
Added initial Hinge Loss

10 years agomore layers
Yangqing Jia [Sat, 6 Sep 2014 16:35:13 +0000 (09:35 -0700)]
more layers

10 years agoconv and pooling
Yangqing Jia [Sat, 6 Sep 2014 00:03:29 +0000 (17:03 -0700)]
conv and pooling

10 years agoneuron layers doc
Yangqing Jia [Fri, 5 Sep 2014 23:44:06 +0000 (16:44 -0700)]
neuron layers doc

10 years agoupdate net
Yangqing Jia [Fri, 5 Sep 2014 20:47:11 +0000 (13:47 -0700)]
update net

10 years agofix leaky relu
Yangqing Jia [Fri, 5 Sep 2014 20:05:35 +0000 (13:05 -0700)]
fix leaky relu

10 years agomore blob details
Yangqing Jia [Fri, 5 Sep 2014 19:58:28 +0000 (12:58 -0700)]
more blob details

10 years agorelu,sigmoid,tanh
Yangqing Jia [Fri, 5 Sep 2014 18:06:26 +0000 (11:06 -0700)]
relu,sigmoid,tanh

10 years ago[docs] fix br code
Evan Shelhamer [Fri, 5 Sep 2014 17:42:45 +0000 (10:42 -0700)]
[docs] fix br code

10 years ago[docs] link tutorial
Evan Shelhamer [Fri, 5 Sep 2014 17:41:20 +0000 (10:41 -0700)]
[docs] link tutorial

10 years ago[docs] add titles
Evan Shelhamer [Fri, 5 Sep 2014 17:40:39 +0000 (10:40 -0700)]
[docs] add titles

10 years agoMerge pull request #1036 from longjon/test-initialization-param
Evan Shelhamer [Fri, 5 Sep 2014 16:43:54 +0000 (09:43 -0700)]
Merge pull request #1036 from longjon/test-initialization-param

Add test_initialization option to allow skipping initial test

10 years agoMerge pull request #1039 from sergeyk/dev
Evan Shelhamer [Fri, 5 Sep 2014 07:07:53 +0000 (00:07 -0700)]
Merge pull request #1039 from sergeyk/dev

[example] HDF5 classification

10 years agoMerge pull request #1040 from qipeng/solver-test-fix
Evan Shelhamer [Fri, 5 Sep 2014 00:42:26 +0000 (17:42 -0700)]
Merge pull request #1040 from qipeng/solver-test-fix

fix gradient-solver test by reducing iterations to relax precision

10 years agoGradient-based solver test fix
qipeng [Fri, 5 Sep 2014 00:20:35 +0000 (17:20 -0700)]
Gradient-based solver test fix

10 years agoadded a two-layer network that gets higher accuracy
Sergey Karayev [Fri, 5 Sep 2014 00:08:01 +0000 (01:08 +0100)]
added a two-layer network that gets higher accuracy

10 years ago[docs] fix formatting and other errors in loss & solver
Jeff Donahue [Thu, 4 Sep 2014 22:40:04 +0000 (15:40 -0700)]
[docs] fix formatting and other errors in loss & solver

10 years ago[fix] stop cloc complaint about cu type
Evan Shelhamer [Thu, 4 Sep 2014 19:54:48 +0000 (12:54 -0700)]
[fix] stop cloc complaint about cu type

10 years agofix fine-tuning example: paths, test acc., and total fine-tuning time
Evan Shelhamer [Thu, 4 Sep 2014 18:43:41 +0000 (11:43 -0700)]
fix fine-tuning example: paths, test acc., and total fine-tuning time

10 years agoHDF5 classification example
Sergey Karayev [Thu, 4 Sep 2014 17:06:31 +0000 (18:06 +0100)]
HDF5 classification example

10 years agoMerge pull request #917 from sergeyk/model_zoo
Evan Shelhamer [Thu, 4 Sep 2014 09:38:19 +0000 (02:38 -0700)]
Merge pull request #917 from sergeyk/model_zoo

Define standard format for Caffe models to open the "model zoo"

10 years ago[example] update ImageNet timing for K40
Evan Shelhamer [Thu, 4 Sep 2014 09:37:04 +0000 (02:37 -0700)]
[example] update ImageNet timing for K40

10 years agofix model download advice and prototxt name for fine-tuning
Evan Shelhamer [Thu, 4 Sep 2014 09:33:19 +0000 (02:33 -0700)]
fix model download advice and prototxt name for fine-tuning

10 years agoMerge pull request #624 from jeffdonahue/squash-layer
Jeff Donahue [Thu, 4 Sep 2014 06:34:05 +0000 (23:34 -0700)]
Merge pull request #624 from jeffdonahue/squash-layer

SILENCE layer -- takes 1 or more inputs and produces no output (kudos to @longjon for fixup)

10 years agoadd SILENCE layer -- takes one or more inputs and produces no output
Jeff Donahue [Fri, 4 Jul 2014 04:53:31 +0000 (21:53 -0700)]
add SILENCE layer -- takes one or more inputs and produces no output

This is useful for suppressing undesired outputs.

10 years agoadd test_initialization option to allow skipping initial test
Jonathan L Long [Thu, 4 Sep 2014 03:55:00 +0000 (20:55 -0700)]
add test_initialization option to allow skipping initial test

10 years agoscript to upload/update model info as gist
Sergey Karayev [Thu, 4 Sep 2014 02:50:20 +0000 (03:50 +0100)]
script to upload/update model info as gist