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

[python-package] Use scikit-learn interpretation of negative n_jobs and change default to number of cores #5105

Merged
merged 33 commits into from
Jun 19, 2022
Merged

[python-package] Use scikit-learn interpretation of negative n_jobs and change default to number of cores #5105

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8bd6e8d
use joblib formula for negative n_jobs
david-cortes Mar 30, 2022
60b28de
correction for n_jobs calculation
david-cortes Mar 30, 2022
78e83ef
use more robust cpu_count from joblib
david-cortes Mar 30, 2022
8c0fe80
change default n_jobs to number of cores
david-cortes Mar 30, 2022
bde1cd9
fix detection of num_threads under parameters
david-cortes Mar 30, 2022
deb2c4b
better handling of n_jobs at prediction time
david-cortes Mar 31, 2022
461b0f0
fix incorrect usage of list.pop
david-cortes Mar 31, 2022
2046bbd
correct pop/remove yet again
david-cortes Mar 31, 2022
8d22027
Update python-package/lightgbm/sklearn.py
david-cortes May 12, 2022
52ddaa9
Update tests/python_package_test/test_sklearn.py
david-cortes May 12, 2022
607c184
Update tests/python_package_test/test_sklearn.py
david-cortes May 12, 2022
f4f1bb6
add comments clarifying negative n_jobs
david-cortes May 12, 2022
6f8ff2f
fix CI (code taken from PR comment)
david-cortes May 12, 2022
32b73a2
change default to n_jobs=None in dask interface
david-cortes May 14, 2022
5c162e6
corrections for handling of n_jobs
david-cortes May 15, 2022
33c851d
linter
david-cortes May 15, 2022
5b6841e
corrections for predict-time n_jobs
david-cortes May 15, 2022
93bc3a6
linter
david-cortes May 15, 2022
a757666
add more comments about n_jobs values
david-cortes May 15, 2022
49f5da7
linter
david-cortes May 15, 2022
d142209
more corrections
david-cortes May 15, 2022
d2bf3c0
linter
david-cortes May 15, 2022
a31fced
linter
david-cortes May 15, 2022
fda1b5e
linter
david-cortes May 15, 2022
b4461c3
Update python-package/lightgbm/compat.py
david-cortes May 15, 2022
4aec1c6
Update python-package/lightgbm/sklearn.py
david-cortes May 15, 2022
dfe23b9
Update python-package/lightgbm/sklearn.py
david-cortes May 15, 2022
9749f7d
Update python-package/lightgbm/sklearn.py
david-cortes May 15, 2022
21cd3b2
Update python-package/lightgbm/sklearn.py
david-cortes May 15, 2022
65247fc
workaround for passing test about outputs with multiple threads
david-cortes May 30, 2022
c7259da
Merge branch 'pynjobs' of github.com:david-cortes/lightgbm into pynjobs
david-cortes May 30, 2022
467b74d
Update tests/python_package_test/test_sklearn.py
david-cortes Jun 5, 2022
d74ab7b
Update tests/python_package_test/test_sklearn.py
david-cortes Jun 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more corrections
  • Loading branch information
@david-cortes
david-cortes committed May 15, 2022
commit d142209f095d51f3306e2a41fda19a993de35cbc
1 change: 1 addition & 0 deletions python-package/lightgbm/sklearn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,7 @@ def predict(self, X, raw_score=False, start_iteration=0, num_iteration=None,

# number of threads can have values with special meaning which is only applied
# in the scikit-learn interface, these should not reach the c++ side as-is
n_jobs = self.n_jobs
num_threads_aliases = _ConfigAliases.get("num_threads")
for alias in num_threads_aliases:
if alias in predict_params:
Expand Down