From ff60d3a460229e1a6f57e9a3d32f47180bb53e78 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 30 Nov 2023 15:00:35 -0600 Subject: [PATCH] Update to fmt 10.1.1 and spdlog 1.12.0. (#1957) This PR updates to fmt 10.1.1 and spdlog 1.12. Depends on https://github.com/rapidsai/rmm/pull/1374. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Jake Awe (https://github.com/AyodeAwe) - Vyas Ramasubramani (https://github.com/vyasr) --- ci/build_python.sh | 12 ++++++------ conda/recipes/libraft/conda_build_config.yaml | 4 ++-- .../raft-ann-bench-cpu/conda_build_config.yaml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index cf34776542..3e67edd5db 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -15,11 +15,11 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) -export RAPIDS_PACKAGE_VERSION=${version} +export RAPIDS_PACKAGE_VERSION=${version} echo "${version}" > VERSION package_dir="python" -for package_name in pylibraft raft-dask; do +for package_name in pylibraft raft-dask; do underscore_package_name=$(echo "${package_name}" | tr "-" "_") sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${package_name}/${underscore_package_name}/_version.py" done @@ -39,10 +39,10 @@ rapids-conda-retry mambabuild \ # Build ann-bench for each cuda and python version rapids-conda-retry mambabuild \ ---no-test \ ---channel "${CPP_CHANNEL}" \ ---channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ -conda/recipes/raft-ann-bench + --no-test \ + --channel "${CPP_CHANNEL}" \ + --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ + conda/recipes/raft-ann-bench # Build ann-bench-cpu only in CUDA 11 jobs since it only depends on python # version diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml index 25493a34fa..f1229281bb 100644 --- a/conda/recipes/libraft/conda_build_config.yaml +++ b/conda/recipes/libraft/conda_build_config.yaml @@ -73,7 +73,7 @@ cuda11_cuda_profiler_api_run_version: - ">=11.4.240,<12" spdlog_version: - - ">=1.11.0,<1.12" + - ">=1.12.0,<1.13" fmt_version: - - ">=9.1.0,<10" + - ">=10.1.1,<11" diff --git a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml index fda3e4e53d..93a5532962 100644 --- a/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml +++ b/conda/recipes/raft-ann-bench-cpu/conda_build_config.yaml @@ -20,7 +20,7 @@ nlohmann_json_version: - ">=3.11.2" spdlog_version: - - ">=1.11.0,<1.12" + - ">=1.12.0,<1.13" fmt_version: - - ">=9.1.0,<10" + - ">=10.1.1,<11"