Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4b97487
Rebuild for python 3.13
regro-cf-autotick-bot Sep 19, 2024
054fb31
Update to 2.4.1
hmaarrfk Sep 20, 2024
7853499
unskip "not aarch64"
hmaarrfk Oct 2, 2024
9efae8f
Simplify cmake
hmaarrfk Oct 2, 2024
9bafcc9
Do not make changes to ci setup
hmaarrfk Oct 2, 2024
3ba0051
Add cudnn9
hmaarrfk Oct 2, 2024
5b836af
Bump the aarch docker image
hmaarrfk Oct 2, 2024
dc24bde
fix image override on aarch
h-vetinari Oct 2, 2024
211f363
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
h-vetinari Oct 2, 2024
8ed610f
Specify USE_PRIORITIZED_TEXT_FOR_LD=1 for aarch64
hmaarrfk Oct 2, 2024
ee734b3
skip all but aarch
hmaarrfk Oct 3, 2024
f31d142
Use a dfiferent image
hmaarrfk Oct 3, 2024
b38525f
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.41.1, and co…
hmaarrfk Oct 3, 2024
ba5770a
disable linker script for now
hmaarrfk Oct 3, 2024
36ee7ab
disable linker script for now
hmaarrfk Oct 3, 2024
a4e9a4c
Update recipe/conda_build_config.yaml
hmaarrfk Oct 4, 2024
d0ddbd4
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.41.1, and co…
hmaarrfk Oct 4, 2024
b46132b
Fix LD script for aarch64
hmaarrfk Oct 4, 2024
7122585
simplify patch
hmaarrfk Oct 4, 2024
a3bac31
Unskip
hmaarrfk Oct 4, 2024
81e3c2b
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.41.1, and co…
hmaarrfk Oct 4, 2024
22bf055
Fix sed
isuruf Oct 4, 2024
f56b78e
Simplify build.sh
hmaarrfk Oct 5, 2024
5e677dc
Go back to old ci setup
hmaarrfk Oct 5, 2024
0a64808
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.41.1, and co…
hmaarrfk Oct 5, 2024
16ef3a7
undor remote ci setup
hmaarrfk Oct 5, 2024
68e55f2
Skip so much stuff
hmaarrfk Oct 5, 2024
57015bd
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.41.1, and co…
hmaarrfk Oct 5, 2024
4814113
Disable one of hte 2 patches
hmaarrfk Oct 5, 2024
fd011ec
Undo sed "fix"
hmaarrfk Oct 5, 2024
b6e2d2e
do one more replacement
hmaarrfk Oct 6, 2024
5c6f02f
one more replacement for good measure
hmaarrfk Oct 6, 2024
77da201
Unskip stuffs
hmaarrfk Oct 6, 2024
1ac3036
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
hmaarrfk Oct 6, 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
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,31 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
- '2.28'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
- '9'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.8
github_actions_labels:
- cirun-openstack-gpu-2xlarge
libabseil:
Expand All @@ -50,6 +54,7 @@ numpy:
- '2.0'
- '2.0'
- '2.0'
- '2'
- '2.0'
pin_run_as_build:
python:
Expand All @@ -59,9 +64,10 @@ python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.13.* *_cp313
- 3.9.* *_cpython
pytorch:
- '2.3'
- '2.4'
target_platform:
- linux-aarch64
zip_keys:
Expand All @@ -74,3 +80,4 @@ zip_keys:
- docker_image
- - python
- numpy
- channel_sources

This file was deleted.

106 changes: 0 additions & 106 deletions .ci_support/migrations/cuda120.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .ci_support/migrations/cudnn9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for cudnn 9
kind: version
migration_number: 1
cudnn:
- '9'
migrator_ts: 1724175586.3831317
46 changes: 46 additions & 0 deletions .ci_support/migrations/python313.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
migrator_ts: 1724712607
__migrator:
commit_message: Rebuild for python 3.13
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
- 3.13.* *_cp313 # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: true
pr_limit: 20
max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
# see https://github.com/conda-forge/scipy-feedstock/pull/283
- scipy
exclude_pinned_pkgs: false
additional_zip_keys:
- channel_sources

python:
- 3.13.* *_cp313
channel_sources:
- conda-forge/label/python_rc,conda-forge
# additional entries to add for zip_keys
numpy:
- 2
python_impl:
- cpython
12 changes: 3 additions & 9 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,11 @@ jobs:
fail-fast: false
matrix:
include:
- CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12
- CONFIG: linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version12c_h235c88ac5f', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all"
- CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version13c_h048947eff7', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version12c_h90d0c58ec0', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.8
CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all"
steps:

Expand Down
4 changes: 2 additions & 2 deletions .scripts/build_steps.sh

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

7 changes: 3 additions & 4 deletions README.md

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

6 changes: 0 additions & 6 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ azure:
free_disk_space: true
settings_linux:
timeoutInMinutes: 1
settings_osx:
pool:
vmImage: macos-12
build_platform:
linux_aarch64: linux_64
osx_arm64: osx_64
Expand All @@ -25,7 +22,4 @@ os_version:
provider:
linux_64: github_actions
linux_aarch64: azure
remote_ci_setup:
- py-lief=0.12.3
- conda-forge-ci-setup=3
test: native_and_emulated
5 changes: 5 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
export USE_MKLDNN=0
fi
elif [[ ${cuda_compiler_version} != "None" ]]; then
if [[ "$target_platform" == "linux-aarch64" ]]; then
# https://github.com/pytorch/pytorch/pull/121975
# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/264
export USE_PRIORITIZED_TEXT_FOR_LD=1
Comment thread
hmaarrfk marked this conversation as resolved.
fi
# Even though cudnn is used for CUDA builds, it's good to enable
# for MKLDNN for CUDA builds when CUDA builds are used on a machine
# with no NVIDIA GPUs. However compilation fails with mkldnn and cuda enabled.
Expand Down
Loading