-
Notifications
You must be signed in to change notification settings - Fork 86
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Various fixes to work with large datasets in better way #1019
Conversation
Codecov Report
@@ Coverage Diff @@
## master #1019 +/- ##
==========================================
- Coverage 87.88% 87.75% -0.13%
==========================================
Files 206 206
Lines 13805 13849 +44
==========================================
+ Hits 12132 12153 +21
- Misses 1673 1696 +23
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
@@ -171,7 +171,10 @@ def fit(self, | |||
self.data_processor.accept_and_apply_recommendations(self.train_data, recommendations) | |||
self.params.accept_and_apply_recommendations(self.train_data, recommendations) | |||
self._init_remote_if_necessary() | |||
self.params.update_available_operations_by_preset(self.train_data) | |||
|
|||
if self.params.api_params['preset'] != 'auto': |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Почему потребовалось добавать условие?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Потому что сейчас если задать список available_operations вначале - то потом в варианте auto они уже не меняются. Не нашел блоее изящного решения, так кажется более масштабный рефакторинг нужен.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Сейчас получается, что работа с available_operations происходит тут и в этом куске кода. Так и должно быть?
@@ -171,7 +171,10 @@ def fit(self, | |||
self.data_processor.accept_and_apply_recommendations(self.train_data, recommendations) | |||
self.params.accept_and_apply_recommendations(self.train_data, recommendations) | |||
self._init_remote_if_necessary() | |||
self.params.update_available_operations_by_preset(self.train_data) | |||
|
|||
if self.params.api_params['preset'] != 'auto': |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Сейчас получается, что работа с available_operations происходит тут и в этом куске кода. Так и должно быть?
|
||
trials = Trials() | ||
|
||
remaining_time = self.max_seconds - global_tuner_timer.minutes_from_start * 60 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Почему нельзя считать секунды и надо округлять до минут?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Поменял.
fedot/api/main.py
Outdated
@@ -183,6 +190,9 @@ def fit(self, | |||
self.current_pipeline, self.best_models, self.history = \ | |||
self.api_composer.obtain_model(**self.params.api_params) | |||
|
|||
if self.current_pipeline is None: | |||
raise ValueError('No any models were found') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
грамматика: достаточно "No models were found", c any масло масляное немного
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Поменял
if not population: | ||
return |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
сюда может придти None?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Может прийти [], если ни один индивид в популяции не успел обработаться.
fedot/api/main.py
Outdated
@@ -183,6 +190,9 @@ def fit(self, | |||
self.current_pipeline, self.best_models, self.history = \ | |||
self.api_composer.obtain_model(**self.params.api_params) | |||
|
|||
if self.current_pipeline is None: | |||
raise ValueError('No any models were found') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Здесь можно просто 'No models were found'.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Поменял.
Обновил до мастера. |
Если они явно не заданы - то вроде да. |
There are several mini-fixes are applied: