Skip to content

Commit 8f22927

Browse files
committed
change default verbosity to LearnAPI.default_verbosity()
1 parent 57c9a5f commit 8f22927

File tree

8 files changed

+36
-18
lines changed

8 files changed

+36
-18
lines changed

src/learners/classification.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ LearnAPI.features(learner::ConstantClassifier, data) =
4444
LearnAPI.target(learner::ConstantClassifier, data) =
4545
LearnAPI.target(learner, data, front_end)
4646

47-
function LearnAPI.fit(learner::ConstantClassifier, observations::FrontEnds.Obs; verbosity=1)
47+
function LearnAPI.fit(
48+
learner::ConstantClassifier,
49+
observations::FrontEnds.Obs;
50+
verbosity=LearnAPI.default_verbosity(),
51+
)
52+
4853
y = observations.target # integer "codes"
4954
names = observations.names
5055
classes_seen = observations.classes_seen

src/learners/dimension_reduction.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ LearnAPI.obs(model::TruncatedSVDFitted, data) =
6565
LearnAPI.features(learner::TruncatedSVD, data) =
6666
LearnAPI.features(learner, data, FrontEnds.Tarragon())
6767

68-
function LearnAPI.fit(learner::TruncatedSVD, observations::FrontEnds.Obs; verbosity=1)
68+
function LearnAPI.fit(
69+
learner::TruncatedSVD,
70+
observations::FrontEnds.Obs;
71+
verbosity=LearnAPI.default_verbosity(),
72+
)
6973

7074
# unpack hyperparameters:
7175
codim = learner.codim

