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

Projects
None yet
4 participants
@philkr
Contributor

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

This comment has been minimized.

Show comment
Hide comment
@longjon

longjon Feb 25, 2015

Contributor

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

Contributor

longjon commented Feb 25, 2015

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

@Nerei

This comment has been minimized.

Show comment
Hide comment
@Nerei

Nerei Feb 25, 2015

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

Nerei commented Feb 25, 2015

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

@andresromero

This comment has been minimized.

Show comment
Hide comment
@andresromero

andresromero Mar 4, 2015

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?

andresromero commented Mar 4, 2015

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

This comment has been minimized.

Show comment
Hide comment
@longjon

longjon Mar 4, 2015

Contributor

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

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

Merge pull request #1966 from philkr/python_fixes
cmake and python3 bugfixes for #1939 and #1923

@longjon longjon merged commit 136139b into BVLC:master Mar 4, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@philkr philkr deleted the philkr:python_fixes branch Mar 6, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment