Cherry pick some commits for v0.14#44
Merged
lukeyeager merged 7 commits intoNVIDIA:caffe-0.14from Oct 22, 2015
Merged
Conversation
- condense conditions by `LOG_IF` - only log memory use once after all tops
Enforcing a consistent ordering - OpenCV, LevelDB, LMDB This will allow me to add the ALLOW_LMDB_NOLOCK option just after the USE_LMDB option, while keeping the IO dependency options together.
This option lets you open LMDB files with the MDB_NOLOCK flag. You should not set this flag if you will be reading LMDBs with any possibility of simultaneous read and write.
Member
Author
|
NOTE - I'm not including BVLC#3116, which is the most significant change so far, AFAICT. |
lukeyeager
added a commit
that referenced
this pull request
Oct 22, 2015
Cherry pick some commits for v0.14
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
6 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.
Picking up some fixes/changes for this release since we snapped from BVLC/master.
Relevant pull requests:
@borisfom any concerns with any of the changes below?