Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract task class from automl #857

Merged
merged 66 commits into from
Mar 11, 2023
Merged

Extract task class from automl #857

merged 66 commits into from
Mar 11, 2023

Commits on Nov 14, 2022

  1. Refactor into automl subpackage 

    Moved some of the packages into an automl subpackage to tidy before the
task-based refactor. This is in response to discussions with the group
and a comment on the first task-based PR.

Only changes here are moving subpackages and modules into the new
automl, fixing imports to work with this structure and fixing some
dependencies in setup.py.
    @markharley
    markharley committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    99f1f2d View commit details
    Browse the repository at this point in the history

  2. Fix doc building post automl subpackage refactor

    @markharley
    markharley committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    eb7aac9 View commit details
    Browse the repository at this point in the history

  3. Fix broken links in website post automl subpackage refactor

    @markharley
    markharley committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    0eda959 View commit details
    Browse the repository at this point in the history

  4. Fix broken links in website post automl subpackage refactor

    @markharley
    markharley committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    c3a567c View commit details
    Browse the repository at this point in the history

  5. Remove vw from test deps as this is breaking the build

    @markharley
    markharley committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    f148cac View commit details
    Browse the repository at this point in the history

  6. Move default back to the top-level 

    I'd moved this to automl as that's where it's used internally, but had
missed that this is actually part of the public interface so makes sense
to live where it was.
    @markharley
    markharley committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    7ce03a9 View commit details
    Browse the repository at this point in the history

  7. Re-add top level modules with deprecation warnings 

    flaml.data, flaml.ml and flaml.model are re-added to the top level,
being re-exported from flaml.automl for backwards compatability. Adding
a deprecation warning so that we can have a planned removal later.
    @markharley
    markharley committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    739b256 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into subpackage-refactor-for-automl

    @qingyun-wu
    qingyun-wu authored Nov 14, 2022
    Configuration menu
    Copy the full SHA
    4c008e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. Merge branch 'main' into subpackage-refactor-for-automl

    @qingyun-wu
    qingyun-wu authored Nov 15, 2022
    Configuration menu
    Copy the full SHA
    e7c8f91 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2022

  1. Merge branch 'main' into subpackage-refactor-for-automl

    @qingyun-wu
    qingyun-wu authored Nov 19, 2022
    Configuration menu
    Copy the full SHA
    f845df8 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Merge remote-tracking branch 'upstream/main' into subpackage-refactor… 

    …-for-automl
    @markharley
    markharley committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    36ffb1e View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. Merge microsoft/main into here

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    2386989 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2022

  1. Merge remote-tracking branch 'upstream/main' into subpackage-refactor… 

    …-for-automl
    @markharley
    markharley committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    3c53eca View commit details
    Browse the repository at this point in the history

  2. Fix model.py line-endings

    @markharley
    markharley committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    d747851 View commit details
    Browse the repository at this point in the history

  3. WIP

    @markharley
    markharley committed Dec 3, 2022
    Configuration menu
    Copy the full SHA
    3a6b95b View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2022

  1. WIP - Notes below 

    Got to the point where the methods from AutoML are pulled to
