Skip to content

Commit

Permalink
roll back to building with distutils
Browse files Browse the repository at this point in the history
with PROPACK enabled however
  • Loading branch information
h-vetinari committed May 6, 2023
1 parent 787f5ca commit bdaff73
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 1,988 deletions.
24 changes: 4 additions & 20 deletions recipe/build.sh
@@ -1,24 +1,8 @@
#!/bin/bash
set -ex

mkdir builddir
# Use the G77 ABI wrapper everywhere so that the underlying blas implementation
# can have a G77 ABI (currently only MKL)
export SCIPY_USE_G77_ABI_WRAPPER=1

# HACK: extend $CONDA_PREFIX/meson_cross_file that's created in
# https://github.com/conda-forge/ctng-compiler-activation-feedstock/blob/main/recipe/activate-gcc.sh
# https://github.com/conda-forge/clang-compiler-activation-feedstock/blob/main/recipe/activate-clang.sh
# to use host python; requires that [binaries] section is last in meson_cross_file
echo "python = '${PREFIX}/bin/python'" >> ${CONDA_PREFIX}/meson_cross_file.txt

# meson-python already sets up a -Dbuildtype=release argument to meson, so
# we need to strip --buildtype out of MESON_ARGS or fail due to redundancy
MESON_ARGS_REDUCED="$(echo $MESON_ARGS | sed 's/--buildtype release //g')"

# -wnx flags mean: --wheel --no-isolation --skip-dependency-check
$PYTHON -m build -w -n -x \
-Cbuilddir=builddir \
-Csetup-args=-Dblas=blas \
-Csetup-args=-Dlapack=lapack \
-Csetup-args=-Duse-g77-abi=true \
-Csetup-args=${MESON_ARGS_REDUCED// / -Csetup-args=} \
|| (cat builddir/meson-logs/meson-log.txt && exit 1)
pip install dist/scipy*.whl
$PYTHON setup.py install --single-version-externally-managed --record=record.txt
30 changes: 6 additions & 24 deletions recipe/meta.yaml
Expand Up @@ -14,21 +14,10 @@ source:
# the submodules (not in tarball due to dear-github/dear-github#214)
- url: https://github.com/scipy/scipy/archive/refs/tags/v{{ version }}.tar.gz
sha256: 8f08e1742c9b09eb58640fa5a56031d6e1844806899e883fbe7447ca86fe8c55
patches:
# backport https://github.com/scipy/scipy/pull/18006
- patches/0001-BLD-use-a-relative-path-to-numpy-pybind11-pythran-in.patch
# backport https://github.com/scipy/scipy/pull/18034
- patches/0002-BLD-avoid-running-run_command-py3-.-for-better-cross.patch
# backport https://github.com/scipy/scipy/pull/18263
- patches/0003-BUG-some-tweaks-to-PROPACK-f2py-wrapper-and-build-fl.patch # [not win]
# backport https://github.com/scipy/scipy/pull/18264 (3 commits)
- patches/0004-MAINT-remove-from-numpy.math-cimport-usages.patch # [not win]
- patches/0005-MAINT-sync-changes-to-npy_blas.h-and-npy_blas_base.h.patch # [not win]
- patches/0006-BUG-include-npy_common.h-in-npy_cblas.h.patch # [not win]
# backport https://github.com/scipy/scipy/pull/18426
- patches/0007-BLD-fix-two-regressions-for-Duse-g77-abi.patch # [not win]
- patches/0008-Revert-MAINT-add-SCIPY_USE_PROPACK-env-variable-1636.patch
- patches/0009-Revert-MAINT-skip-complex128-propack-tests-on-window.patch
patches:
# re-enable PROPACK support
- patches/0001-Revert-MAINT-add-SCIPY_USE_PROPACK-env-variable-1636.patch
- patches/0002-Revert-MAINT-skip-complex128-propack-tests-on-window.patch
# https://github.com/scipy/scipy/tree/v{{ version }}/scipy/_lib
- git_url: https://github.com/scipy/boost-headers-only.git
git_rev: 3af99e6d566043072e95bc882d32c9c26f37e0ba
Expand All @@ -54,10 +43,7 @@ requirements:
- cython # [build_platform != target_platform]
- numpy # [build_platform != target_platform]
- pybind11 # [build_platform != target_platform]
- meson-python # [build_platform != target_platform]
- cmake # [build_platform != target_platform]
- ninja # [build_platform != target_platform]
- pkg-config # [build_platform != target_platform]
- setuptools <60 # [build_platform != target_platform]
- {{ compiler('c') }}
- {{ compiler('cxx') }}
# pythran code needs clang-cl on windows
Expand All @@ -72,12 +58,8 @@ requirements:
- libcblas
- liblapack
- python
- setuptools <60 # [win]
- setuptools <60
- cython
- meson-python # [unix]
- ninja # [unix]
- pkg-config # [unix]
- python-build # [unix]
- pybind11
- pythran
- numpy
Expand Down

0 comments on commit bdaff73

Please sign in to comment.