autogluon.tabular 1.2.1b20250114__py3-none-any.whl → 1.2.1b20250116__py3-none-any.whl

autogluon/tabular/models/tabular_nn/torch/tabular_nn_torch.py

@@ -156,12 +156,26 @@ class TabularNeuralNetTorchModel(AbstractNeuralNetworkModel):
 
         return processor_kwargs, optimizer_kwargs, fit_kwargs, loss_kwargs, params
 
-    def _fit(self, X, y, X_val=None, y_val=None, time_limit=None, sample_weight=None, num_cpus=1, num_gpus=0, reporter=None, verbosity=2, **kwargs):
+    def _fit(
+        self,
+        X: pd.DataFrame,
+        y: pd.Series,
+        X_val: pd.DataFrame = None,
+        y_val: pd.Series = None,
+        X_test: pd.DataFrame = None,
+        y_test: pd.Series = None,
+        time_limit: float = None,
+        sample_weight=None,
+        num_cpus: int = 1,
+        num_gpus: float = 0,
+        reporter=None,
+        verbosity: int = 2,
+        **kwargs,
+    ):
         try_import_torch()
         import torch
 
         torch.set_num_threads(num_cpus)
-        from .tabular_torch_dataset import TabularTorchDataset
 
         start_time = time.time()
 
@@ -188,19 +202,20 @@ class TabularNeuralNetTorchModel(AbstractNeuralNetworkModel):
             self.num_dataloading_workers = 0  # TODO: verify 0 is typically faster and uses less memory than 1 in pytorch
         self.num_dataloading_workers = 0  # TODO: >0 crashes on MacOS
         self.max_batch_size = params.pop("max_batch_size", 512)
-        batch_size = params.pop("batch_size", None)
-        if batch_size is None:
-            if isinstance(X, TabularTorchDataset):
-                batch_size = min(int(2 ** (3 + np.floor(np.log10(len(X))))), self.max_batch_size)
-            else:
-                batch_size = min(int(2 ** (3 + np.floor(np.log10(X.shape[0])))), self.max_batch_size)
 
-        X_test = kwargs.get("X_test", None)
-        y_test = kwargs.get("y_test", None)
+        train_dataset = self._generate_dataset(X=X, y=y, train_params=processor_kwargs, is_train=True)
+        if X_val is not None and y_val is not None:
+            val_dataset = self._generate_dataset(X=X_val, y=y_val)
+        else:
+            val_dataset = None
+        if X_test is not None and y_test is not None:
+            test_dataset = self._generate_dataset(X=X_test, y=y_test)
+        else:
+            test_dataset = None
 
