From 31ffce40c4ada7dff73070d0786068e57e6d09db Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Wed, 24 Apr 2024 12:05:44 -0700 Subject: [PATCH 1/2] Migrate to `{{ stdlib("c") }}` --- conda/recipes/cudf/conda_build_config.yaml | 2 +- conda/recipes/cudf/meta.yaml | 2 +- conda/recipes/cudf_kafka/conda_build_config.yaml | 2 +- conda/recipes/cudf_kafka/meta.yaml | 2 +- conda/recipes/libcudf/conda_build_config.yaml | 2 +- conda/recipes/libcudf/meta.yaml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conda/recipes/cudf/conda_build_config.yaml b/conda/recipes/cudf/conda_build_config.yaml index c98c2701653..de66f3ff68b 100644 --- a/conda/recipes/cudf/conda_build_config.yaml +++ b/conda/recipes/cudf/conda_build_config.yaml @@ -4,7 +4,7 @@ c_compiler_version: cxx_compiler_version: - 11 -sysroot_version: +c_stdlib_version: - "2.17" cmake_version: diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index ae2d938250b..ddcadfd1570 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -57,7 +57,7 @@ requirements: - {{ compiler('cuda') }} {% endif %} - cuda-version ={{ cuda_version }} - - sysroot_{{ target_platform }} {{ sysroot_version }} + - {{ stdlib("c") }} host: - python - cython >=3.0.3 diff --git a/conda/recipes/cudf_kafka/conda_build_config.yaml b/conda/recipes/cudf_kafka/conda_build_config.yaml index c98c2701653..de66f3ff68b 100644 --- a/conda/recipes/cudf_kafka/conda_build_config.yaml +++ b/conda/recipes/cudf_kafka/conda_build_config.yaml @@ -4,7 +4,7 @@ c_compiler_version: cxx_compiler_version: - 11 -sysroot_version: +c_stdlib_version: - "2.17" cmake_version: diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml index 45e41bf8de7..ab41d9e1f15 100644 --- a/conda/recipes/cudf_kafka/meta.yaml +++ b/conda/recipes/cudf_kafka/meta.yaml @@ -53,7 +53,7 @@ requirements: - {{ compiler('cuda') }} {% endif %} - cuda-version ={{ cuda_version }} - - sysroot_{{ target_platform }} {{ sysroot_version }} + - {{ stdlib("c") }} host: - python - cython >=3.0.3 diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index b7fbaab9306..f09d3dc3c25 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -10,7 +10,7 @@ cuda_compiler: cuda11_compiler: - nvcc -sysroot_version: +c_stdlib_version: - "2.17" cmake_version: diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index 695c515b9d4..76115362b6c 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -43,7 +43,7 @@ requirements: {% endif %} - cuda-version ={{ cuda_version }} - ninja - - sysroot_{{ target_platform }} {{ sysroot_version }} + - {{ stdlib("c") }} host: - librmm ={{ minor_version }} - libkvikio ={{ minor_version }} @@ -170,7 +170,7 @@ outputs: {% endif %} - cuda-version ={{ cuda_version }} - ninja - - sysroot_{{ target_platform }} {{ sysroot_version }} + - {{ stdlib("c") }} host: - {{ pin_subpackage('libcudf', exact=True) }} {% if cuda_major == "11" %} From 02976885e286da9468dd91df4642b25db2e490c6 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Thu, 25 Apr 2024 01:16:17 -0700 Subject: [PATCH 2/2] Specify c_stdlib --- conda/recipes/cudf/conda_build_config.yaml | 3 +++ conda/recipes/cudf_kafka/conda_build_config.yaml | 3 +++ conda/recipes/libcudf/conda_build_config.yaml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/conda/recipes/cudf/conda_build_config.yaml b/conda/recipes/cudf/conda_build_config.yaml index de66f3ff68b..d399e440edd 100644 --- a/conda/recipes/cudf/conda_build_config.yaml +++ b/conda/recipes/cudf/conda_build_config.yaml @@ -4,6 +4,9 @@ c_compiler_version: cxx_compiler_version: - 11 +c_stdlib: + - sysroot + c_stdlib_version: - "2.17" diff --git a/conda/recipes/cudf_kafka/conda_build_config.yaml b/conda/recipes/cudf_kafka/conda_build_config.yaml index de66f3ff68b..d399e440edd 100644 --- a/conda/recipes/cudf_kafka/conda_build_config.yaml +++ b/conda/recipes/cudf_kafka/conda_build_config.yaml @@ -4,6 +4,9 @@ c_compiler_version: cxx_compiler_version: - 11 +c_stdlib: + - sysroot + c_stdlib_version: - "2.17" diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml index f09d3dc3c25..ba5e96fb6cf 100644 --- a/conda/recipes/libcudf/conda_build_config.yaml +++ b/conda/recipes/libcudf/conda_build_config.yaml @@ -10,6 +10,9 @@ cuda_compiler: cuda11_compiler: - nvcc +c_stdlib: + - sysroot + c_stdlib_version: - "2.17"