Merged
Conversation
Member
|
Nope, the boost headers need to be included before I'm going to hold all the lint changes in |
Contributor
Author
|
Oh, huh, that's odd. It builds for me on Ubuntu (as did the version before this PR -- didn't realize it was actually breaking the build for you, thought it was a runtime issue). Makes sense to hold off on merging. |
changed; saves output to build/cpp_lint.log (or build/cpp_lint.error_log on failure)
Member
|
Thanks for the fix Jeff. I'll fix whatever residual osx problem there is. |
Merged
mitmul
pushed a commit
to mitmul/caffe
that referenced
this pull request
Sep 30, 2014
Fix bugs introduced by lint
wk910930
pushed a commit
to wk910930/caffe
that referenced
this pull request
Jun 21, 2017
* upgrade travis image and cuda * fix ppas
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.
Revert the change introduced by my lint cleanup that probably broke the Python and MATLAB wrappers: changing "using namespace caffe" to "namespace caffe { }". Sorry!
@shelhamer, could you check that this resolves the issues you were having with the Python wrapper? When I diff the versions of the wrappers in this PR against bca6595 (which @shelhamer reported as working), I now see only style changes that I don't think could alter any behavior, with the exception of changing the single-argument CaffeBlob constructor to be "explicit" in the Python wrapper. (At some point it would be nice to have a couple small unit tests for the wrappers, at least to check that they run at all.)
Also slipping in Makefile changes to suppress unnecessary output ("Done processing...") and not rerun lint if successful and no source files have changed.