Evan Shelhamer [Wed, 18 Jan 2017 20:44:39 +0000 (12:44 -0800)]
Merge pull request #5142 from lvchaxj/master
Fix parse_log tool for negative time duration if datetime across year boundary
Evan Shelhamer [Wed, 18 Jan 2017 20:41:31 +0000 (12:41 -0800)]
Merge pull request #5176 from stoneyang/minor
fix minor typo in bvlc_googlenet
Adam Browne [Wed, 18 Jan 2017 20:25:02 +0000 (15:25 -0500)]
Fix various documentation typos (#4172)
* fix typo (standaraized->standardized)
* fix typo (convet->convert, etc..)
* fix typo (incompartible->incompatible)
* fix typo (does't->doesn't)
* fix typo (decoded->decode)
Evan Shelhamer [Wed, 18 Jan 2017 20:17:06 +0000 (12:17 -0800)]
Merge pull request #5148 from caffe-help/caffe-docs-PR1
Overhaul layer catalogue documentation
Evan Shelhamer [Tue, 17 Jan 2017 19:37:41 +0000 (11:37 -0800)]
Merge pull request #5181 from willyd/download-model-py3
Python 2/3 compatible download_model_binary.py
Evan Shelhamer [Tue, 17 Jan 2017 17:12:01 +0000 (09:12 -0800)]
Merge pull request #4563 from cypof/nccl
adopt NVIDIA's NCCL for multi-GPU and switch interface to python
Cyprien Noel [Sat, 14 Jan 2017 19:56:35 +0000 (11:56 -0800)]
Merge pull request #5075 from tsocha/master
Fix mkl issue #4836
Evan Shelhamer [Fri, 13 Jan 2017 21:49:57 +0000 (13:49 -0800)]
Merge pull request #5111 from CDLuminate/add-debian-install-guide
docs: add debian installation guide
Guillaume Dumont [Fri, 13 Jan 2017 19:33:35 +0000 (14:33 -0500)]
Python 2/3 compatible download_model_binary.py
Fan Yang [Thu, 12 Jan 2017 07:26:07 +0000 (15:26 +0800)]
minor typo
Evan Shelhamer [Sat, 7 Jan 2017 21:52:53 +0000 (16:52 -0500)]
Merge pull request #4338 from raffienficiaud/master
[cmake] fix glog upstream autoconf for Ubuntu 16.04
Cyprien Noel [Wed, 4 Jan 2017 08:25:00 +0000 (00:25 -0800)]
Using default from proto for prefetch
Marian Gläser [Thu, 22 Dec 2016 20:25:46 +0000 (12:25 -0800)]
Python layers should build on multiprocess & solver_cnt; enable with bindings
Cyprien Noel [Wed, 23 Nov 2016 00:46:55 +0000 (16:46 -0800)]
Python Multi-GPU
Cyprien Noel [Fri, 6 Jan 2017 22:55:12 +0000 (14:55 -0800)]
Switched multi-GPU to NCCL
Cyprien Noel [Tue, 22 Nov 2016 21:14:45 +0000 (13:14 -0800)]
Logging from python, e.g. for lower log level on multi-GPU workers
Zhou Mo [Thu, 5 Jan 2017 05:00:37 +0000 (05:00 +0000)]
docs: add some tables to debian install guide and misc update
docs: change UTF-8 characters
Zhou Mo [Wed, 4 Jan 2017 02:49:11 +0000 (02:49 +0000)]
docs: update debian installation guide. Thanks to @lukeyeager for comments.
Jonathan R. Williford [Wed, 21 Dec 2016 10:33:42 +0000 (11:33 +0100)]
Add Debian codenames and make link.
Add the Debian codenames / versions, so it is easier to tell which Debian version is which in the future when the releases are promoted.
Revise commit according to CDLuminate's comments.
Removed rolling release numbers. Mention that Debian/testing can install Caffe using the packages.
Jonathan R. Williford [Sun, 1 Jan 2017 18:22:09 +0000 (18:22 +0000)]
Overhaul layer catalogue documentation.
Create scripts/split_caffe_proto.py file for splitting up the
caffe.proto file, so that parts of the file can be included from the
layer help pages.
Create separate pages for each layer and link each page from layers.md.
Xiaojie Deng [Sat, 31 Dec 2016 12:22:17 +0000 (20:22 +0800)]
Fix parse_log.py and parse_log.sh for negative time duration if datetime in log across year boundary
Jeff Donahue [Fri, 30 Dec 2016 18:29:30 +0000 (10:29 -0800)]
Merge pull request #5139 from ftokarev/patches
Fixed typos in test_inner_product_layer.cpp
Fyodor Tokarev [Fri, 30 Dec 2016 14:47:20 +0000 (17:47 +0300)]
Typos in test_inner_product_layer.cpp
Jeff Donahue [Thu, 22 Dec 2016 02:31:11 +0000 (18:31 -0800)]
Merge pull request #5112 from yrevar/patch-1
Fixed a typo
Yagnesh [Thu, 22 Dec 2016 01:05:30 +0000 (17:05 -0800)]
Fixed a typo
Tomasz Socha [Thu, 8 Dec 2016 13:51:30 +0000 (14:51 +0100)]
Use mkl_malloc when use mkl
Zhou Mo [Wed, 21 Dec 2016 09:00:15 +0000 (09:00 +0000)]
docs: add debian installation guide
Evan Shelhamer [Fri, 2 Dec 2016 20:05:45 +0000 (12:05 -0800)]
Merge pull request #5057 from Queuecumber/cuda-pascal-cmake
[build] Add Pascal to all cuda architectures
Max Ehrlich [Fri, 2 Dec 2016 15:13:50 +0000 (10:13 -0500)]
Add Pascal to all cuda architectures
The known gpu architectures were missing the Pascal sm_60 and sm_61 compute capabilities. When building for this GPU, but on a separate machine, like a CI server or inside a docker image, caffe would be built for at most capability sm_50 and crash when run on the Pascal GPU.
Jeff Donahue [Mon, 28 Nov 2016 03:22:37 +0000 (19:22 -0800)]
Merge pull request #5038 from CDLuminate/fix-spelling
Make lint happy (> 80 characters)
Zhou Mo [Mon, 28 Nov 2016 02:17:25 +0000 (02:17 +0000)]
Add the missing period
Zhou Mo [Mon, 28 Nov 2016 01:20:58 +0000 (01:20 +0000)]
Make lint happy (> 80 characters)
Evan Shelhamer [Sun, 27 Nov 2016 09:26:47 +0000 (01:26 -0800)]
Merge pull request #5035 from CDLuminate/fix-spelling
fix many typos by using codespell
Zhou Mo [Sun, 27 Nov 2016 09:13:42 +0000 (09:13 +0000)]
fix many typos by using codespell
Evan Shelhamer [Fri, 25 Nov 2016 20:49:53 +0000 (12:49 -0800)]
Revert "solver: check and set type to reconcile class and proto"
as pointed out by #5028 this does not achieve what it intended, and
furthermore causes trouble with direct solver instantiation.
revert commit
e52451de914312b80a83459cb160c2f72a5b4fea
Evan Shelhamer [Tue, 22 Nov 2016 21:54:15 +0000 (13:54 -0800)]
Merge pull request #5009 from shelhamer/solver-type-check
Solver: check and set type to reconcile class and proto type
Jeff Donahue [Tue, 22 Nov 2016 20:44:19 +0000 (12:44 -0800)]
Merge pull request #4998 from chenzeyuczy/master
Add missing spaces besides equal signs in batch_norm_layer.cpp
Zylphrex [Mon, 21 Nov 2016 18:11:34 +0000 (13:11 -0500)]
Checks inside Xcode for latest OSX SDK (#4840)
OS X: build with latest SDK by default
Evan Shelhamer [Mon, 21 Nov 2016 17:35:57 +0000 (09:35 -0800)]
solver: check and set type to reconcile class and proto
the solver checks its proto type (SolverParameter.type) on
instantiation:
- if the proto type is unspecified it's set according to the class type
`Solver::type()`
- if the proto type and class type conflict, the solver dies loudly
this helps avoid accidental instantiation of a different solver type
than intended when the solver def and class differ. guaranteed type
information in the SolverParameter will simplify multi-solver
coordination too.
Evan Shelhamer [Sat, 19 Nov 2016 00:29:35 +0000 (16:29 -0800)]
Merge pull request #4703 from cypof/avoid_missing_returns
Avoids missing return values during build
Evan Shelhamer [Fri, 18 Nov 2016 17:46:25 +0000 (09:46 -0800)]
Merge pull request #4979 from davidbrai/allow-parse_log-to-skip-lines
Support solver resumes in parse_log.py
chenzy [Fri, 18 Nov 2016 02:28:13 +0000 (10:28 +0800)]
Add missing spaces besides equal signs in batch_norm_layer.cpp
Evan Shelhamer [Thu, 17 Nov 2016 22:50:47 +0000 (14:50 -0800)]
Merge pull request #4986 from shelhamer/sigce-ignore
Sigmoid Cross-Entropy Loss: ignore selected targets by `ignore_label`
Evan Shelhamer [Thu, 17 Nov 2016 04:39:42 +0000 (20:39 -0800)]
sigmoid cross-entropy loss: normalize loss by different schemes
sig-ce loss handles all the same normalizations as the softmax loss;
refer to #3296 for more detail.
this preserves the default normalization for sig-ce loss: batch size.
Evan Shelhamer [Wed, 16 Nov 2016 21:28:46 +0000 (13:28 -0800)]
Merge pull request #4993 from shelhamer/bitfusion-ami
docs: include installation pointer to AWS AMI
Evan Shelhamer [Wed, 16 Nov 2016 21:26:37 +0000 (13:26 -0800)]
docs: include AWS AMI pointer
Evan Shelhamer [Wed, 16 Nov 2016 21:15:06 +0000 (13:15 -0800)]
docs: Guillaume Dumont is the Windows maintainer
Evan Shelhamer [Tue, 15 Nov 2016 19:19:37 +0000 (11:19 -0800)]
sigmoid cross-entropy loss: ignore selected targets by `ignore_label`
sig-ce learns to ignore by zeroing out the loss/diff at targets equal to
the configured `ignore_label`.
n.b. as of now the loss/diff are not properly normalized when there are
ignored targets. sig-ce loss should adopt the same normalization options
as softmax loss.
davidbrai [Mon, 14 Nov 2016 20:10:27 +0000 (22:10 +0200)]
support solver resumes in parse_log.py
Currently parse_log.py skips all non timestamped lines
only once. When resuming a solver and appending to the
same log file, it creates more non timestamped log lines.
This change allows the script to silently skip those lines.
Evan Shelhamer [Sat, 12 Nov 2016 16:11:26 +0000 (11:11 -0500)]
Merge pull request #4971 from williford/docs-installation-add-quotes
Put quotes around titles in YAML front matter of installation docs to remove errors
Jonathan R. Williford [Fri, 11 Nov 2016 07:38:14 +0000 (07:38 +0000)]
Put quotes around titles in YAML front matter.
The colon produces errors unless the title is in quotes. This causes the minor
issue of the HTML title not being set.
See:
https://github.com/jekyll/jekyll/issues/549
Evan Shelhamer [Thu, 3 Nov 2016 17:18:04 +0000 (10:18 -0700)]
Merge pull request #4914 from williford/issue_template
Add GitHub issue template to curb misuse
Jonathan R. Williford [Fri, 28 Oct 2016 08:39:44 +0000 (10:39 +0200)]
Add Github issue template to curb misuse.
For information on Github issue templates, see:
https://github.com/blog/2111-issue-and-pull-request-templates
The template has been revised according to discussion with @shelhamer
and @willyd on pull request BVLC/caffe#4914.
Jeff Donahue [Tue, 1 Nov 2016 17:36:28 +0000 (10:36 -0700)]
Merge pull request #4941 from karas84/caffe-pr
corrected typo in accuracy_layer.hpp: MaxTopBlos -> MaxTopBlobs
Jeff Donahue [Tue, 1 Nov 2016 17:35:30 +0000 (10:35 -0700)]
Merge pull request #4937 from nihui/patch-1
add the missing star in comment
baecchi [Tue, 1 Nov 2016 15:15:51 +0000 (16:15 +0100)]
corrected typo in accuracy_layer.hpp: MaxTopBlos -> MaxTopBlobs
nihui [Tue, 1 Nov 2016 06:02:52 +0000 (14:02 +0800)]
add the missing star in comment
a trival commit which adds the missing star ;)
Evan Shelhamer [Thu, 27 Oct 2016 20:11:23 +0000 (13:11 -0700)]
Merge pull request #4908 from shelhamer/sigce-gpu
Sigmoid Cross-Entropy Loss: add GPU forward for full GPU mode speed-up
Evan Shelhamer [Thu, 27 Oct 2016 07:41:03 +0000 (00:41 -0700)]
sigmoid cross-entropy loss: add GPU forward for full GPU mode
close #3004
Evan Shelhamer [Wed, 5 Oct 2016 16:18:26 +0000 (09:18 -0700)]
Merge pull request #4813 from Shamanoid/patch-1
Fix: docs/yum_install.md glog broken link
Evan Shelhamer [Wed, 5 Oct 2016 16:17:29 +0000 (09:17 -0700)]
Merge pull request #4812 from wk910930/fix-typo
fix typo in pascal_multilabel_datalayers.py
Vincent [Wed, 5 Oct 2016 12:12:04 +0000 (13:12 +0100)]
Fix: docs/yum_install.md glog broken link
fixes the broken glog link in yum_install.md which is currently returning a 404.
Kun Wang [Wed, 5 Oct 2016 10:59:07 +0000 (18:59 +0800)]
fix typo in pascal_multilabel_datalayers.py
Evan Shelhamer [Tue, 4 Oct 2016 01:30:21 +0000 (18:30 -0700)]
Merge pull request #4793 from cypof/cudnn_path
NV changed path to cuDNN
Cyprien Noel [Sat, 1 Oct 2016 01:18:47 +0000 (18:18 -0700)]
NV changed path to cudnn
Evan Shelhamer [Fri, 30 Sep 2016 18:29:25 +0000 (11:29 -0700)]
Merge pull request #4785 from bwilbertz/slightly_relax_batch_norm_check
slightly relax batch norm check
Benedikt Wilbertz [Thu, 29 Sep 2016 19:55:58 +0000 (21:55 +0200)]
slightly relax batch norm check
Evan Shelhamer [Tue, 27 Sep 2016 23:14:43 +0000 (16:14 -0700)]
Merge pull request #4779 from shelhamer/ignore-visualstudio
Ignore Visual Studio Metadata
Ken Yu [Wed, 21 Sep 2016 08:19:17 +0000 (16:19 +0800)]
Ignore Visual Studio Code files.
Evan Shelhamer [Sat, 24 Sep 2016 23:48:27 +0000 (19:48 -0400)]
Merge pull request #4769 from lukeyeager/bvlc/travis-protobuf3-url
[TravisCI] google/protobuf renamed the 3.0 branch
Luke Yeager [Fri, 23 Sep 2016 18:22:48 +0000 (11:22 -0700)]
[TravisCI] google/protobuf renamed the 3.0 branch
Jeff Donahue [Tue, 20 Sep 2016 19:04:49 +0000 (12:04 -0700)]
Merge pull request #4600 from bwilbertz/fix_scale_layer
fix layerSetUp of scale_layer to not add bias blob when already present
Evan Shelhamer [Fri, 16 Sep 2016 18:51:23 +0000 (11:51 -0700)]
Merge pull request #4704 from shelhamer/groom-batch-norm
Batch Norm: Further Documentation and Simplified Definition
Evan Shelhamer [Thu, 15 Sep 2016 22:58:08 +0000 (15:58 -0700)]
Merge pull request #4728 from mlloreda/patch-1
[examples] Fixed typos in examples/cpp_classification/readme
Miguel Lloreda [Thu, 15 Sep 2016 21:28:02 +0000 (17:28 -0400)]
Fixed typos in examples/cpp_classification/readme
Evan Shelhamer [Fri, 9 Sep 2016 23:49:31 +0000 (16:49 -0700)]
batch norm: auto-upgrade old layer definitions w/ param messages
automatically strip old batch norm layer definitions including `param`
messages. the batch norm layer used to require manually masking its
state from the solver by setting `param { lr_mult: 0 }` messages for
each of its statistics. this is now handled automatically by the layer.
Evan Shelhamer [Tue, 30 Aug 2016 06:42:58 +0000 (23:42 -0700)]
batch norm: hide statistics from solver, simplifying layer definition
batch norm statistics are not learnable parameters subject to solver
updates, so they must be shielded from the solver. `BatchNorm` layer now
masks its statistics for itself by zeroing parameter learning rates
instead of relying on the layer definition.
n.b. declaring `param`s for batch norm layers is no longer allowed.
Evan Shelhamer [Sun, 28 Aug 2016 03:23:13 +0000 (20:23 -0700)]
[docs] identify batch norm layer blobs
Evan Shelhamer [Sat, 10 Sep 2016 05:10:39 +0000 (22:10 -0700)]
Merge pull request #4705 from shelhamer/ubuntu-cuda-version
Document that Ubuntu 16.04 Requires CUDA 8
Evan Shelhamer [Sat, 10 Sep 2016 02:46:41 +0000 (19:46 -0700)]
[docs] note CUDA 8 requirement for Ubuntu 16.04
Evan Shelhamer [Sun, 28 Aug 2016 03:19:00 +0000 (20:19 -0700)]
[docs] clarify handling of bias and scaling by BiasLayer, ScaleLayer
A bias/scaling can be applied wherever desired by defining the
respective layers, and `ScaleLayer` can handle both as a memory
optimization.
Evan Shelhamer [Fri, 9 Sep 2016 23:24:14 +0000 (16:24 -0700)]
Merge pull request #4702 from cypof/timer_sync_on_read
Benchmarking should not impact perf until timer is read
Cyprien Noel [Fri, 9 Sep 2016 19:57:09 +0000 (12:57 -0700)]
Avoids missing return values during build.
Cyprien Noel [Fri, 9 Sep 2016 19:49:35 +0000 (12:49 -0700)]
Benchmarking should not impact perf until timer is read
Benedikt Wilbertz [Fri, 12 Aug 2016 20:33:06 +0000 (22:33 +0200)]
fix layerSetUp of scale_layer to not add bias blob when already present
Jeff Donahue [Mon, 29 Aug 2016 22:41:25 +0000 (15:41 -0700)]
Merge pull request #4647 from ClimbsRocks/patch-3
changes "c++" to "C++" for consistency
Jeff Donahue [Mon, 29 Aug 2016 22:41:06 +0000 (15:41 -0700)]
Merge pull request #4646 from ClimbsRocks/patch-2
fixes typo- duplicate "a a"
Jeff Donahue [Mon, 29 Aug 2016 22:40:40 +0000 (15:40 -0700)]
Merge pull request #4645 from ClimbsRocks/patch-1
updates tense in docs
Evan Shelhamer [Mon, 29 Aug 2016 19:54:33 +0000 (12:54 -0700)]
Merge pull request #4655 from lukeyeager/bvlc/protobuf3-build-fix
[TravisCI] build protobuf3 GA
Luke Yeager [Mon, 29 Aug 2016 18:14:17 +0000 (11:14 -0700)]
[TravisCI] - build protobuf3 GA
Preston Parry [Sun, 28 Aug 2016 21:42:57 +0000 (14:42 -0700)]
changes "c++" to "C++" for consistency
Preston Parry [Sun, 28 Aug 2016 21:34:42 +0000 (14:34 -0700)]
fixes typo- duplicate "a a"
Preston Parry [Sun, 28 Aug 2016 21:32:41 +0000 (14:32 -0700)]
updates tense in docs
"could" seems to imply for some reason that something is blocking one from calling the registered layers. "can" lays out more directly that a user can choose to do this.
Jon Long [Wed, 24 Aug 2016 18:41:22 +0000 (11:41 -0700)]
Merge pull request #4589 from sungjunhong/master
Correct a minor mistake in statements
Evan Shelhamer [Sat, 20 Aug 2016 06:18:36 +0000 (23:18 -0700)]
Merge pull request #4605 from shelhamer/osx-cudnn-dylib
[build] Help CMake Find cuDNN on OS X
Tianwei Shen [Mon, 25 Jul 2016 16:19:35 +0000 (00:19 +0800)]
make cmake find cuDNN on Mac OS
dylib instead of so on OS X
Evan Shelhamer [Thu, 18 Aug 2016 20:59:58 +0000 (13:59 -0700)]
Merge pull request #4604 from shelhamer/fix-elcap-blas
[build] make: set default BLAS include for OS X 10.11
Evan Shelhamer [Thu, 18 Aug 2016 18:03:42 +0000 (11:03 -0700)]
[build] set default BLAS include for OS X 10.11
the latest hunt for the ever-elusive vecLib/Accelerate
Evan Shelhamer [Thu, 18 Aug 2016 17:42:33 +0000 (10:42 -0700)]
Merge pull request #3272 from ixartz/master
[cmake] OSX 10.10 (and more) use Accelerate Framework instead of veclib
Evan Shelhamer [Thu, 18 Aug 2016 17:40:10 +0000 (10:40 -0700)]
Merge pull request #4247 from jklontz/master
[cmake] Fix vecLib search order