Skip to content

[MRG + 1] BF: avoid importing from inside joblib#7731

Merged
NelleV merged 1 commit intoscikit-learn:masterfrom
GaelVaroquaux:fix_joblib_embedding
Oct 25, 2016
Merged

[MRG + 1] BF: avoid importing from inside joblib#7731
NelleV merged 1 commit intoscikit-learn:masterfrom
GaelVaroquaux:fix_joblib_embedding

Conversation

@GaelVaroquaux
Copy link
Copy Markdown
Member

@GaelVaroquaux GaelVaroquaux commented Oct 23, 2016

Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed creates a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html

Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html
@GaelVaroquaux GaelVaroquaux added this to the 0.18.1 milestone Oct 23, 2016
@yarikoptic
Copy link
Copy Markdown
Member

We love flowers and haters gonna hate!

@yarikoptic
Copy link
Copy Markdown
Member

better recommend some reasonable pub around Montparnasse tower ;)

@emanuele
Copy link
Copy Markdown

emanuele commented Oct 23, 2016

Enjoy Paris :) . Here in the rainy Trento, I checked Gaël patch and, as expected, it works well. In v0.17.1, i.e. the one packaged for Debian/Ubuntu, the import is marginally different and there is one further line affected, but the idea is exactly the same. I'm sure you don't need this one, but I am pasting it here anyway:

diff /usr/lib/python2.7/dist-packages/sklearn/metrics/pairwise.py /usr/lib/python2.7/dist-packages/sklearn/metrics/pairwise.py.original 
27c27
< from ..externals.joblib import cpu_count
---
> from ..externals.joblib import parallel
1047c1047
<         n_jobs = max(cpu_count() + 1 + n_jobs, 1)
---
>         n_jobs = max(parallel.cpu_count() + 1 + n_jobs, 1)

I should learn a bit more about backporting...

@amueller
Copy link
Copy Markdown
Member

LGTM

@amueller amueller changed the title [MRG] BF: avoid importing from inside joblib [MRG + 1] BF: avoid importing from inside joblib Oct 24, 2016
@NelleV
Copy link
Copy Markdown
Member

NelleV commented Oct 25, 2016

Thanks Gael!

@NelleV NelleV merged commit 5adc832 into scikit-learn:master Oct 25, 2016
amueller pushed a commit to amueller/scikit-learn that referenced this pull request Oct 25, 2016
Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html
amueller pushed a commit to amueller/scikit-learn that referenced this pull request Oct 27, 2016
Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html
sergeyf pushed a commit to sergeyf/scikit-learn that referenced this pull request Feb 28, 2017
Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html
Sundrique pushed a commit to Sundrique/scikit-learn that referenced this pull request Jun 14, 2017
Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html
paulha pushed a commit to paulha/scikit-learn that referenced this pull request Aug 19, 2017
Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html
maskani-moh pushed a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017
Debian replaces externals.joblib by an import to joblib, because they
hate duplication. Hence importing from inside joblib doesn't work, and
the line that I removed greats a bug.

See
http://lists.alioth.debian.org/pipermail/neurodebian-users/2016-October/001093.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants