/caffe

Fix Upgrade Net Tools #3755

Merged
merged 4 commits into from Mar 1, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
bug JD
Projects
None yet
Milestone
No milestone
1 participant
@shelhamer
@shelhamer
Owner

shelhamer commented Mar 1, 2016

  • output logging content from upgrade tools
  • check all net upgrade conditions all the time
  • fix input upgrade logic for binaryproto/caffemodel #3750
  • refuse to process nets with mixed versions #3381

@jeffdonahue any thoughts on the harsher reaction of #3381? I think it is safer and more explicit about the issue.

shelhamer added some commits Mar 1, 2016

@shelhamer shelhamer output all logging from upgrade net tools 
output info, warnings, and errors for fuller description of the upgrade
 01d5a9e
@shelhamer shelhamer check all net upgrade conditions 
check all conditions all the time; V0 -> V1 and V1 -> V2 do not suffice.
 effa941
@shelhamer shelhamer fix input field -> input layer net upgrade: only convert full defs 
convert inputs in legacy definitions (prototxt), but simply strip inputs
from legacy weights (caffemodel).

fix #3750
 ff6c6e4
@shelhamer shelhamer refuse to upgrade net with layer/layers inconsistency 
die loudly if a net definition (prototxt) mixes proto formats by
defining both `layer` and `layers` fields instead of complaining but
discarding and continuing.

fix #3381
7eaeb3a

@shelhamer shelhamer added bug JD labels Mar 1, 2016

@shelhamer shelhamer referenced this pull request Mar 1, 2016

@shelhamer shelhamer deprecate input fields and upgrade automagically bddd04b
@shelhamer
Owner

shelhamer commented Mar 1, 2016

I'm going ahead and merging this since a number of users have run into this issue -- whether to die on mixed version definitions can be amended later if we decide against it.

@shelhamer shelhamer added a commit that referenced this pull request Mar 1, 2016

@shelhamer shelhamer Merge pull request #3755 from shelhamer/fix-upgrade-proto 
Fix Upgrade Net Tools
 f561682

@shelhamer shelhamer merged commit f561682 into BVLC:master Mar 1, 2016
1 check passed

1 check passed

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

shelhamer deleted the shelhamer:fix-upgrade-proto branch Mar 1, 2016

@shelhamer shelhamer added a commit that referenced this pull request Mar 1, 2016

@shelhamer shelhamer f561682 Merge pull request #3755 from shelhamer/fix-upgrade-proto 0b0380c
@shelhamer
Owner

shelhamer commented Mar 2, 2016 • edited

Follow-ups:

  • add more upgrade tests to test_upgrade_proto for data transformer, input
  • test both proto text and proto binary

lukeyeager referenced this pull request Mar 2, 2016

Closed

Expose net stages to pycaffe #3736

@fxbit fxbit added a commit to Yodigram/caffe that referenced this pull request Sep 1, 2016

@shelhamer @fxbit shelhamer + fxbit Merge pull request #3755 from shelhamer/fix-upgrade-proto 
Fix Upgrade Net Tools
 0ac4356

shelhamer referenced this pull request Apr 14, 2017

Closed

Check for mixed format proto definition #2889

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