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

MAINT compatibility scikit-learn 1.3 #999

Merged
merged 38 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
iter
  • Loading branch information
glemaitre committed Jul 7, 2023
commit 40d42a3aff43144beae1a1f67996180081ec0543
6 changes: 4 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
THREADPOOLCTL_VERSION: 'min'
COVERAGE: 'false'
# Linux + Python 3.8 build with OpenBLAS and without SITE_JOBLIB
py38_conda_defaults_openblas:
py38_conda_conda_forge_openblas:
DISTRIB: 'conda'
CONDA_CHANNEL: 'conda-forge'
PYTHON_VERSION: '3.8'
Expand Down Expand Up @@ -283,13 +283,15 @@ jobs:
CPU_COUNT: '3'
TEST_DOCS: 'true'
# TODO: re-enable when we find out why MKL on defaults segfaults
# It seems that scikit-learn from defaults channel is built with LLVM/CLANG OMP
# while we use MKL OMP. This could be the cause of the segfaults.
pylatest_conda_mkl_no_openmp:
DISTRIB: 'conda'
BLAS: 'mkl'
SKLEARN_SKIP_OPENMP_TEST: 'true'
CPU_COUNT: '3'
TEST_DOCS: 'true'
conda_defaults_openblas:
conda_conda_forge_openblas:
DISTRIB: 'conda'
CONDA_CHANNEL: 'conda-forge'
BLAS: 'openblas'
Expand Down
2 changes: 1 addition & 1 deletion build_tools/azure/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ make_conda() {
}

# imports get_dep
source build_tools/shared.sh
source build_tools/shared.shpython= pip 'blas[build=mkl]' numpy scipy scikit-learn joblib pandas Pillow matplotlib

if [[ "$DISTRIB" == "conda" || "$DISTRIB" == *"mamba"* ]]; then

Expand Down
6 changes: 3 additions & 3 deletions build_tools/azure/test_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ mkdir -p $TEST_DIR
cp setup.cfg $TEST_DIR
cd $TEST_DIR

python -c "import joblib; print(f'Number of cores (physical): \
{joblib.cpu_count()} ({joblib.cpu_count(only_physical_cores=True)})')"
# python -c "import joblib; print(f'Number of cores (physical): \
# {joblib.cpu_count()} ({joblib.cpu_count(only_physical_cores=True)})')"
# python -c "import sklearn; sklearn.show_versions()"
python -c "import imblearn; imblearn.show_versions()"
python -c "import sklearn; sklearn.show_versions()"

if ! command -v conda &> /dev/null
then
Expand Down