wavetrainer 0.1.3__tar.gz → 0.1.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. {wavetrainer-0.1.3/wavetrainer.egg-info → wavetrainer-0.1.5}/PKG-INFO +1 -1
  2. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/setup.py +1 -1
  3. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/__init__.py +1 -1
  4. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/catboost/catboost_model.py +4 -3
  5. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/model_router.py +1 -2
  6. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/trainer.py +1 -1
  7. {wavetrainer-0.1.3 → wavetrainer-0.1.5/wavetrainer.egg-info}/PKG-INFO +1 -1
  8. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/LICENSE +0 -0
  9. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/MANIFEST.in +0 -0
  10. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/README.md +0 -0
  11. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/requirements.txt +0 -0
  12. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/setup.cfg +0 -0
  13. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/tests/__init__.py +0 -0
  14. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/tests/model/__init__.py +0 -0
  15. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/tests/model/catboost_kwargs_test.py +0 -0
  16. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/tests/trainer_test.py +0 -0
  17. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/calibrator/__init__.py +0 -0
  18. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/calibrator/calibrator.py +0 -0
  19. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/calibrator/calibrator_router.py +0 -0
  20. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/calibrator/vennabers_calibrator.py +0 -0
  21. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/create.py +0 -0
  22. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/exceptions.py +0 -0
  23. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/fit.py +0 -0
  24. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/__init__.py +0 -0
  25. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/catboost/__init__.py +0 -0
  26. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/catboost/catboost_classifier_wrap.py +0 -0
  27. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/catboost/catboost_kwargs.py +0 -0
  28. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/catboost/catboost_regressor_wrap.py +0 -0
  29. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/model.py +0 -0
  30. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/tabpfn/__init__.py +0 -0
  31. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/tabpfn/tabpfn_model.py +0 -0
  32. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/xgboost/__init__.py +0 -0
  33. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/xgboost/early_stopper.py +0 -0
  34. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/xgboost/xgboost_logger.py +0 -0
  35. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model/xgboost/xgboost_model.py +0 -0
  36. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/model_type.py +0 -0
  37. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/params.py +0 -0
  38. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/__init__.py +0 -0
  39. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/base_selector_reducer.py +0 -0
  40. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/combined_reducer.py +0 -0
  41. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/constant_reducer.py +0 -0
  42. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/correlation_reducer.py +0 -0
  43. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/duplicate_reducer.py +0 -0
  44. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/non_categorical_numeric_columns.py +0 -0
  45. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/nonnumeric_reducer.py +0 -0
  46. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/pca_reducer.py +0 -0
  47. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/reducer.py +0 -0
  48. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/select_by_single_feature_performance_reducer.py +0 -0
  49. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/smart_correlation_reducer.py +0 -0
  50. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/reducer/unseen_reducer.py +0 -0
  51. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/selector/__init__.py +0 -0
  52. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/selector/selector.py +0 -0
  53. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/__init__.py +0 -0
  54. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/class_weights.py +0 -0
  55. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/combined_weights.py +0 -0
  56. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/exponential_weights.py +0 -0
  57. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/linear_weights.py +0 -0
  58. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/noop_weights.py +0 -0
  59. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/sigmoid_weights.py +0 -0
  60. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/weights.py +0 -0
  61. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/weights/weights_router.py +0 -0
  62. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/windower/__init__.py +0 -0
  63. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer/windower/windower.py +0 -0
  64. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer.egg-info/SOURCES.txt +0 -0
  65. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer.egg-info/dependency_links.txt +0 -0
  66. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer.egg-info/not-zip-safe +0 -0
  67. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer.egg-info/requires.txt +0 -0
  68. {wavetrainer-0.1.3 → wavetrainer-0.1.5}/wavetrainer.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: wavetrainer
3
- Version: 0.1.3
3
+ Version: 0.1.5
4
4
  Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
5
5
  Home-page: https://github.com/8W9aG/wavetrainer
6
6
  Author: Will Sackfield
@@ -23,7 +23,7 @@ def install_requires() -> typing.List[str]:
23
23
 
24
24
  setup(
25
25
  name='wavetrainer',
26
- version='0.1.3',
26
+ version='0.1.5',
27
27
  description='A library for automatically finding the optimal model within feature and hyperparameter space.',
28
28
  long_description=long_description,
29
29
  long_description_content_type='text/markdown',
@@ -2,5 +2,5 @@
2
2
 
3
3
  from .create import create
4
4
 
5
- __VERSION__ = "0.1.3"
5
+ __VERSION__ = "0.1.5"
6
6
  __all__ = ("create",)
@@ -122,9 +122,10 @@ class CatboostModel(Model):
122
122
  )
123
123
  self._early_stopping_rounds = trial.suggest_int(_EARLY_STOPPING_ROUNDS, 10, 500)
124
124
  self._best_iteration = trial.user_attrs.get(_BEST_ITERATION_KEY)
125
- loss_function = trial.suggest_categorical(
126
- _LOSS_FUNCTION_KEY, [_DEFAULT_LOSS_FUNCTION, _FOCALLOSS_LOSS_FUNCTION]
127
- )
125
+ loss_functions = [_DEFAULT_LOSS_FUNCTION]
126
+ if torch.cuda.is_available():
127
+ loss_functions.append(_FOCALLOSS_LOSS_FUNCTION)
128
+ loss_function = trial.suggest_categorical(_LOSS_FUNCTION_KEY, loss_functions)
128
129
  self._loss_function = loss_function
129
130
  if loss_function == _FOCALLOSS_LOSS_FUNCTION:
130
131
  self._gamma = trial.suggest_float(_GAMMA_KEY, 0.5, 5.0)
@@ -170,8 +170,7 @@ class ModelRouter(Model):
170
170
  ),
171
171
  axis=1,
172
172
  )
173
- w += pred["__wavetrain_error_weight"]
174
- w = w.clip(lower=0.0)
173
+ w += pred["__wavetrain_error_weight"].fillna(0.0).clip(lower=0.000001)
175
174
 
176
175
  return self
177
176
 
@@ -381,7 +381,7 @@ class Trainer(Fit):
381
381
  )
382
382
  while (
383
383
  study.best_trial.value is None or study.best_trial.value == _BAD_OUTPUT
384
- ):
384
+ ) and len(study.trials) < 1000:
385
385
  logging.info("Performing extra train")
386
386
  study.optimize(
387
387
  test_objective,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: wavetrainer
3
- Version: 0.1.3
3
+ Version: 0.1.5
4
4
  Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
5
5
  Home-page: https://github.com/8W9aG/wavetrainer
6
6
  Author: Will Sackfield
File without changes
File without changes
File without changes
File without changes