Skip to content

Comments

fix bugs by adding const#1786

Merged
jeffdonahue merged 1 commit intoBVLC:devfrom
xianjiec:dev
Jan 23, 2015
Merged

fix bugs by adding const#1786
jeffdonahue merged 1 commit intoBVLC:devfrom
xianjiec:dev

Conversation

@xianjiec
Copy link
Contributor

fix bugs by adding const to enable make matcaffe

@jeffdonahue
Copy link
Contributor

Thanks @xianjiec! (Presumably #1686 broke this -- PRs to add matcaffe to our Travis build to prevent things like this from happening in the future are definitely welcome...)

@jeffdonahue
Copy link
Contributor

Hm, was about to merge but looks like the Python tests are failing? @longjon any idea why? Can't imagine it's actually related to the matcaffe changes...

@jeffdonahue
Copy link
Contributor

Ok, I see now that the Python tests were failing at the merge of the PR adding those (https://travis-ci.org/BVLC/caffe/jobs/47889332), so I'll merge this.

jeffdonahue added a commit that referenced this pull request Jan 23, 2015
fix bugs by adding const
@jeffdonahue jeffdonahue merged commit 2faf24b into BVLC:dev Jan 23, 2015
@shelhamer
Copy link
Member

Hm, was about to merge but looks like the Python tests are failing?

This is my fault -- I forgot to update the Python tests in the back-merge that brought #1728 to dev. I'll fix it. Another reason to do away with dual branches...

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.

3 participants