From a00cca6a7e961cef6f570ac51723dc20d1fbf7f2 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Tue, 7 Jun 2022 20:58:27 -0500 Subject: [PATCH] Fix duplicate `cudatoolkit` pinning issue (#11070) This PR fixes a duplicate `cudatoolkit` pinning issue we are seeing in `cudf` packages: Screen Shot 2022-06-07 at 1 23 35 PM This leads to following conda error: ```bash Encountered problems while solving: - package cudf-22.08.00a220606-cuda_11_py39_g4d7595fb3f_113 requires cudatoolkit >=11.5,<12, but none of the providers can be installed ``` This PR also removes `CC` & `CXX` invocations, since we have switched to conda compilers: https://github.com/rapidsai/gpuci-build-environment/pull/265/ Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Bradley Dice (https://github.com/bdice) - https://github.com/jakirkham - AJ Schmidt (https://github.com/ajschmidt8) URL: https://github.com/rapidsai/cudf/pull/11070 --- ci/benchmark/build.sh | 3 +-- ci/cpu/build.sh | 2 -- ci/docs/build.sh | 5 ++--- ci/gpu/build.sh | 2 -- ci/gpu/java.sh | 3 +-- conda/recipes/cudf/meta.yaml | 2 ++ 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index a588fc6b161..67524f37713 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -92,8 +92,7 @@ pip install "git+https://github.com/python-streamz/streamz.git@master" --upgrade logger "Check versions..." python --version -$CC --version -$CXX --version + conda info conda config --show-sources conda list --show-channel-urls diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 861c569e464..f5ea2c902ef 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -53,8 +53,6 @@ fi gpuci_logger "Check compiler versions" python --version -$CC --version -$CXX --version gpuci_logger "Check conda environment" conda info diff --git a/ci/docs/build.sh b/ci/docs/build.sh index a7771124713..f50bb14d648 100755 --- a/ci/docs/build.sh +++ b/ci/docs/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2022, NVIDIA CORPORATION. ################################# # cuDF Docs build script for CI # ################################# @@ -29,8 +29,7 @@ conda activate rapids gpuci_logger "Check versions..." python --version -$CC --version -$CXX --version + conda info conda config --show-sources conda list --show-channel-urls diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 8b8265075b9..515684db3fc 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -82,8 +82,6 @@ conda list --show-channel-urls gpuci_logger "Check compiler versions" python --version -$CC --version -$CXX --version function install_dask { # Install the conda-forge or nightly version of dask and distributed diff --git a/ci/gpu/java.sh b/ci/gpu/java.sh index 9688c04c7db..c6ee8423ace 100755 --- a/ci/gpu/java.sh +++ b/ci/gpu/java.sh @@ -98,8 +98,7 @@ conda activate rapids gpuci_logger "Check compiler versions" python --version -$CC --version -$CXX --version + gpuci_logger "Check conda environment" conda info diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 83f6a9cb5b1..bcd9b81f966 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -22,6 +22,8 @@ build: # libcudf's run_exports pinning is looser than we would like ignore_run_exports: - libcudf + ignore_run_exports_from: + - {{ compiler('cuda') }} requirements: build: