[cmake/build] Fix pyCaffe installation#5670
Closed
jinhangchoi wants to merge 17 commits intoBVLC:masterfrom
Closed
[cmake/build] Fix pyCaffe installation#5670jinhangchoi wants to merge 17 commits intoBVLC:masterfrom
jinhangchoi wants to merge 17 commits intoBVLC:masterfrom
Conversation
* 'master' of https://github.com/cepiross/caffe: Fix pyCaffe installation on Cmake for MacOS # Conflicts: # python/CMakeLists.txt
Signed-off-by: Finnian Anderson <get@finnian.io>
* 'master' of https://github.com/BVLC/caffe: upgrading Accuracy layer: (1) efficient CPU implementation O(L) for top_k, no need for fancy priority_queue etc. (2) GPU implementation [docs] fix link to `AbsVal` layer Fixed bilinear filler, added tests Packages needed by Ubuntu 16.04 also Expose GPU pointers to Python modified division operator for compatibility of python 3 Update README.md Fix hardcode xcode path update deprecated pandas call update sklearn calls to use latest API Update lrn.md docs: add Ubuntu package tracker link in Ubuntu guide docs: update apt installation guide for Debian and Ubuntu Update README.md List branches in readme
Add absolute tolerance to test_net.py to prevent random Travis fails
…e_guide Update link to google style guide.
Fix default mode warning in io.resize_image
Fixed bug where make distribute duplicates python files
fix web demo install instruction link
Member
* 'master' of https://github.com/cepiross/caffe: Consider 2794c97 for cmake compatibility Fix pyCaffe installation on Cmake for MacOS
Author
|
Since commits in this PR cannot be squashed due to merge commits in my master, I rebase my repo and create a branch to provide new PR. |
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.
Since caffe library suffix introduces pycaffe trouble in cmake installation as described in #4314 (MacOS), suffix modification have to be specified.
This PR also considers the existing opencl/windows branch 2794c97 for compatibility.