Merge pull request #58 from conda-forge-admin/conda_forge_admin_34

Cross-compile `linux_aarch64` & `linux_ppc64le`
conda-forge · Dec 19, 2023 · 16af942 · 16af942
2 parents 8be616d + bd30a28
commit 16af942
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 32 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml
@@ -21,7 +21,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/...mpilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/...ompilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '12'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,6 +1,9 @@
 bot:
   abi_migration_branches:
     - 11.8
+build_platform:
+  linux_aarch64: linux_64
+  linux_ppc64le: linux_64
 conda_build:
   pkg_format: '2'
 conda_forge_output_validation: true

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -17,17 +17,21 @@ source:
   sha256: 7df0f84c4b6210112353374a7d992bfd5bba9c97358b39ea03b61bd634ce9c8a
 
 build:
-  number: 3
+  number: 4
   # Cython 0.29.x seems not to be fully compatible with Python 3.12, skipping for now.
   # This can be removed in a later CUDA Python that supports Cython 3.x.
   # xref: https://github.com/conda-forge/cuda-python-feedstock/issues/57
-  skip: true  # [osx or cuda_compiler_version != "12.0" or py == 312]
+  skip: true  # [py == 312]
+  {% if not (environ.get("cuda_compiler_version")|string()).startswith(major_version|string()) %}
+  skip: true
+  {% endif %}
   script:
+    - set "INCLUDE=%INCLUDE%;%BUILD_PREFIX%\Library\include"  # [win64]
     - {{ PYTHON }} -m pip install . --no-deps -vv
   script_env:
     # Ensure that CUDA includes can be found by the host compiler
-    - CUDA_HOME="${BUILD_PREFIX}/targets/{{ target_name }}"  # [linux]
-    - CUDA_HOME=%BUILD_PREFIX%\Library                       # [win64]
+    - CUDA_HOME="${PREFIX}/targets/{{ target_name }}"  # [linux]
+    - CUDA_HOME=%PREFIX%\Library                       # [win64]
   run_exports:
     - {{ pin_subpackage('cuda-python', min_pin='x', max_pin='x') }}
   ignore_run_exports_from:
@@ -38,13 +42,11 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('cuda') }}
-    # The packages with CUDA headers need to be added to "build" so that
-    # cuda-python can find and parse the headers. The parsing code in
-    # cuda-python doesn't support splayed layouts, i.e. packages split between
-    # "build" and "host", because $CUDA_HOME can only point to build or host.
-    - cuda-nvrtc-dev
-    - cuda-profiler-api
+    - cuda-version {{ major_version }}.{{ minor_version }}
     - sysroot_{{ target_platform }} 2.17  # [linux]
+    - cross-python_{{ target_platform }}  # [build_platform != target_platform]
+    - python                              # [build_platform != target_platform]
+    - cython <3                           # [build_platform != target_platform]
   host:
     - cuda-cudart-dev
     - cuda-nvrtc-dev
@@ -54,7 +56,7 @@ requirements:
     - pyclibrary
     - python
     - setuptools
-    - cuda-version {{ major_version }}
+    - cuda-version {{ major_version }}.{{ minor_version }}
   run:
     - python
     - {{ pin_compatible('cuda-version', min_pin='x', max_pin='x') }}