GenericTask. Started removing private markers and removing the passing
of automl to these methods. Done with decide_split_type, started on
prepare_data. Need to do the others after
    @markharley
    markharley committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    1e51966 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    938e3c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2022

  1. Re-add generic_task

    @markharley
    markharley committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    1cc1f1d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    9ca5f18 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Fix tests: add Task.__str__

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    5a0694b View commit details
    Browse the repository at this point in the history

  2. Fix tests: test for ray.ObjectRef

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    b5b6cc8 View commit details
    Browse the repository at this point in the history

  3. Hotwire TS_Sklearn wrapper to fix test fail

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    dfcca3b View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    84114ff View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/extract-task-class-from-automl' … 

    …into extract-task-class-from-automl
    @markharley
    markharley committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    0e2877a View commit details
    Browse the repository at this point in the history

  3. Remove unused data size field from Task

    @markharley
    markharley committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    d03b5d5 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    8c7e35b View commit details
    Browse the repository at this point in the history

  5. Fix import for CLASSIFICATION in notebook

    @markharley
    markharley committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    d5466e1 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2023

  1. Update flaml/automl/data.py 

    Co-authored-by: Chi Wang <[email protected]>
    @markharley @sonichi
    markharley and sonichi authored Jan 22, 2023
    Configuration menu
    Copy the full SHA
    6c42942 View commit details
    Browse the repository at this point in the history

  2. Fix review comments

    @markharley
    markharley committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    554e740 View commit details
    Browse the repository at this point in the history

  3. Fix task -> str in custom learner constructor

    @markharley
    markharley committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    4469176 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    a0913ab View commit details
    Browse the repository at this point in the history

  5. Remove unused CLASSIFICATION imports

    @markharley
    markharley committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    0a5a135 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2023

  1. Merge branch 'main' into extract-task-class-from-automl

    @markharley
    markharley authored Feb 4, 2023
    Configuration menu
    Copy the full SHA
    9df5200 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2023

  1. Hotwire TS_Sklearn wrapper to fix test fail by setting 

    optimizer_for_horizon == False
    @EgorKraevTransferwise
    EgorKraevTransferwise committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    0e60ae0 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2023

  1. Revert changes to the automl_classification and pin FLAML version

    @markharley
    markharley committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    5ec5649 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'extract-task-class-from-automl' of github.com:markharle… 

    …y/FLAML into extract-task-class-from-automl
    @markharley
    markharley committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    f473179 View commit details
    Browse the repository at this point in the history

  3. Fix imports in reverted notebook

    @markharley
    markharley committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    af78d65 View commit details
    Browse the repository at this point in the history

  4. Fix FLAML version in automl notebooks

    @markharley
    markharley committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    9fc53f9 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    8a0e948 View commit details
    Browse the repository at this point in the history

  6. Fix ml.py line endings

    @markharley
    markharley committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    9db1379 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Merge branch 'main' into extract-task-class-from-automl

    @sonichi
    sonichi authored Feb 17, 2023
    Configuration menu
    Copy the full SHA
    9a18f73 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2023

  1. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    e7c85b1 View commit details
    Browse the repository at this point in the history

  2. Fix CLASSIFICATION task import in automl_classification notebook

    @markharley
    markharley committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    13c6115 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'extract-task-class-from-automl' of github.com:markharle… 

    …y/FLAML into extract-task-class-from-automl
    @markharley
    markharley committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    9a452fa View commit details
    Browse the repository at this point in the history

  4. Uncomment pip install in notebook and revert import 

    Not convinced this will work because of installing an older version of
the package into the environment in which we're running the tests, but
let's see.
    @markharley
    markharley committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    33b1a18 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into extract-task-class-from-automl

    @markharley
    markharley authored Feb 18, 2023
    Configuration menu
    Copy the full SHA
    ed250fa View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2023

  1. Revert c6a5dd1a0

    @markharley
    markharley committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    e55e35a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'extract-task-class-from-automl' of github.com:markharle… 

    …y/FLAML into extract-task-class-from-automl
    @markharley
    markharley committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    a44184c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into extract-task-class-from-automl

    @markharley
    markharley authored Feb 19, 2023
    Configuration menu
    Copy the full SHA
    7db3e48 View commit details
    Browse the repository at this point in the history

  4. Revert "Revert c6a5dd1a0" 

    This reverts commit e55e35a.
    @markharley
    markharley committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    4b50fde View commit details
    Browse the repository at this point in the history

  5. Black format model.py

    @markharley
    markharley committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    2cb1550 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2023

  1. Merge remote-tracking branch 'upstream/main' into extract-task-class-… 

    …from-automl
    @markharley
    markharley committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    c6aa576 View commit details
    Browse the repository at this point in the history

  2. Bump version to 1.1.2 in automl_xgboost

    @markharley
    markharley committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    000603c View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2023

  1. Add docstrings to the Task ABC

    @markharley
    markharley committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    138b536 View commit details
    Browse the repository at this point in the history

  2. Fix import in custom_learner

    @markharley
    markharley committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    88f258d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. fix 'optimize_for_horizon' for ts_sklearn

    @int-chaos
    int-chaos committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    148f0c9 View commit details
    Browse the repository at this point in the history

  2. remove debugging print statements

    @int-chaos
    int-chaos committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    eb9ef2c View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Merge remote-tracking branch 'origin/main' into extract-task-class-fr… 

    …om-automl

# Conflicts:
#	flaml/automl/automl.py
#	flaml/automl/ml.py
    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    22f8562 View commit details
    Browse the repository at this point in the history

  2. Check for is_forecast() before is_classification() in decide_split_type

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    9ab48c5 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'mark_fork/extract-task-class-from-autom… 

    …l' into extract-task-class-from-automl

# Conflicts:
#	flaml/automl/ml.py
#	flaml/automl/task/generic_task.py
    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    1e57d61 View commit details
    Browse the repository at this point in the history

  4. Attempt to fix formatting fail

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    3b723a3 View commit details
    Browse the repository at this point in the history

  5. Another attempt to fix formatting fail

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    8d94b68 View commit details
    Browse the repository at this point in the history

  6. And another attempt to fix formatting fail

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    3a95f09 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Add type annotations for task arg in signatures and docstrings

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    d7ce833 View commit details
    Browse the repository at this point in the history

  2. Fix formatting

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    927eb96 View commit details
    Browse the repository at this point in the history

  3. Fix linting

    @EgorKraevTransferwise
    EgorKraevTransferwise committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    57f104e View commit details
    Browse the repository at this point in the history