diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d1251e40e7a4c..b38e4f32c8c48 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,6 +74,7 @@ jobs: matrix: pylatest_pip_scipy_dev: DISTRIB: 'conda-pip-scipy-dev' + CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '*' CHECK_WARNINGS: 'true' CHECK_PYTEST_SOFT_DEPENDENCY: 'true' @@ -205,6 +206,7 @@ jobs: # It runs tests requiring lightgbm, pandas and PyAMG. pylatest_pip_openblas_pandas: DISTRIB: 'conda-pip-latest' + CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '3.9' PYTEST_VERSION: '6.2.5' CHECK_PYTEST_SOFT_DEPENDENCY: 'true' diff --git a/build_tools/azure/install.sh b/build_tools/azure/install.sh index b09d7a48d2269..3b7b84a1064c2 100755 --- a/build_tools/azure/install.sh +++ b/build_tools/azure/install.sh @@ -69,9 +69,6 @@ if [[ "$DISTRIB" == "conda" || "$DISTRIB" == *"mamba"* ]]; then # instead because llvm-ar errors export AR=/usr/bin/ar fi - else - # FIXME: temporary fix to link against system libraries on linux - export LDFLAGS="$LDFLAGS -Wl,--sysroot=/" fi make_conda $TO_INSTALL setup_ccache @@ -97,8 +94,6 @@ elif [[ "$DISTRIB" == "debian-32" ]]; then $(get_dep joblib $JOBLIB_VERSION) elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then - # FIXME: temporary fix to link against system libraries on linux - export LDFLAGS="$LDFLAGS -Wl,--sysroot=/" # Since conda main channel usually lacks behind on the latest releases, # we use pypi to test against the latest releases of the dependencies. # conda is still used as a convenient way to install Python and pip. @@ -113,8 +108,6 @@ elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then # do not install dependencies for lightgbm since it requires scikit-learn. python -m pip install "lightgbm>=3.0.0" --no-deps elif [[ "$DISTRIB" == "conda-pip-scipy-dev" ]]; then - # FIXME: temporary fix to link against system libraries on linux - export LDFLAGS="$LDFLAGS -Wl,--sysroot=/" make_conda "ccache python=$PYTHON_VERSION" python -m pip install -U pip echo "Installing numpy and scipy master wheels" diff --git a/sklearn/_build_utils/openmp_helpers.py b/sklearn/_build_utils/openmp_helpers.py index 192e96cd30765..327afb199784f 100644 --- a/sklearn/_build_utils/openmp_helpers.py +++ b/sklearn/_build_utils/openmp_helpers.py @@ -65,12 +65,10 @@ def check_openmp_support(): extra_preargs = os.getenv("LDFLAGS", None) if extra_preargs is not None: extra_preargs = extra_preargs.strip().split(" ") - # FIXME: temporary fix to link against system libraries on linux - # "-Wl,--sysroot=/" should be removed extra_preargs = [ flag for flag in extra_preargs - if flag.startswith(("-L", "-Wl,-rpath", "-l", "-Wl,--sysroot=/")) + if flag.startswith(("-L", "-Wl,-rpath", "-l")) ] extra_postargs = get_openmp_flag