Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ci/build_cpp.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
# Copyright (c) 2022-2025, NVIDIA CORPORATION.

set -euo pipefail

Expand All @@ -19,6 +19,10 @@ sccache --zero-stats
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version)
export RAPIDS_PACKAGE_VERSION

RAPIDS_ARTIFACTS_DIR=${RAPIDS_ARTIFACTS_DIR:-"${PWD}/artifacts"}
mkdir -p "${RAPIDS_ARTIFACTS_DIR}"
export RAPIDS_ARTIFACTS_DIR

# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
source rapids-rattler-channel-string

Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- cython>=3.0.0
- dlpack>=0.8,<1.0
- doxygen>=1.8.20
- gcc_linux-aarch64=13.*
- gcc_linux-aarch64=14.*
- go
- graphviz
- ipython
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- cython>=3.0.0
- dlpack>=0.8,<1.0
- doxygen>=1.8.20
- gcc_linux-64=13.*
- gcc_linux-64=14.*
- go
- graphviz
- ipython
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dlpack>=0.8,<1.0
- gcc_linux-aarch64=13.*
- gcc_linux-aarch64=14.*
- glog>=0.6.0
- h5py>=3.8.0
- libclang==20.1.4
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dlpack>=0.8,<1.0
- gcc_linux-64=13.*
- gcc_linux-64=14.*
- glog>=0.6.0
- h5py>=3.8.0
- libaio
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/go_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cuda-version=12.9
- cxx-compiler
- dlpack>=0.8,<1.0
- gcc_linux-aarch64=13.*
- gcc_linux-aarch64=14.*
- go
- libclang==20.1.4
- libcublas-dev
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/go_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cuda-version=12.9
- cxx-compiler
- dlpack>=0.8,<1.0
- gcc_linux-64=13.*
- gcc_linux-64=14.*
- go
- libclang==20.1.4
- libcublas-dev
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/rust_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-profiler-api
- cuda-version=12.9
- cxx-compiler
- gcc_linux-aarch64=13.*
- gcc_linux-aarch64=14.*
- libclang==20.1.4
- libcublas-dev
- libcurand-dev
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/rust_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- cuda-profiler-api
- cuda-version=12.9
- cxx-compiler
- gcc_linux-64=13.*
- gcc_linux-64=14.*
- libclang==20.1.4
- libcublas-dev
- libcurand-dev
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cuvs-bench-cpu/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
c_compiler_version:
- 13
- 14

cxx_compiler_version:
- 13
- 14

c_stdlib:
- sysroot
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cuvs/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
c_compiler_version:
- 13
- 14

cxx_compiler_version:
- 13
- 14

cuda_compiler:
- cuda-nvcc
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/libcuvs/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
c_compiler_version:
- 13
- 14

cxx_compiler_version:
- 13
- 14

cuda_compiler:
- cuda-nvcc
Expand Down
10 changes: 7 additions & 3 deletions cpp/bench/ann/src/cuvs/cuvs_ann_bench_param_parser.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
* Copyright (c) 2023-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -83,7 +83,9 @@ void parse_build_param(const nlohmann::json& conf,
{
param.n_lists = conf.at("nlist");
if (conf.contains("niter")) { param.kmeans_n_iters = conf.at("niter"); }
if (conf.contains("ratio")) { param.kmeans_trainset_fraction = 1.0 / (double)conf.at("ratio"); }
if (conf.contains("ratio")) {
param.kmeans_trainset_fraction = 1.0 / static_cast<double>(conf.at("ratio"));
}
}

template <typename T, typename IdxT>
Expand All @@ -102,7 +104,9 @@ void parse_build_param(const nlohmann::json& conf,
{
if (conf.contains("nlist")) { param.n_lists = conf.at("nlist"); }
if (conf.contains("niter")) { param.kmeans_n_iters = conf.at("niter"); }
if (conf.contains("ratio")) { param.kmeans_trainset_fraction = 1.0 / (double)conf.at("ratio"); }
if (conf.contains("ratio")) {
param.kmeans_trainset_fraction = 1.0 / static_cast<double>(conf.at("ratio"));
}
if (conf.contains("pq_bits")) { param.pq_bits = conf.at("pq_bits"); }
if (conf.contains("pq_dim")) { param.pq_dim = conf.at("pq_dim"); }
if (conf.contains("codebook_kind")) {
Expand Down
4 changes: 2 additions & 2 deletions cpp/bench/ann/src/faiss/faiss_gpu_benchmark.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
* Copyright (c) 2023-2025, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -132,7 +132,7 @@ void parse_build_param(const nlohmann::json& conf,
ivf_pq_build_p.kmeans_n_iters = ivf_pq_build_conf.at("niter");
}
if (ivf_pq_build_conf.contains("ratio")) {
ivf_pq_build_p.kmeans_trainset_fraction = 1.0 / (double)conf.at("ratio");
ivf_pq_build_p.kmeans_trainset_fraction = 1.0 / static_cast<double>(conf.at("ratio"));
}
if (ivf_pq_build_conf.contains("pq_bits")) {
ivf_pq_build_p.pq_bits = ivf_pq_build_conf.at("pq_bits");
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,13 @@ dependencies:
arch: x86_64
cuda: "12.*"
packages:
- gcc_linux-64=13.*
- gcc_linux-64=14.*
- sysroot_linux-64==2.28
- matrix:
arch: aarch64
cuda: "12.*"
packages:
- gcc_linux-aarch64=13.*
- gcc_linux-aarch64=14.*
- sysroot_linux-aarch64==2.28
- output_types: conda
matrices:
Expand Down