Merge branch 'master' of https://github.com/awslabs/autogluon into cp311

* 'master' of https://github.com/awslabs/autogluon: Lint tabular (autogluon#3347) Update Windows Conda install instructions (autogluon#3346) Lint features (autogluon#3344)
ddelange · Jun 25, 2023 · 22cee55 · 22cee55
2 parents 650cc81 + 3f48d66
commit 22cee55
Show file tree

Hide file tree

Showing 164 changed files with 7,859 additions and 7,638 deletions.
diff --git a/.github/workflow_scripts/lint_check.sh b/.github/workflow_scripts/lint_check.sh
@@ -16,6 +16,8 @@ function lint_check_all {
     lint_check timeseries 119
     lint_check common 160
     lint_check core 160
+    lint_check features 160
+    lint_check tabular 160
 }
 
 bandit -r multimodal/src -ll

diff --git a/docs/install-conda-full.md b/docs/install-conda-full.md
@@ -1,5 +1,5 @@
 ```console
-conda create -n ag python=3.9
+conda create -n ag python=3.10
 conda activate ag
 conda install -c conda-forge mamba
 mamba install -c conda-forge autogluon

diff --git a/docs/install-windows-conda-gpu.md b/docs/install-windows-conda-gpu.md
@@ -0,0 +1,4 @@
+:::{note}
+AutoGluon cannot currently be installed with GPU support on Windows via Conda. Windows/Conda/GPU support will become available once AutoGluon migrates to PyTorch 2.0. Please follow the Windows/Conda/CPU installation instructions at this time.
+:::
+
diff --git a/docs/install-windows-conda.md b/docs/install-windows-conda.md
diff --git a/docs/install.md b/docs/install.md
@@ -128,12 +128,12 @@ AutoGluon requires Python version 3.8, 3.9, or 3.10 and is available on Linux, M
   :::::{tab} Conda
 
     ::::{tab} CPU
-    ```{include} install-windows-conda.md
+    ```{include} install-conda-full.md
     ```
     ::::
 
     ::::{tab} GPU
-    ```{include} install-windows-conda.md
+    ```{include} install-windows-conda-gpu.md
     ```
     ::::
 

diff --git a/features/setup.py b/features/setup.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python
 ###########################
 # This code block is a HACK (!), but is necessary to avoid code duplication. Do NOT alter these lines.
+import importlib.util
 import os
+
 from setuptools import setup
-import importlib.util
+
 filepath = os.path.abspath(os.path.dirname(__file__))
-filepath_import = os.path.join(filepath, '..', 'core', 'src', 'autogluon', 'core', '_setup_utils.py')
+filepath_import = os.path.join(filepath, "..", "core", "src", "autogluon", "core", "_setup_utils.py")
 spec = importlib.util.spec_from_file_location("ag_min_dependencies", filepath_import)
 ag = importlib.util.module_from_spec(spec)
 # Identical to `from autogluon.core import _setup_utils as ag`, but works without `autogluon.core` being installed.
@@ -15,24 +17,28 @@
 version = ag.load_version_file()
 version = ag.update_version(version)
 
-submodule = 'features'
-install_requires = [
-    # version ranges added in ag.get_dependency_version_ranges()
-    'numpy',  # version range defined in `core/_setup_utils.py`
-    'pandas',  # version range defined in `core/_setup_utils.py`
-    'scikit-learn',  # version range defined in `core/_setup_utils.py`
-    f'autogluon.common=={version}',
-] if not ag.LITE_MODE else [
-    # version ranges added in ag.get_dependency_version_ranges()
-    'numpy',  # version range defined in `core/_setup_utils.py`
-    'pandas',  # version range defined in `core/_setup_utils.py`
-    'scikit-learn',  # version range defined in `core/_setup_utils.py`
-    f'{ag.PACKAGE_NAME}.common=={version}',
-]
+submodule = "features"
+install_requires = (
+    [
+        # version ranges added in ag.get_dependency_version_ranges()
+        "numpy",  # version range defined in `core/_setup_utils.py`
+        "pandas",  # version range defined in `core/_setup_utils.py`
+        "scikit-learn",  # version range defined in `core/_setup_utils.py`
+        f"autogluon.common=={version}",
+    ]
+    if not ag.LITE_MODE
+    else [
+        # version ranges added in ag.get_dependency_version_ranges()
+        "numpy",  # version range defined in `core/_setup_utils.py`
+        "pandas",  # version range defined in `core/_setup_utils.py`
+        "scikit-learn",  # version range defined in `core/_setup_utils.py`
+        f"{ag.PACKAGE_NAME}.common=={version}",
+    ]
+)
 
 install_requires = ag.get_dependency_version_ranges(install_requires)
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     ag.create_version_file(version=version, submodule=submodule)
     setup_args = ag.default_setup_args(version=version, submodule=submodule)
     setup(

diff --git a/features/src/autogluon/features/__init__.py b/features/src/autogluon/features/__init__.py
@@ -1,3 +1,2 @@
 from .generators import *  # noqa
-
 from .version import __version__
diff --git a/features/src/autogluon/features/generators/__init__.py b/features/src/autogluon/features/generators/__init__.py
@@ -1,5 +1,6 @@
 from .abstract import AbstractFeatureGenerator
 from .astype import AsTypeFeatureGenerator
+from .auto_ml_pipeline import AutoMLInterpretablePipelineFeatureGenerator, AutoMLPipelineFeatureGenerator
 from .binned import BinnedFeatureGenerator
 from .bulk import BulkFeatureGenerator
 from .category import CategoryFeatureGenerator
@@ -13,9 +14,7 @@
 from .label_encoder import LabelEncoderFeatureGenerator
 from .memory_minimize import CategoryMemoryMinimizeFeatureGenerator, NumericMemoryMinimizeFeatureGenerator
 from .one_hot_encoder import OneHotEncoderFeatureGenerator
+from .pipeline import PipelineFeatureGenerator
 from .rename import RenameFeatureGenerator
 from .text_ngram import TextNgramFeatureGenerator
 from .text_special import TextSpecialFeatureGenerator
-
-from .pipeline import PipelineFeatureGenerator
-from .auto_ml_pipeline import AutoMLPipelineFeatureGenerator, AutoMLInterpretablePipelineFeatureGenerator