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.

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

Jump to bottom

MAINT: revendor xsimd #76

Merged
merged 4 commits into from
May 27, 2023
Merged

MAINT: revendor xsimd #76

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
686ae76
unpin xsimd version
h-vetinari May 8, 2023
5ac778b
cross-compile ppc64le
h-vetinari May 8, 2023
dd5fd9f
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
h-vetinari May 8, 2023
4aa15bb
re-vendor xsimd
h-vetinari May 27, 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
12 changes: 6 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.23'
pin_run_as_build:
Expand Down
3 changes: 2 additions & 1 deletion conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
conda_forge_output_validation: true
github:
branch_name: main
tooling_branch_name: main
provider:
linux_aarch64: default
linux_ppc64le: azure
linux_ppc64le: default
win: azure
test_on_native_only: true
conda_build:
Expand Down
6 changes: 1 addition & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ source:
sha256: e036555d8319ba7fb22a926a4a5cf367fb0a7e6d133b17eff1a473dfbd552795

build:
number: 0
number: 1
script:
# prevent d1trimfile option being added which clang-cl does not understand.
# d1trimfile option is added by a patch and disabled by unsetting SRC_DIR
# https://github.com/conda-forge/python-feedstock/blob/e7ea437a819f8f06dcbc3769f6e46dc026070c44/recipe/patches/0021-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch
- set "SRC_DIR=" # [win]
# unvendor xsimd; use version packaged by conda-forge
- python -c "import os, shutil; shutil.rmtree(os.path.join('third_party', 'xsimd'))"
- "python -c \"with open('setup.cfg', 'w') as s: s.write('[build_py]\\nno_xsimd=True')\""
# on windows, pythran wrongly sets %PREFIX\include instead of %PREFIX%\Library\include;
# pythran-win32.cfg already exists and has [compiler].include_dirs; we replace it on the fly;
# conda will detect the written environment-path and replace it as appropriate for user installs;
Expand Down Expand Up @@ -56,7 +53,6 @@ requirements:
- gast 0.5.*
- ply >=3.4
- beniget 0.4.*
- xsimd >=8.0.5,<8.1

test:
files:
Expand Down