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

Miscellaneous joblib updates #545

Merged
merged 7 commits into from
Sep 17, 2019

Conversation

jakirkham
Copy link
Member

@jakirkham jakirkham commented Sep 9, 2019

As PR ( joblib/joblib#722 ) added the Distributed backend to Joblib in 0.12.2 and scikit-learn 0.20.0 vendored that joblib version with PR ( scikit-learn/scikit-learn#11741 ), reasonably recent versions of joblib and scikit-learn are already sufficient for our needs here. There may be more room for cleanup following this.

Edit: Also worth noting Distributed 1.24.0 has been raising an ImportError when importing distributed.joblib ( dask/distributed#2298 ). As we require Distributed 1.25.0 as of PR ( #466 ), we've also been raising that same ImportError for a while. So it's probably safe to drop the dask_ml.joblib shim as well.

As joblib contains the needed functionality here and has done so for a
while, go ahead and import from joblib directly instead of
scikit-learn's vendored joblib, which will soon be removed.
This just generates an `ImportError` as of distributed 1.24.0.
This just propagates an `ImportError` as of distributed 1.24.0.
@TomAugspurger
Copy link
Member

Thanks. I have a few CI things to clean up. Will get to this soon.

@jakirkham
Copy link
Member Author

No worries. Came across this in some other work I was doing.

@TomAugspurger
Copy link
Member

Not sure why the doc build is failing, while it's passing on examples.dask.org. Will have to look later.

@TomAugspurger TomAugspurger merged commit 17dcaef into dask:master Sep 17, 2019
@TomAugspurger
Copy link
Member

Thanks John!

@jakirkham jakirkham deleted the misc_joblib_updates branch September 17, 2019 19:32
stsievert pushed a commit to stsievert/dask-ml that referenced this pull request Oct 29, 2019
* Use joblib directly in benchmark

As joblib contains the needed functionality here and has done so for a
while, go ahead and import from joblib directly instead of
scikit-learn's vendored joblib, which will soon be removed.

* Drop import of `distributed.joblib`

This just generates an `ImportError` as of distributed 1.24.0.

* Drop import of `dask_ml.joblib`

This just propagates an `ImportError` as of distributed 1.24.0.
stsievert pushed a commit to stsievert/dask-ml that referenced this pull request Nov 1, 2019
* Use joblib directly in benchmark

As joblib contains the needed functionality here and has done so for a
while, go ahead and import from joblib directly instead of
scikit-learn's vendored joblib, which will soon be removed.

* Drop import of `distributed.joblib`

This just generates an `ImportError` as of distributed 1.24.0.

* Drop import of `dask_ml.joblib`

This just propagates an `ImportError` as of distributed 1.24.0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants