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

Fixup AccuracyLayer like SoftmaxLossLayer in #1970 #2076

Merged
merged 3 commits into from
Mar 9, 2015

Conversation

jeffdonahue
Copy link
Contributor

There has been some understandable confusion (e.g. #2063) over my changes to AccuracyLayer in #1970 -- I'm not sure what I was thinking when I added the confusing CHECK_LE -- I don't think it broke any unit tests or examples, but it may have broken something for someone and probably confused a lot of people. Sorry about that. Regardless, this makes AccuracyLayer with ND blobs behave like SoftmaxLossLayer, including adding an axis param to allow for labels with "spatial" axes. (@BlGene's changes in #1942 to add ignore_label are orthogonal and still deserve a rebase.)

Edit: oops, it looks like @BlGene actually did extend this to spatial axes in #1942; sorry @BlGene -- making AccuracyLayer treat its axes just like SoftmaxLossLayer seemed like the clearest path to quickly fixing the confusion I'd created with my previous changes.

@jeffdonahue jeffdonahue changed the title Fixup AccuracyLayer like SoftmaxLossLayer in #1970 -- fixes #2063 Fixup AccuracyLayer like SoftmaxLossLayer in #1970 Mar 9, 2015
@jeffdonahue jeffdonahue force-pushed the accuracy-layer-fixes branch 2 times, most recently from a3e4604 to 3385d1c Compare March 9, 2015 06:36
BlGene added a commit to BlGene/caffe that referenced this pull request Mar 9, 2015
BlGene added a commit to BlGene/caffe that referenced this pull request Mar 9, 2015
@BlGene BlGene mentioned this pull request Mar 9, 2015
BlGene added a commit to BlGene/caffe that referenced this pull request Mar 9, 2015
@jeffdonahue jeffdonahue force-pushed the accuracy-layer-fixes branch 2 times, most recently from a11906c to 8130e57 Compare March 9, 2015 18:44
@jeffdonahue
Copy link
Contributor Author

Added tests for ignore_label and spatial axes in last commit. I think I'll merge this when Travis gives the okay to address the AccuracyLayer confusion brought on by my changes in #1970.

jeffdonahue added a commit that referenced this pull request Mar 9, 2015
Fixup AccuracyLayer like SoftmaxLossLayer in #1970
@jeffdonahue jeffdonahue merged commit 77ab8f6 into BVLC:master Mar 9, 2015
@jeffdonahue jeffdonahue deleted the accuracy-layer-fixes branch March 9, 2015 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants