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.

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

Sklearn 1.6 support #2221

Merged
merged 18 commits into from
Dec 12, 2024

Conversation

Alexsandruss
Copy link
Contributor

@Alexsandruss Alexsandruss commented Dec 10, 2024

Description

Changes:

  • Set SCIPY_ARRAY_API to 1 which is required for sklearn>=1.6 if array-api-compat is installed in:
    • sklearnex config context
    • testing script
  • Update input validation in GBT and AdaBoost daal4py estimators
  • Update parameters validation logic for pairwise_distances

PR should start as a draft, then move to ready for review state after CI is passed and all applicable checkboxes are closed.
This approach ensures that reviewers don't spend extra time asking for regular requirements.

You can remove a checkbox as not applicable only if it doesn't relate to this PR in any way.
For example, PR with docs update doesn't require checkboxes for performance while PR with any change in actual code should have checkboxes and justify how this code change is expected to affect performance (or justification should be self-evident).

Checklist to comply with before moving PR from draft:

PR completeness and readability

  • I have reviewed my changes thoroughly before submitting this pull request.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have updated the documentation to reflect the changes or created a separate PR with update and provided its number in the description, if necessary.
  • Git commit message contains an appropriate signed-off-by string (see CONTRIBUTING.md for details).
  • I have added a respective label(s) to PR if I have a permission for that.
  • I have resolved any merge conflicts that might occur with the base branch.

Testing

  • I have run it locally and tested the changes extensively.
  • All CI jobs are green or I have provided justification why they aren't.
  • I have extended testing suite if new functionality was introduced in this PR.

Performance

N/A

@Alexsandruss
Copy link
Contributor Author

/intelci: run

4 similar comments
@Alexsandruss
Copy link
Contributor Author

/intelci: run

@Alexsandruss
Copy link
Contributor Author

/intelci: run

@Alexsandruss
Copy link
Contributor Author

/intelci: run

@Alexsandruss
Copy link
Contributor Author

/intelci: run

@Alexsandruss Alexsandruss added sklearn-patch sklearn patching dependencies Pull requests that update a dependency file labels Dec 11, 2024
@Alexsandruss
Copy link
Contributor Author

/intelci: run

@Alexsandruss Alexsandruss marked this pull request as ready for review December 12, 2024 11:21
Copy link
Contributor

@icfaust icfaust left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall pretty good. @Alexsandruss are we going to do anything to control the sklearn version in conda-recipe to prevent CI failures, or was that bug a feature?

.ci/pipeline/ci.yml Show resolved Hide resolved
daal4py/sklearn/ensemble/GBTDAAL.py Outdated Show resolved Hide resolved
daal4py/sklearn/ensemble/GBTDAAL.py Outdated Show resolved Hide resolved
daal4py/sklearn/ensemble/GBTDAAL.py Outdated Show resolved Hide resolved
deselected_tests.yaml Show resolved Hide resolved
@Alexsandruss
Copy link
Contributor Author

/intelci: run

@icfaust
Copy link
Contributor

icfaust commented Dec 12, 2024

Merge on green CI, we will need to also make tickets to upgrade private CI and update the public README.md about support.

@Alexsandruss
Copy link
Contributor Author

/intelci: run

@ethanglaser
Copy link
Contributor

Copy link
Contributor

@ethanglaser ethanglaser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Is the SCIPY_ARRAY_API something we should eventually be supporting internally? Would a follow-up ticket make sense here?

@ethanglaser
Copy link
Contributor

Merge on green CI, we will need to also make tickets to upgrade private CI and update the public README.md about support.

I have added a ticket for private CI

@Alexsandruss
Copy link
Contributor Author

I guess this should also be updated: https://github.com/uxlfoundation/scikit-learn-intelex/blob/main/doc/sources/quick-start.rst?plain=1#L377-L382

Separate PR with update of supported versions and others docs would be better.

@Alexsandruss Alexsandruss merged commit 624f1cf into uxlfoundation:main Dec 12, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file sklearn-patch sklearn patching
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants