wavetrainer 0.0.19__tar.gz → 0.0.21__tar.gz

{wavetrainer-0.0.19/wavetrainer.egg-info → wavetrainer-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavetrainer
-Version: 0.0.19
+Version: 0.0.21
 Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
 Home-page: https://github.com/8W9aG/wavetrainer
 Author: Will Sackfield
@@ -22,6 +22,7 @@ Requires-Dist: catboost>=1.2.7
 Requires-Dist: venn-abers>=1.4.6
 Requires-Dist: mapie>=0.9.2
 Requires-Dist: pytz>=2025.1
+Requires-Dist: torch>=2.6.0
 
 # wavetrainer
 
@@ -50,6 +51,7 @@ Python 3.11.6:
 - [venn-abers](https://github.com/ip200/venn-abers)
 - [mapie](https://mapie.readthedocs.io/en/stable/)
 - [pytz](https://pythonhosted.org/pytz/)
+- [torch](https://pytorch.org/)
 
 ## Raison D'être :thought_balloon:
 

{wavetrainer-0.0.19 → wavetrainer-0.0.21}/README.md

@@ -25,6 +25,7 @@ Python 3.11.6:
 - [venn-abers](https://github.com/ip200/venn-abers)
 - [mapie](https://mapie.readthedocs.io/en/stable/)
 - [pytz](https://pythonhosted.org/pytz/)
+- [torch](https://pytorch.org/)
 
 ## Raison D'être :thought_balloon:
 

wavetrainer-0.0.19/wavetrainer.egg-info/requires.txt → wavetrainer-0.0.21/requirements.txt

@@ -9,3 +9,4 @@ catboost>=1.2.7
 venn-abers>=1.4.6
 mapie>=0.9.2
 pytz>=2025.1
+torch>=2.6.0

{wavetrainer-0.0.19 → wavetrainer-0.0.21}/setup.py

@@ -23,7 +23,7 @@ def install_requires() -> typing.List[str]:
 
 setup(
     name='wavetrainer',
-    version='0.0.19',
+    version='0.0.21',
     description='A library for automatically finding the optimal model within feature and hyperparameter space.',
     long_description=long_description,
     long_description_content_type='text/markdown',

{wavetrainer-0.0.19 → wavetrainer-0.0.21}/wavetrainer/__init__.py

@@ -2,5 +2,5 @@
 
 from .create import create
 
-__VERSION__ = "0.0.19"
+__VERSION__ = "0.0.21"
 __all__ = ("create",)

{wavetrainer-0.0.19 → wavetrainer-0.0.21}/wavetrainer/model/catboost_model.py

@@ -1,11 +1,13 @@
 """A model that wraps catboost."""
 
 import json
+import logging
 import os
 from typing import Any, Self
 
 import optuna
 import pandas as pd
+import torch
 from catboost import CatBoost, Pool  # type: ignore
 
 from ..model_type import ModelType, determine_model_type
@@ -152,6 +154,8 @@ class CatboostModel(Model):
             metric_period=100,
             eval_set=eval_pool,
         )
+        importances = catboost.get_feature_importance(prettified=True)
+        logging.info("Importances:\n%s", importances)
         return self
 
     def transform(self, df: pd.DataFrame) -> pd.DataFrame:
@@ -186,6 +190,8 @@ class CatboostModel(Model):
                         boosting_type=self._boosting_type,
                         early_stopping_rounds=self._early_stopping_rounds,
                         metric_period=100,
+                        task_type="GPU" if torch.cuda.is_available() else "CPU",
+                        devices="0" if torch.cuda.is_available() else None,
                     )
                 case ModelType.REGRESSION:
                     catboost = CatBoostRegressorWrapper(
@@ -196,6 +202,8 @@ class CatboostModel(Model):
                         boosting_type=self._boosting_type,
                         early_stopping_rounds=self._early_stopping_rounds,
                         metric_period=100,
+                        task_type="GPU" if torch.cuda.is_available() else "CPU",
+                        devices="0" if torch.cuda.is_available() else None,
                     )
                 case ModelType.BINNED_BINARY:
                     catboost = CatBoostClassifierWrapper(
@@ -206,6 +214,8 @@ class CatboostModel(Model):
                         boosting_type=self._boosting_type,
                         early_stopping_rounds=self._early_stopping_rounds,
                         metric_period=100,
+                        task_type="GPU" if torch.cuda.is_available() else "CPU",
+                        devices="0" if torch.cuda.is_available() else None,
                     )
                 case ModelType.MULTI_CLASSIFICATION:
                     catboost = CatBoostClassifierWrapper(
@@ -216,6 +226,8 @@ class CatboostModel(Model):
                         boosting_type=self._boosting_type,
                         early_stopping_rounds=self._early_stopping_rounds,
                         metric_period=100,
+                        task_type="GPU" if torch.cuda.is_available() else "CPU",
+                        devices="0" if torch.cuda.is_available() else None,
                     )
             self._catboost = catboost
         if catboost is None:

{wavetrainer-0.0.19 → wavetrainer-0.0.21}/wavetrainer/selector/selector.py

@@ -66,14 +66,6 @@ class Selector(Params, Fit):
         )
         try:
             self._selector.fit(df, y=y, sample_weight=w, **model_kwargs)
-            importances = self._model.estimator.feature_importances_
-            try:
-                importances_len = len(importances)
-                columns = self._selector.get_feature_names_out()
-                for i in range(importances_len):
-                    logging.info("Feature %s: %f", columns[i], importances[i])
-            except TypeError:
-                pass
         except ValueError as exc:
             # Catch issues with 1 feature as a reduction target.
             logging.warning(str(exc))

{wavetrainer-0.0.19 → wavetrainer-0.0.21}/wavetrainer/trainer.py

@@ -286,7 +286,7 @@ class Trainer(Fit):
                 if isinstance(self._test_size, float)
                 else test_dt_index[
                     test_dt_index >= (start_validation_index - self._test_size)  # type: ignore
-                ][0]
+                ].to_list()[0]
             )
 
             def test_objective(trial: optuna.Trial) -> float:

{wavetrainer-0.0.19 → wavetrainer-0.0.21/wavetrainer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavetrainer
-Version: 0.0.19
+Version: 0.0.21
 Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
 Home-page: https://github.com/8W9aG/wavetrainer
 Author: Will Sackfield
@@ -22,6 +22,7 @@ Requires-Dist: catboost>=1.2.7
 Requires-Dist: venn-abers>=1.4.6
 Requires-Dist: mapie>=0.9.2
 Requires-Dist: pytz>=2025.1
+Requires-Dist: torch>=2.6.0
 
 # wavetrainer
 
@@ -50,6 +51,7 @@ Python 3.11.6:
 - [venn-abers](https://github.com/ip200/venn-abers)
 - [mapie](https://mapie.readthedocs.io/en/stable/)
 - [pytz](https://pythonhosted.org/pytz/)
+- [torch](https://pytorch.org/)
 
 ## Raison D'être :thought_balloon:
 

wavetrainer-0.0.19/requirements.txt → wavetrainer-0.0.21/wavetrainer.egg-info/requires.txt

@@ -8,4 +8,5 @@ scipy>=1.15.2
 catboost>=1.2.7
 venn-abers>=1.4.6
 mapie>=0.9.2
-pytz>=2025.1
+pytz>=2025.1
+torch>=2.6.0