Skip to content

Commit

Permalink
Bump scikit-learn, add todo's for future scikit-learn versions
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerjthomas9 committed May 22, 2024
1 parent 4935a66 commit 69b847f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CondaPkg.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

[deps.scikit-learn]
channel = "conda-forge"
version = ">=1.4, <1.5"
version = ">=1.4, <1.6"
1 change: 1 addition & 0 deletions src/models/ensemble.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const AdaBoostClassifier_ = sken(:AdaBoostClassifier)
estimator::Any = nothing
n_estimators::Int = 50::(_ > 0)
learning_rate::Float64 = 1.0::(_ > 0)
#TODO: Remove `SAMME.R` in v1.6
algorithm::String = "SAMME.R"::(_ in ("SAMME", "SAMME.R"))
random_state::Any = nothing
end
Expand Down
2 changes: 2 additions & 0 deletions src/models/linear-classifiers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const LogisticClassifier_ = sklm(:LogisticRegression)
random_state::Any = nothing
solver::String = "lbfgs"::(_ in ("lbfgs", "newton-cg", "liblinear", "sag", "saga"))
max_iter::Int = 100::(_ > 0)
#TODO: Remove `multi_class` in v1.7+
multi_class::String = "auto"::(_ in ("ovr", "multinomial", "auto"))
verbose::Int = 0
warm_start::Bool = false
Expand Down Expand Up @@ -157,6 +158,7 @@ const RidgeCVClassifier_ = sklm(:RidgeClassifierCV)
scoring::Any = nothing
cv::Int = 5
class_weight::Any = nothing
#TODO: Use `store_cv_results` in v1.6+
store_cv_values::Bool = false
end
MMI.fitted_params(m::RidgeCVClassifier, (f, _, _)) = (
Expand Down
1 change: 1 addition & 0 deletions src/models/linear-regressors.jl
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ const RidgeCVRegressor_ = sklm(:RidgeCV)
scoring::Any = nothing
cv::Any = 5
gcv_mode::Option{String} = nothing::(_ === nothing || _ in ("auto","svd","eigen"))
#TODO: Use `store_cv_results` in v1.6+
store_cv_values::Bool = false
end
MMI.fitted_params(model::RidgeCVRegressor, (fitresult, _, _)) = (
Expand Down

0 comments on commit 69b847f

Please sign in to comment.