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.

Sign up for GitHub

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

For a 1.2.1 release #966

Merged
merged 3 commits into from
Mar 17, 2024
Merged

For a 1.2.1 release #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
899a05b
fix problem with training_losses for pipelines
ablaom Mar 17, 2024
b417240
bump 1.2.1
ablaom Mar 17, 2024
f01a03c
Merge pull request #965 from JuliaAI/training-losses-patch
ablaom Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MLJBase"
uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
authors = ["Anthony D. Blaom <[email protected]>"]
version = "1.2.0"
version = "1.2.1"

[deps]
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
Expand Down
14 changes: 3 additions & 11 deletions src/composition/models/pipelines.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,20 +602,12 @@ MMI.target_scitype(p::SupervisedPipeline) = target_scitype(supervised_component(

# ## Training losses

const ERR_TRAINING_LOSSES1 = ErrorException(
"Looking for training losses in a model's report but cannot find any. "
)

const ERR_TRAINING_LOSSES2 = ErrorException(
"Composite model does not appear to support training losses. "
)

# If supervised model does not support training losses, we won't find an entry in the
# report and so we need to return `nothing` (and not throw an error).
function MMI.training_losses(pipe::SupervisedPipeline, pipe_report)
supports_training_losses(pipe::SupervisedPipeline) ||
throw(ERR_PIPE_TRAINING_LOSSES2)
supervised = MLJBase.supervised_component(pipe)
supervised_name = MLJBase.supervised_component_name(pipe)
supervised_name in propertynames(pipe_report) || throw(ERR_PIPE_TRAINING_LOSSES1)
supervised_name in propertynames(pipe_report) || return nothing
report = getproperty(pipe_report, supervised_name)
return training_losses(supervised, report)
end
Expand Down
Loading