Conversation
c93958a to
5c43f7e
Compare
Conflicts: include/caffe/solver.hpp src/caffe/proto/caffe.proto src/caffe/solver.cpp
5c43f7e to
f61b5b9
Compare
f61b5b9 to
d00c465
Compare
Member
|
@sguada merging this as a stop-gap release to master so that (1) we can ready dev for release and (2) we can update the licensing all at once. Saving ourselves these kinds of merges is part of the argument for the single branch workflow. |
Contributor
Author
|
Thanks Evan On Sunday, December 28, 2014, Evan Shelhamer notifications@github.com
Sergio |
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
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.
This PR back merges these PRs #1096 #190 #1293 #1308 into
masterto allow training, test and deploy of BVLC Googlenet #1598 inmasterMain difference:
mean_valuewithmean_fileintrain_val.prototxt