Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions autopeptideml/data/h_param_search/gradboost_class.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
n_estimators:
type: int
min: 10
max: 1000
min: 8
max: 256
log: True

learning_rate:
Expand Down
4 changes: 2 additions & 2 deletions autopeptideml/data/h_param_search/gradboost_reg.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
n_estimators:
type: int
min: 10
max: 1000
min: 8
max: 256
log: True

learning_rate:
Expand Down
8 changes: 4 additions & 4 deletions autopeptideml/data/h_param_search/lightgbm_class.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
n_estimators:
type: int
min: 10
max: 500
min: 8
max: 256
log: False

class_weight:
Expand All @@ -11,13 +11,13 @@ class_weight:
num_leaves:
type: int
min: 8
max: 1024
max: 256
log: False

max_depth:
type: int
min: 2
max: 10
max: 8
log: False

subsample:
Expand Down
8 changes: 4 additions & 4 deletions autopeptideml/data/h_param_search/lightgbm_reg.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
n_estimators:
type: int
min: 10
max: 500
min: 8
max: 256
log: False

num_leaves:
type: int
min: 8
max: 1024
max: 256
log: False

max_depth:
type: int
min: 2
max: 10
max: 8
log: False

subsample:
Expand Down
2 changes: 1 addition & 1 deletion autopeptideml/data/h_param_search/rf_class.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
n_estimators:
type: int
min: 10
max: 1000
max: 100
log: True

max_depth:
Expand Down
2 changes: 1 addition & 1 deletion autopeptideml/data/h_param_search/rf_reg.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
n_estimators:
type: int
min: 10
max: 1000
max: 100
log: True

max_depth:
Expand Down
7 changes: 3 additions & 4 deletions autopeptideml/data/h_param_search/xgboost_class.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
n_estimators:
type: int
min: 10
max: 1000
min: 8
max: 256
log: True

learning_rate:
Expand Down Expand Up @@ -87,7 +87,6 @@ grow_policy:
- depthwise
- lossguide


sampling_method:
type: fixed
value: uniform
Expand All @@ -102,4 +101,4 @@ verbose:

n_jobs:
type: fixed
value: 1
value: 1
4 changes: 2 additions & 2 deletions autopeptideml/data/h_param_search/xgboost_reg.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
n_estimators:
type: int
min: 10
max: 1000
min: 8
max: 256
log: True

learning_rate:
Expand Down
2 changes: 1 addition & 1 deletion autopeptideml/train/architectures.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from skl2onnx import to_onnx


SKLEARN_MODELS = ['knn', 'svm', 'rf', 'gradboost', 'logreg', 'linreg']
SKLEARN_MODELS = ['knn', 'svm', 'rf', 'gradboost']
ALL_MODELS = SKLEARN_MODELS + ['lightgbm', 'xgboost']


Expand Down
9 changes: 6 additions & 3 deletions autopeptideml/train/trainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -517,9 +517,12 @@ def hpo(
"Please try: `pip install optuna`")
if verbose < 1:
optuna.logging.set_verbosity(optuna.logging.ERROR)
elif verbose < 3:
elif verbose == 1:
optuna.logging.set_verbosity(optuna.logging.WARNING)

elif verbose == 2:
optuna.logging.set_verbosity(optuna.logging.INFO)
elif verbose == 3:
optuna.logging.set_verbosity(optuna.logging.DEBUG)
if isinstance(x, np.ndarray):
x = {'default': x}

Expand Down Expand Up @@ -567,7 +570,7 @@ def hpo(
)
self.study.optimize(self._hpo_step, n_trials=self.n_trials,
callbacks=[callback],
gc_after_trial=True, show_progress_bar=verbose == 2)
gc_after_trial=True, show_progress_bar=verbose >= 2)

@classmethod
def load_from_db(
Expand Down