src/learners/ensembling.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ LearnAPI.obs(model::EnsembleFitted, data) = LearnAPI.obs(first(model.models), da
6969
LearnAPI.target(learner::Ensemble, data) = LearnAPI.target(learner.atom, data)
7070
LearnAPI.features(learner::Ensemble, data) = LearnAPI.features(learner.atom, data)
7171

72-
function LearnAPI.fit(learner::Ensemble, data; verbosity=1)
72+
function LearnAPI.fit(learner::Ensemble, data; verbosity=LearnAPI.default_verbosity())
7373

7474
# unpack hyperparameters:
7575
atom = learner.atom
@@ -112,7 +112,7 @@ function LearnAPI.update(
112112
model::EnsembleFitted,
113113
data,
114114
replacements::Pair{Symbol}...;
115-
verbosity=1,
115+
verbosity=LearnAPI.default_verbosity(),
116116
)
117117
learner_old = LearnAPI.learner(model)
118118
learner = LearnAPI.clone(learner_old, replacements...)
@@ -361,7 +361,7 @@ struct StumpRegressorFitted
361361
rng
362362
end
363363

364-
function LearnAPI.fit(learner::StumpRegressor, data; verbosity=1)
364+
function LearnAPI.fit(learner::StumpRegressor, data; verbosity=LearnAPI.default_verbosity())
365365

366366
x, y = data
367367
rng = deepcopy(learner.rng)
@@ -426,7 +426,7 @@ function LearnAPI.update(
426426
model::StumpRegressorFitted,
427427
data, # ignored as cached
428428
replacements::Pair{Symbol}...;
429-
verbosity=1,
429+
verbosity=LearnAPI.default_verbosity(),
430430
)
431431

432432
learner_old = LearnAPI.learner(model)

src/learners/gradient_descent.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ point predictions with `predict(model, Point(), Xnew)`.
111111
112112
# Warm restart options
113113
114-
update(model, newdata, :epochs=>n, other_replacements...; verbosity=1)
114+
update(model, newdata, :epochs=>n, other_replacements...)
115115
116116
If `Δepochs = n - perceptron.epochs` is non-negative, then return an updated model, with
117117
the weights and bias of the previously learned perceptron used as the starting state in
@@ -120,7 +120,7 @@ instead of the previous training data. Any other hyperparaameter `replacements`
120120
adopted. If `Δepochs` is negative or not specified, instead return `fit(learner,
121121
newdata)`, where `learner=LearnAPI.clone(learner; epochs=n, replacements....)`.
122122
123-
update_observations(model, newdata, replacements...; verbosity=1)
123+
update_observations(model, newdata, replacements...)
124124
125125
Return an updated model, with the weights and bias of the previously learned perceptron
126126
used as the starting state in new gradient descent updates. Adopt any specified
@@ -197,7 +197,7 @@ LearnAPI.learner(model::PerceptronClassifierFitted) = model.learner
197197
function LearnAPI.fit(
198198
learner::PerceptronClassifier,
199199
observations::PerceptronClassifierObs;
200-
verbosity=1,
200+
verbosity=LearnAPI.default_verbosity(),
201201
)
202202

203203
# unpack hyperparameters:
@@ -233,7 +233,7 @@ function LearnAPI.update_observations(
233233
model::PerceptronClassifierFitted,
234234
observations_new::PerceptronClassifierObs,
235235
replacements...;
236-
verbosity=1,
236+
verbosity=LearnAPI.default_verbosity(),
237237
)
238238

239239
# unpack data:
@@ -265,7 +265,7 @@ function LearnAPI.update(
265265
model::PerceptronClassifierFitted,
266266
observations::PerceptronClassifierObs,
267267
replacements...;
268-
verbosity=1,
268+
verbosity=LearnAPI.default_verbosity(),
269269
)
270270

271271
# unpack data:

src/learners/incremental_algorithms.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,19 @@ end
4848

4949
LearnAPI.learner(::NormalEstimatorFitted) = NormalEstimator()
5050

51-
function LearnAPI.fit(::NormalEstimator, y; verbosity=1)
51+
function LearnAPI.fit(::NormalEstimator, y; verbosity=LearnAPI.default_verbosity())
5252
n = length(y)
5353
Σy = sum(y)
5454
= Σy/n
5555
ss = sum(x->x^2, y) - n*^2
5656
return NormalEstimatorFitted(Σy, ȳ, ss, n)
5757
end
5858

59-
function LearnAPI.update_observations(model::NormalEstimatorFitted, ynew; verbosity=1)
59+
function LearnAPI.update_observations(
60+
model::NormalEstimatorFitted,
61+
ynew;
62+
verbosity=LearnAPI.default_verbosity(),
63+
)
6064
m = length(ynew)
6165
n = model.n + m
6266
Σynew = sum(ynew)

src/learners/regression.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ LearnAPI.obs(model::RidgeFitted, data) = obs(model, data, frontend)
4646
LearnAPI.features(learner::Ridge, data) = LearnAPI.features(learner, data, frontend)
4747
LearnAPI.target(learner::Ridge, data) = LearnAPI.target(learner, data, frontend)
4848

49-
function LearnAPI.fit(learner::Ridge, observations::FrontEnds.Obs; verbosity=1)
49+
function LearnAPI.fit(
50+
learner::Ridge,
51+
observations::FrontEnds.Obs;
52+
verbosity=LearnAPI.default_verbosity(),
53+
)
5054

5155
# unpack hyperparameters and data:
5256
lambda = learner.lambda
@@ -130,7 +134,7 @@ struct BabyRidgeFitted{T,F}
130134
feature_importances::F
131135
end
132136

133-
function LearnAPI.fit(learner::BabyRidge, data; verbosity=1)
137+
function LearnAPI.fit(learner::BabyRidge, data; verbosity=LearnAPI.default_verbosity())
134138

135139
X, y = data
136140

src/learners/static_algorithms.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Selector(; names=Symbol[]) = Selector(names) # LearnAPI.constructor defined lat
3636

3737
# `fit` consumes no observational data, does no "learning", and just returns a thinly
3838
# wrapped `learner` (to distinguish it from the learner in dispatch):
39-
LearnAPI.fit(learner::Selector; verbosity=1) = Ref(learner)
39+
LearnAPI.fit(learner::Selector; verbosity=LearnAPI.default_verbosity()) = Ref(learner)
4040
LearnAPI.learner(model::Base.RefValue{Selector}) = model[]
4141

4242
function LearnAPI.transform(model::Base.RefValue{Selector}, X)
@@ -107,7 +107,8 @@ LearnAPI.learner(model::FancySelectorFitted) = model.learner
107107
rejected(model::FancySelectorFitted) = model.rejected
108108

109109
# Here we are wrapping `learner` with a place-holder for the `rejected` feature names.
110-
LearnAPI.fit(learner::FancySelector; verbosity=1) = FancySelectorFitted(learner)
110+
LearnAPI.fit(learner::FancySelector; verbosity=LearnAPI.default_verbosity()) =
111+
FancySelectorFitted(learner)
111112

112113
# output the filtered table and add `rejected` field to model (mutatated!)
113114
function LearnAPI.transform(model::FancySelectorFitted, X)

test/learners/incremental_algorithms.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ y = rand(rng, 50);
1010
ynew = rand(rng, 10);
1111

1212
learner = LearnTestAPI.NormalEstimator()
13-
@testapi learner y verbosity=1
13+
@testapi learner y verbosity=0
1414

1515
@testset "NormalEstimator" begin
1616
model = fit(learner, y)

0 commit comments

Comments
 (0)