Fix OR vs AND logic error in get_model#593
Open
aymuos15 wants to merge 1 commit intobrainglobe:mainfrom
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
What is this PR
Why is this PR needed?
The original condition in
get_model—if existing_model is not None or network_depth is None— has a logic error. When bothexisting_modelandnetwork_depthareNone, theorevaluates toTrue(becausenetwork_depth is None), causingload_model(None)to be called, which crashes with an unhelpful Keras error.What does this PR do?
orcondition with a clearif / elif / elsechain so thatexisting_modelalways takes precedence when providedValueErrorguard when neitherexisting_modelnornetwork_depthis suppliedNoneerror caseReferences
None.
How has this PR been tested?
Three new unit tests added to
tests/core/test_unit/test_classify/test_tools.py:test_get_model_existing_takes_precedence— verifiesload_modelis called (notbuild_model) when both arguments are providedtest_get_model_builds_with_depth_only— verifiesbuild_modelis called when onlynetwork_depthis giventest_get_model_no_model_no_depth— verifiesValueErroris raised when both areNoneAll 5 tests pass locally.
get_modelnow has 100% line coverage.Is this a breaking change?
No. The only behavioral change is for the
(None, None)case, which was already broken (crashed with an unhelpful Keras error). It now raises a clearValueErrorinstead.Does this PR require an update to the documentation?
No. This is an internal bug fix with no user-facing API changes.
Checklist: