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

meson on windows with clang-cl & flang; python 3.12 support #255

Merged
merged 21 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b81ede9
Revert "hard-reset scipy source directory for recompilation on windows"
h-vetinari Sep 3, 2023
8db8f42
switch windows builds to meson
h-vetinari Sep 3, 2023
a552bf5
use flang 17 from llvm_rc label on windows
h-vetinari Sep 3, 2023
7626901
use FC to set "temporary" name for flang-executable
h-vetinari Sep 3, 2023
1c70927
according to meson, flang can't do `fortran_std=legacy`
h-vetinari Sep 15, 2023
12b76a7
remove obsolete compiler pins
h-vetinari Sep 15, 2023
e133161
use meson from dev-label (on windows)
h-vetinari Sep 3, 2023
1a1fa78
ensure we're using MSVC-compatible clang-flavour
h-vetinari Sep 24, 2023
2ef10ea
mirror clang-win compiler activation
h-vetinari Sep 24, 2023
348bdd9
cython <3 also in global build env
h-vetinari Sep 28, 2023
6d6458c
remove flags that clang-cl ignores
h-vetinari Sep 29, 2023
a20387a
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and co…
h-vetinari Sep 29, 2023
3694445
add python 3.12 migration
h-vetinari Sep 29, 2023
6998878
skip pypy on aarch/ppc
h-vetinari Oct 1, 2023
b50018f
use clang -dumpversion to populate compiler-rt path in LDFLAGS
h-vetinari Oct 1, 2023
71c22d9
add skip for test that timed out several times in emulation
h-vetinari Oct 2, 2023
ab89996
add skip for newly appeared failure on aarch/ppc
h-vetinari Oct 2, 2023
7c1b20c
Use compiler-rt from BUILD_PREFIX on windows
h-vetinari Oct 4, 2023
5c67343
ensure scipy-tests has all necessary host-deps
h-vetinari Oct 4, 2023
3a4ffb0
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and co…
h-vetinari Oct 4, 2023
79de424
bump build number
h-vetinari Oct 4, 2023
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
20 changes: 12 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ libcblas:
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
- 3.12.* *_cpython
python_impl:
- pypy
- cpython
target_platform:
- linux-aarch64
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ libcblas:
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
- 3.12.* *_cpython
python_impl:
- pypy
- cpython
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
42 changes: 42 additions & 0 deletions .ci_support/migrations/python312.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
migrator_ts: 1695046563
__migrator:
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 60
max_solver_attempts: 5 # this will make the bot retry "not solvable" stuff 5 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
exclude_pinned_pkgs: false
additional_zip_keys:
- channel_sources

python:
- 3.12.* *_cpython
channel_sources:
- conda-forge/label/python_rc,conda-forge
# additional entries to add for zip_keys
numpy:
- 1.26
python_impl:
- cpython
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
45 changes: 45 additions & 0 deletions .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.23'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
zip_keys:
- - python
- numpy
- python_impl
Loading
Loading