autogluon.tabular 1.2.1b20250114__tar.gz → 1.2.1b20250116__tar.gz

{autogluon.tabular-1.2.1b20250114 → autogluon.tabular-1.2.1b20250116}/PKG-INFO

@@ -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

{autogluon.tabular-1.2.1b20250114 → autogluon.tabular-1.2.1b20250116}/src/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-1.2.1b20250114 → autogluon.tabular-1.2.1b20250116}/src/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 → autogluon.tabular-1.2.1b20250116}/src/autogluon.tabular.egg-info/PKG-INFO

@@ -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

{autogluon.tabular-1.2.1b20250114 → autogluon.tabular-1.2.1b20250116}/src/autogluon.tabular.egg-info/requires.txt

@@ -3,20 +3,20 @@ scipy<1.16,>=1.5.4
 pandas<2.3.0,>=2.0.0
 scikit-learn<1.5.3,>=1.4.0
 networkx<4,>=3.0
-autogluon.core==1.2.1b20250114
-autogluon.features==1.2.1b20250114
+autogluon.core==1.2.1b20250116
+autogluon.features==1.2.1b20250116
 
 [all]
 numpy<2.0.0,>=1.25
-fastai<2.8,>=2.3.1
-lightgbm<4.6,>=4.0
-torch<2.6,>=2.2
-spacy<3.8
 xgboost<2.2,>=1.6
-autogluon.core[all]==1.2.1b20250114
 einops<0.9,>=0.7
+autogluon.core[all]==1.2.1b20250116
 catboost<1.3,>=1.2
+torch<2.6,>=2.2
+spacy<3.8
+fastai<2.8,>=2.3.1
 huggingface_hub[torch]
+lightgbm<4.6,>=4.0
 
 [catboost]
 numpy<2.0.0,>=1.25
@@ -34,7 +34,7 @@ imodels<1.4.0,>=1.3.10
 lightgbm<4.6,>=4.0
 
 [ray]
-autogluon.core[all]==1.2.1b20250114
+autogluon.core[all]==1.2.1b20250116
 
 [skex]
 scikit-learn-intelex<2025.1,>=2024.0