-        train_dataset = self._generate_dataset(X, y, train_params=processor_kwargs, is_train=True)
-        val_dataset = self._generate_dataset(X_val, y_val)
-        test_dataset = self._generate_dataset(X_test, y_test)
+        batch_size = params.pop("batch_size", None)
+        if batch_size is None:
+            batch_size = min(int(2 ** (3 + np.floor(np.log10(len(X))))), self.max_batch_size, len(X))
 
         logger.log(
             15,
@@ -255,16 +270,16 @@ class TabularNeuralNetTorchModel(AbstractNeuralNetworkModel):
 
     def _train_net(
         self,
-        train_dataset,
-        loss_kwargs,
-        batch_size,
-        num_epochs,
-        epochs_wo_improve,
-        val_dataset=None,
-        test_dataset=None,
-        time_limit=None,
+        train_dataset: TabularTorchDataset,
+        loss_kwargs: dict,
+        batch_size: int,
+        num_epochs: int,
+        epochs_wo_improve: int,
+        val_dataset: TabularTorchDataset = None,
+        test_dataset: TabularTorchDataset = None,
+        time_limit: float = None,
         reporter=None,
-        verbosity=2,
+        verbosity: int = 2,
     ):
         import torch
 
@@ -634,13 +649,13 @@ class TabularNeuralNetTorchModel(AbstractNeuralNetworkModel):
         preds_dataset = np.concatenate(preds_dataset, 0)
         return preds_dataset
 
-    def _generate_dataset(self, X: pd.DataFrame, y: pd.Series, train_params: dict = {}, is_train: bool = False):
+    def _generate_dataset(self, X: pd.DataFrame | TabularTorchDataset, y: pd.Series, train_params: dict = {}, is_train: bool = False) -> TabularTorchDataset:
         """
         Generate TabularTorchDataset from X and y.
 
         Params:
         -------
-        X: pd.DataFrame
+        X: pd.DataFrame | TabularTorchDataset
             The X data.
         y: pd.Series
             The y data.
@@ -676,14 +691,11 @@ class TabularNeuralNetTorchModel(AbstractNeuralNetworkModel):
                     use_ngram_features=use_ngram_features,
                 )
         else:
-            if X is not None:
-                if isinstance(X, TabularTorchDataset):
-                    dataset = X
-                else:
-                    X = self.preprocess(X)
-                    dataset = self._process_test_data(df=X, labels=y)
+            if isinstance(X, TabularTorchDataset):
+                dataset = X
             else:
-                dataset = None
+                X = self.preprocess(X)
+                dataset = self._process_test_data(df=X, labels=y)
 
         return dataset
 

autogluon/tabular/version.py

@@ -1,3 +1,4 @@
 """This is the autogluon version file."""
-__version__ = '1.2.1b20250114'
+
+__version__ = "1.2.1b20250116"
 __lite__ = False

{autogluon.tabular-1.2.1b20250114.dist-info → autogluon.tabular-1.2.1b20250116.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autogluon.tabular
-Version: 1.2.1b20250114
+Version: 1.2.1b20250116
 Summary: Fast and Accurate ML in 3 Lines of Code
 Home-page: https://github.com/autogluon/autogluon
 Author: AutoGluon Community
@@ -39,19 +39,19 @@ Requires-Dist: scipy<1.16,>=1.5.4
 Requires-Dist: pandas<2.3.0,>=2.0.0
 Requires-Dist: scikit-learn<1.5.3,>=1.4.0
 Requires-Dist: networkx<4,>=3.0
-Requires-Dist: autogluon.core==1.2.1b20250114
-Requires-Dist: autogluon.features==1.2.1b20250114
+Requires-Dist: autogluon.core==1.2.1b20250116
+Requires-Dist: autogluon.features==1.2.1b20250116
 Provides-Extra: all
 Requires-Dist: numpy<2.0.0,>=1.25; extra == "all"
-Requires-Dist: fastai<2.8,>=2.3.1; extra == "all"
-Requires-Dist: lightgbm<4.6,>=4.0; extra == "all"
-Requires-Dist: torch<2.6,>=2.2; extra == "all"
-Requires-Dist: spacy<3.8; extra == "all"
 Requires-Dist: xgboost<2.2,>=1.6; extra == "all"
-Requires-Dist: autogluon.core[all]==1.2.1b20250114; extra == "all"
 Requires-Dist: einops<0.9,>=0.7; extra == "all"
+Requires-Dist: autogluon.core[all]==1.2.1b20250116; extra == "all"
 Requires-Dist: catboost<1.3,>=1.2; extra == "all"
+Requires-Dist: torch<2.6,>=2.2; extra == "all"
+Requires-Dist: spacy<3.8; extra == "all"
+Requires-Dist: fastai<2.8,>=2.3.1; extra == "all"
 Requires-Dist: huggingface-hub[torch]; extra == "all"
+Requires-Dist: lightgbm<4.6,>=4.0; extra == "all"
 Provides-Extra: catboost
 Requires-Dist: numpy<2.0.0,>=1.25; extra == "catboost"
 Requires-Dist: catboost<1.3,>=1.2; extra == "catboost"
@@ -64,7 +64,7 @@ Requires-Dist: imodels<1.4.0,>=1.3.10; extra == "imodels"
 Provides-Extra: lightgbm
 Requires-Dist: lightgbm<4.6,>=4.0; extra == "lightgbm"
 Provides-Extra: ray
-Requires-Dist: autogluon.core[all]==1.2.1b20250114; extra == "ray"
+Requires-Dist: autogluon.core[all]==1.2.1b20250116; extra == "ray"
 Provides-Extra: skex
 Requires-Dist: scikit-learn-intelex<2025.1,>=2024.0; extra == "skex"
 Provides-Extra: skl2onnx

{autogluon.tabular-1.2.1b20250114.dist-info → autogluon.tabular-1.2.1b20250116.dist-info}/RECORD

@@ -1,6 +1,6 @@
-autogluon.tabular-1.2.1b20250114-py3.8-nspkg.pth,sha256=cQGwpuGPqg1GXscIwt-7PmME1OnSpD-7ixkikJ31WAY,554
+autogluon.tabular-1.2.1b20250116-py3.8-nspkg.pth,sha256=cQGwpuGPqg1GXscIwt-7PmME1OnSpD-7ixkikJ31WAY,554
 autogluon/tabular/__init__.py,sha256=2OXpJCvENRHubBTYNIPpHX93WWuFZzsJBtTZbNVHVas,400
-autogluon/tabular/version.py,sha256=Um-j8InMDDRIJ5WoL607BMYYvkzsVWU8cxXJ2aXfjbQ,90
+autogluon/tabular/version.py,sha256=qtf1yrCzRdeJXfqZGb9YWrrjOFhl2omGSnhF5i131QY,91
 autogluon/tabular/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autogluon/tabular/configs/config_helper.py,sha256=Pb2aW9Z9w77pYKPRVZ3nBzHY3KJaiEJSJ747zZcJIVk,21132
 autogluon/tabular/configs/feature_generator_presets.py,sha256=EV5Ym8VW15q92MwOUpTi7wZFS2QooM51fLg3RdUsn-M,1223
@@ -120,7 +120,7 @@ autogluon/tabular/models/tabular_nn/hyperparameters/__init__.py,sha256=47DEQpj8H
 autogluon/tabular/models/tabular_nn/hyperparameters/parameters.py,sha256=Z3t_U1f7jfolPey6lzqgJyoFbVgoncFNSvCKXSuLxeU,6465
 autogluon/tabular/models/tabular_nn/hyperparameters/searchspaces.py,sha256=pT9cJ3MaWPnaQwAf47Yz6f0-L9qDBknahERbggAp52U,2810
 autogluon/tabular/models/tabular_nn/torch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autogluon/tabular/models/tabular_nn/torch/tabular_nn_torch.py,sha256=XVtRg9y4jNOScdT3RK-UhcbqHuLtyptxbI4drNg3RaE,42093
+autogluon/tabular/models/tabular_nn/torch/tabular_nn_torch.py,sha256=1ZJHM52wMZHSbXty19ykKA5tNql6ISO7nuFmAAuR-uU,42324
 autogluon/tabular/models/tabular_nn/torch/tabular_torch_dataset.py,sha256=oelC0uA9KNVtNKXU5jTywg-OfIF-5AguAXFYSKwN3zU,13499
 autogluon/tabular/models/tabular_nn/torch/torch_network_modules.py,sha256=Qc3PwXTD8A7PgXi6EGuaBCrN3jsFAXDLCW7i6tE5wYI,11338
 autogluon/tabular/models/tabular_nn/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -152,11 +152,11 @@ autogluon/tabular/trainer/model_presets/presets.py,sha256=1E-Z1FxUpyydaoEdxcTCg7
 autogluon/tabular/trainer/model_presets/presets_distill.py,sha256=MnFC2GJc6RmDBNAGbsO2XMfo3PjR8cUrZoilWW8gTYQ,3295
 autogluon/tabular/tuning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autogluon/tabular/tuning/feature_pruner.py,sha256=9iNku8gVbYEkjuKlyITPJDicsNkoraaQOlINQq9iZlQ,6877
-autogluon.tabular-1.2.1b20250114.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-autogluon.tabular-1.2.1b20250114.dist-info/METADATA,sha256=yz9jxr4weyLJLpGkDAqM-ZSWeAnSCC_xU8w1zmbHxpE,14315
-autogluon.tabular-1.2.1b20250114.dist-info/NOTICE,sha256=7nPQuj8Kp-uXsU0S5so3-2dNU5EctS5hDXvvzzehd7E,114
-autogluon.tabular-1.2.1b20250114.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-autogluon.tabular-1.2.1b20250114.dist-info/namespace_packages.txt,sha256=giERA4R78OkJf2ijn5slgjURlhRPzfLr7waIcGkzYAo,10
-autogluon.tabular-1.2.1b20250114.dist-info/top_level.txt,sha256=giERA4R78OkJf2ijn5slgjURlhRPzfLr7waIcGkzYAo,10
-autogluon.tabular-1.2.1b20250114.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-autogluon.tabular-1.2.1b20250114.dist-info/RECORD,,
+autogluon.tabular-1.2.1b20250116.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+autogluon.tabular-1.2.1b20250116.dist-info/METADATA,sha256=QSKAy7j9NWzgoqH_awYRFKYq2fif9r603N26Xl6eweM,14315
+autogluon.tabular-1.2.1b20250116.dist-info/NOTICE,sha256=7nPQuj8Kp-uXsU0S5so3-2dNU5EctS5hDXvvzzehd7E,114
+autogluon.tabular-1.2.1b20250116.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+autogluon.tabular-1.2.1b20250116.dist-info/namespace_packages.txt,sha256=giERA4R78OkJf2ijn5slgjURlhRPzfLr7waIcGkzYAo,10
+autogluon.tabular-1.2.1b20250116.dist-info/top_level.txt,sha256=giERA4R78OkJf2ijn5slgjURlhRPzfLr7waIcGkzYAo,10
+autogluon.tabular-1.2.1b20250116.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+autogluon.tabular-1.2.1b20250116.dist-info/RECORD,,