Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake and python3 bugfixes for #1939 and #1923 #1966

Merged
merged 1 commit into from
Mar 4, 2015

Conversation

philkr
Copy link
Contributor

@philkr philkr commented Feb 25, 2015

#1939 replaced PROJECT_SOURCE_DIR with CMAKE_SOURCE_DIR, which breaks building caffe as a subproject (see #1899). This PR reverts to PROJECT_SOURCE_DIR.

Python3 requires list around self.blobs.keys().

philkr added a commit to philkr/caffe that referenced this pull request Feb 25, 2015
@longjon
Copy link
Contributor

longjon commented Feb 25, 2015

Looks good to me. @Nerei, this reverts a change made by you; do you agree?

@Nerei
Copy link

Nerei commented Feb 25, 2015

👍 Ok change. Never knew that someone included caffe in this way.

@andresromero
Copy link

I have tried to use Caffe with Python 3 and I am still finding some bugs related to Python 3 protobuf package, which version of this package are you using?

@longjon
Copy link
Contributor

longjon commented Mar 4, 2015

Okay, merging. @andresromero, I believe you need protobuf 3.0.0-alpha.

longjon added a commit that referenced this pull request Mar 4, 2015
cmake and python3 bugfixes for #1939 and #1923
@longjon longjon merged commit 136139b into BVLC:master Mar 4, 2015
@philkr philkr deleted the python_fixes branch March 6, 2015 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants