From a5ec4a2ef5c8de23f5ec7a67e082daab5f0d8307 Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Wed, 15 May 2024 16:07:27 -0500 Subject: [PATCH 1/3] Skip s390x, CUDA doesn't support it --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a36b1f3..c9863de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,7 @@ source: build: number: 2 binary_relocation: false - skip: true # [osx] + skip: true # [osx or (linux and s390x)] test: requires: From 0fb3d9ec86c202ca0bda463dd921abc05a2e33fa Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Wed, 15 May 2024 16:07:57 -0500 Subject: [PATCH 2/3] Remove conda-forge build requirement on specific arm architecture We don't have arm-variant as a package in defaults. It's left in run_constrained to support compatibility when mixed with conda-forge packages. --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c9863de..f0ab029 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -51,7 +51,7 @@ outputs: build: - {{ compiler("c") }} - {{ compiler("cxx") }} - - arm-variant * {{ arm_variant_type }} # [aarch64] + #- arm-variant * {{ arm_variant_type }} # [aarch64] - {{ stdlib("c") }} - patchelf <0.18.0 # [linux] host: @@ -87,7 +87,7 @@ outputs: build: - {{ compiler("c") }} - {{ compiler("cxx") }} - - arm-variant * {{ arm_variant_type }} # [aarch64] + #- arm-variant * {{ arm_variant_type }} # [aarch64] - {{ stdlib("c") }} host: - cuda-version {{ cuda_version }} @@ -124,7 +124,7 @@ outputs: build: - {{ compiler("c") }} - {{ compiler("cxx") }} - - arm-variant * {{ arm_variant_type }} # [aarch64] + #- arm-variant * {{ arm_variant_type }} # [aarch64] - {{ stdlib("c") }} host: - cuda-version {{ cuda_version }} From 2a092a9ffdac3f73ca336984ce17b82ff8f47a09 Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Wed, 15 May 2024 16:15:40 -0500 Subject: [PATCH 3/3] Support conda-forge {{ stdlib('c') }} function With appropriate glibc versions for linux-64 and -aarch64, and vs version for win aligning with base cbc.yaml. --- recipe/conda_build_config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index f0f19b6..5d5c596 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,8 @@ arm_variant_type: # [aarch64] - sbsa # [aarch64] +c_stdlib: +- sysroot # [linux] +- vs2017 # [win] +c_stdlib_version: +- '2.17' # [linux and x86_64] +- '2.26' # [linux and aarch64] \ No newline at end of file