move CPU_ONLY to right place#2370
Merged
longjon merged 2 commits intoBVLC:masterfrom Apr 26, 2015
gdh1995:master
Merged
Conversation
Contributor
|
Yes, this is equivalent but seems like a slightly better style;
Thanks! |
dribnet
added a commit
to dribnet/caffe
that referenced
this pull request
Apr 27, 2015
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
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
At other places,
CPU_ONLYare used on such a way:A typo in comment is also fixed.