From b86a659a9fadb4e1314df5bb4a6d041e8425af65 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 May 2025 11:26:39 +1100 Subject: [PATCH 1/4] drop CUDA 11.8 --- recipe/conda_build_config.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1b71a2fed1..c7e5d7a7a7 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -6,7 +6,6 @@ c_compiler: c_compiler_version: # [unix] - 13 # [linux] - 18 # [osx] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] # CUDA 12.4 on PPC does not support GCC 13 - 12 # [linux and ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 13 # [linux and not ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] @@ -30,7 +29,6 @@ cxx_compiler: cxx_compiler_version: # [unix] - 13 # [linux] - 18 # [osx] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 12 # [linux and ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 13 # [linux and not ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] llvm_openmp: # [osx] @@ -43,7 +41,6 @@ fortran_compiler_version: # [unix or win64] - 13 # [linux] - 13 # [osx] - 5 # [win64] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 12 # [linux and ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 13 # [linux and not ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] m2w64_c_compiler: # [win] @@ -65,12 +62,11 @@ cuda_compiler: - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] cuda_compiler_version: - None - - 11.8 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 12.4 # [linux and ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 12.6 # [((linux and not ppc64le) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] cuda_compiler_version_min: - None # [osx] - - 11.8 # [linux or win64] + - 12.4 # [linux or win64] arm_variant_type: # [aarch64] - sbsa # [aarch64] @@ -155,16 +151,6 @@ docker_image: # [os.environ.get("BUILD_PLA - quay.io/condaforge/linux-anvil-aarch64:alma9 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - quay.io/condaforge/linux-anvil-ppc64le:alma9 # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - # CUDA 11.8 builds (only x64 has a DEFAULT_LINUX_VERSION choice; alma9 not available) - - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "ubi8") == "cos7"] - - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "ubi8") in ("ubi8", "alma8", "alma9")] - # CUDA 11.8 arch: native compilation (build == target) - - quay.io/condaforge/linux-anvil-aarch64-cuda11.8:ubi8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - - quay.io/condaforge/linux-anvil-ppc64le-cuda11.8:ubi8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - # CUDA 11.8 arch: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # CUDA 12 builds on CentOS 7 - quay.io/condaforge/linux-anvil-x86_64:cos7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] - quay.io/condaforge/linux-anvil-aarch64:cos7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] From 2babf3649e974954e2636b9cb1aa13cb90b321ab Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 May 2025 11:39:32 +1100 Subject: [PATCH 2/4] remove docker_image from compiler zip --- recipe/conda_build_config.yaml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index c7e5d7a7a7..a2d41fcd43 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -136,36 +136,21 @@ cdt_name: # [linux] - conda # [linux] docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-")] - # non-CUDA-enabled builds on CentOS 7 + # builds on CentOS 7 - quay.io/condaforge/linux-anvil-x86_64:cos7 # [os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] - quay.io/condaforge/linux-anvil-aarch64:cos7 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] - quay.io/condaforge/linux-anvil-ppc64le:cos7 # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] - # non-CUDA-enabled builds on AlmaLinux 8 + # builds on AlmaLinux 8 - quay.io/condaforge/linux-anvil-x86_64:alma8 # [os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") in ("alma8", "ubi8")] - quay.io/condaforge/linux-anvil-aarch64:alma8 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") in ("alma8", "ubi8")] - quay.io/condaforge/linux-anvil-ppc64le:alma8 # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") in ("alma8", "ubi8")] - # non-CUDA-enabled builds on AlmaLinux 9 + # builds on AlmaLinux 9 - quay.io/condaforge/linux-anvil-x86_64:alma9 # [os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - quay.io/condaforge/linux-anvil-aarch64:alma9 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - quay.io/condaforge/linux-anvil-ppc64le:alma9 # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - # CUDA 12 builds on CentOS 7 - - quay.io/condaforge/linux-anvil-x86_64:cos7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] - - quay.io/condaforge/linux-anvil-aarch64:cos7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] - - quay.io/condaforge/linux-anvil-ppc64le:cos7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "cos7"] - - # CUDA 12 builds on AlmaLinux 8 - - quay.io/condaforge/linux-anvil-x86_64:alma8 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") in ("alma8", "ubi8")] - - quay.io/condaforge/linux-anvil-aarch64:alma8 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") in ("alma8", "ubi8")] - - quay.io/condaforge/linux-anvil-ppc64le:alma8 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") in ("alma8", "ubi8")] - - # CUDA 12 builds on AlmaLinux 9 - - quay.io/condaforge/linux-anvil-x86_64:alma9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - - quay.io/condaforge/linux-anvil-aarch64:alma9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - - quay.io/condaforge/linux-anvil-ppc64le:alma9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "alma9") == "alma9"] - zip_keys: - # [unix] - c_compiler_version # [unix] @@ -173,7 +158,6 @@ zip_keys: - fortran_compiler_version # [unix] - cuda_compiler # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler_version # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - docker_image # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM", "").startswith("linux-")] - # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler_version # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] From ce8bac4e49391195e20e47a5a87a8338d376a8e7 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Thu, 29 May 2025 16:31:12 +1100 Subject: [PATCH 3/4] distinguish cuda_compiler_version_min for ppc/non-ppc Co-authored-by: jakirkham --- recipe/conda_build_config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a2d41fcd43..4fa52e535b 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -66,7 +66,8 @@ cuda_compiler_version: - 12.6 # [((linux and not ppc64le) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] cuda_compiler_version_min: - None # [osx] - - 12.4 # [linux or win64] + - 12.4 # [linux and ppc64le] + - 12.6 # [(linux and not ppc64le) or win64] arm_variant_type: # [aarch64] - sbsa # [aarch64] From 7e46ffe02a747be59bab35f7c5ea050ae9a0311a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 29 May 2025 18:39:44 +1100 Subject: [PATCH 4/4] set cuda_compiler to "cuda-nvcc" unconditionally --- recipe/conda_build_config.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4fa52e535b..2199e5d346 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -57,9 +57,7 @@ m2w64_fortran_compiler_version: # [win] - 13 # [win] cuda_compiler: - - None - - nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda-nvcc cuda_compiler_version: - None - 12.4 # [linux and ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] @@ -157,11 +155,7 @@ zip_keys: - c_compiler_version # [unix] - cxx_compiler_version # [unix] - fortran_compiler_version # [unix] - - cuda_compiler # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler_version # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda_compiler # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda_compiler_version # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - python - numpy