Skip to content
Open
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
16 changes: 9 additions & 7 deletions easy_tpp/hpo/optuna_hpo.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys

import optuna
from omegaconf import OmegaConf
from optuna.samplers import TPESampler
from optuna.trial import TrialState

Expand Down Expand Up @@ -180,10 +181,7 @@ def optimize(
logger.info(f"\t{key}: {value}")

best_metric = trial.value
best_runner_config = RunnerConfig.parse_from_yaml_config(
trial.user_attrs['runner_config'],
data_config=base_runner_config.data_config,
)
best_runner_config = self._build_runner_config_from_storage(study, trial)
return best_metric, best_runner_config

def _get_objective_func(
Expand Down Expand Up @@ -233,8 +231,7 @@ def objective(trial):

runner = Runner.build_from_config(
runner_config=runner_config,
unique_model_dir=True,
skip_data_loader=True,
unique_model_dir=True
)
try:
# train model
Expand All @@ -258,7 +255,12 @@ def objective(trial):
# add model path into trial
trial.set_user_attr("model_dir", runner.runner_config.model_dir)
# trial.set_user_attr("model_config", runner.runner_config.model_config)
trial.set_user_attr("runner_config", runner.runner_config.get_yaml_config())
# convert OmegaConf containers to plain types
runner_config_dict = OmegaConf.to_container(
OmegaConf.create(runner.runner_config.get_yaml_config()),
resolve=True
)
trial.set_user_attr("runner_config", runner_config_dict)

logger.info(f'End trial {trial.number} ! Cost time: {timer.end()}')

Expand Down
20 changes: 9 additions & 11 deletions easy_tpp/runner/base_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,15 @@ def __init__(

self.save_log()

skip_data_loader = kwargs.get('skip_data_loader', False)
if not skip_data_loader:
# build data reader
data_config = self.runner_config.data_config
backend = self.runner_config.base_config.backend
kwargs = self.runner_config.trainer_config.get_yaml_config()
self._data_loader = TPPDataLoader(
data_config=data_config,
backend=backend,
**kwargs
)
# build data reader
data_config = self.runner_config.data_config
backend = self.runner_config.base_config.backend
kwargs = self.runner_config.trainer_config.get_yaml_config()
self._data_loader = TPPDataLoader(
data_config=data_config,
backend=backend,
**kwargs
)

# Needed for Intensity Free model
mean_log_inter_time, std_log_inter_time, min_dt, max_dt = (
Expand Down
10 changes: 5 additions & 5 deletions examples/configs/hpo_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ pipeline_config_id: hpo_runner_config

data:
taxi:
data_format: pkl
train_dir: ./data/taxi/train.pkl
valid_dir: ./data/taxi/dev.pkl
test_dir: ./data/taxi/test.pkl
data_format: json
train_dir: easytpp/taxi
valid_dir: easytpp/taxi
test_dir: easytpp/taxi
data_specs:
num_event_types: 10
pad_token_id: 10
Expand All @@ -16,7 +16,7 @@ hpo:
storage_uri: sqlite://hpo_test.db
is_continuous: False
framework_id: optuna # the framework of hpo
n_trials: 10
num_trials: 10


NHP_train:
Expand Down