forked from BVLC/caffe
-
Notifications
You must be signed in to change notification settings - Fork 68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
update recurrent branch with latest BVLC/master #9
Open
dribnet
wants to merge
27
commits into
jeffdonahue:recurrent
Choose a base branch
from
dribnet:recurrent-net-fix
base: recurrent
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(With layers whose backwards accumlate gradients), this effectively decouples the computational batch from the SGD minibatch. Each iteration accumulates gradients over iter_size batches, then parameters are updated.
(double impl from NVIDIA dev docs; float impl included in CUDA as "atomicAdd")
everything in Reshape)
Removed the CPU_ONLY fix introduced in BVLC#2370 because the surrounding Net<Dtype>::Update() logic was previously removed in this feature branch at a7eaaf5. Merge remote-tracking branch 'jeff/recurrent' * jeff/recurrent: (26 commits) RecurrentLayer bugfix: params still need backprop Prototxts + script for training LRCN COCO image captioning model Prototxts + script for training COCO caption language model Add scripts to create HDF5 datasets from COCO captions Add scripts for downloading COCO2014 tools & data Add LSTMLayer and LSTMUnitLayer, with tests Add RNNLayer, with tests Add RecurrentLayer: an abstract superclass for other recurrent layer types TestNet fixes for Net weight sharing modifications Modifications to Net to facilitate unrolled recurrent networks Allow ConcatLayer to take a single bottom Blob (for testing) Allow SliceLayer to have a single top Blob (for testing) EltwiseLayer with coeff blob GPU kernel EltwiseLayer can take a blob of per-num coefficients AccuracyLayer: add 'denominator' param FlattenLayer fix -- top should always Share* from bottom (and do everything in Reshape) Add (very simple version of) ReshapeLayer EmbedBackward with no loops -- use caffe_gpu_atomic_add instead Add EmbedLayer for inner products with sparse input (one-hot vectors), with unit tests test_gradient_check_util: check_bottom < -1 only checks params ... Conflicts: src/caffe/net.cpp
jeffdonahue
force-pushed
the
recurrent
branch
from
September 4, 2015 00:55
d3ebf3e
to
506c4d9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged in latest BVLC/master to keep BVLC#2033 up to date and mergeable. Resolved seemingly straightforward conflict introduced by BVLC#2370 vs a7eaaf5. Confirmed
make runtest
completes successfully (659 tests).