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

Arch Migrator #46

Merged
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b0e0592
migration: ArchRebuild
regro-cf-autotick-bot Mar 22, 2024
ac08e80
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and co…
regro-cf-autotick-bot Mar 22, 2024
62659b2
Merge remote-tracking branch 'upstream/main' into bot-pr_arch_h1e510c
charlesbluca Jul 2, 2024
2b81736
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and co…
charlesbluca Jul 2, 2024
e9e0eba
Merge remote-tracking branch 'upstream/main' into bot-pr_arch_h0e510c
charlesbluca Sep 23, 2024
6fcbc44
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.40.1, and co…
charlesbluca Sep 23, 2024
85a7699
Cross-compile all arch builds
jakirkham Oct 2, 2024
3c0891d
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
Oct 2, 2024
fd3843d
Remove Docker images from Azure too
jakirkham Oct 2, 2024
32dc910
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
Oct 2, 2024
3608b8c
Drop `-fno-plt` on `linux_ppc64le`
jakirkham Oct 2, 2024
b7b4c91
Run tests for native builds only
jakirkham Oct 2, 2024
e8165a5
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
Oct 2, 2024
dd0645b
Adapt testing for cross-compilation
jakirkham Oct 2, 2024
e29f807
Enable testing when cross-compiling
jakirkham Oct 2, 2024
e8fe039
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
Oct 2, 2024
6c63ba6
On Linux, use 20GiB swap file
jakirkham Oct 2, 2024
c64ef1a
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
Oct 2, 2024
6f2cafe
Fix comparison to only `import` on native
jakirkham Oct 2, 2024
a4de1d2
Bump `build/number` to `1`
jakirkham Oct 2, 2024
166dba6
Changing quoting style in tests for Windows
jakirkham Oct 3, 2024
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
17 changes: 17 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

27 changes: 27 additions & 0 deletions .ci_support/linux_ppc64le_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
27 changes: 27 additions & 0 deletions .ci_support/linux_ppc64le_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
27 changes: 27 additions & 0 deletions .ci_support/linux_ppc64le_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
27 changes: 27 additions & 0 deletions .ci_support/linux_ppc64le_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_cpython
rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
28 changes: 28 additions & 0 deletions README.md

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

7 changes: 6 additions & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
azure:
free_disk_space: true
free_disk_space:
- apt
- cache
- docker
settings_linux:
swapfile_size: 10GiB
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
settings_win:
Expand All @@ -9,6 +12,7 @@ bot:
automerge: true
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
conda_build:
pkg_format: '2'
Expand All @@ -18,5 +22,6 @@ github:
tooling_branch_name: main
provider:
linux_aarch64: default
linux_ppc64le: default
win: azure
test: native_and_emulated
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 9 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ if [ "$c_compiler" = gcc ] ; then
export CARGO_TARGET_${rust_env_arch}_LINKER=$CC
fi

# Taken from clangdev's recipe
# https://github.com/conda-forge/clangdev-feedstock/blob/01fc5e3e0fc690db85151dcb3ff512e6aa876be7/recipe/build.sh#L51-L56
# disable -fno-plt due to some GCC bug causing linker errors, see
# https://github.com/llvm/llvm-project/issues/51205
if [[ "$target_platform" == "linux-ppc64le" ]]; then
CFLAGS="$(echo $CFLAGS | sed 's/-fno-plt //g')"
CXXFLAGS="$(echo $CXXFLAGS | sed 's/-fno-plt //g')"
fi

Comment on lines +19 to +27
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the aforementioned error ( #46 (comment) ) may be fixed by dropping the -fno-plt compiler flag. A similar approach is taken in the clangdev feedstock. Note this also references upstream issue ( llvm/llvm-project#51205 )

declare -a _xtra_maturin_args

mkdir -p $SRC_DIR/.cargo
Expand Down
Loading