8000 CI: revert LDFLAGS sysroot work-around by lesteve · Pull Request #22535 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

CI: revert LDFLAGS sysroot work-around #22535

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

Closed
wants to merge 4 commits into from
Closed

CI: revert LDFLAGS sysroot work-around #22535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
100ad8f
CI: revert LDFLAGS sysroot work-around
lesteve Feb 18, 2022
e213af1
fix
lesteve Feb 18, 2022
f5d8161
[cd build] remove sysroot logic in openmp_helpers
lesteve Feb 18, 2022
6a207c3
Use conda-forge channel for pylatest* builds
lesteve Feb 18, 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
2 changes: 2 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
7 changes: 0 additions & 7 deletions build_tools/azure/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand All @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions sklearn/_build_utils/openmp_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0