Skip to content

Commit e6ca130

Browse files
dantegddantegd
authored
Rename raft-ann-bench to cuvs-bench and update to use the current cuvs-bench package (#715)
PR renames the `raft-ann-bench` to `cuvs-bench` and updates the run scripts so that we use the cuVS bench package as opposed to RAFT, alongside small updates needed in the calls. Closes #660 Authors: - Dante Gama Dessavre (https://github.com/dantegd) - Bradley Dice (https://github.com/bdice) - Ray Douglass (https://github.com/raydouglass) Approvers: - Divye Gala (https://github.com/divyegala) - Bradley Dice (https://github.com/bdice) - Ray Douglass (https://github.com/raydouglass) URL: #715
1 parent 1f89af5 commit e6ca130

13 files changed

Lines changed: 208 additions & 213 deletions

File tree

‎.github/workflows/build-image.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ on:
3030
NOTEBOOKS_TAG:
3131
required: true
3232
type: string
33-
RAFT_ANN_BENCH_TAG:
33+
CUVS_BENCH_TAG:
3434
required: true
3535
type: string
36-
RAFT_ANN_BENCH_DATASETS_TAG:
36+
CUVS_BENCH_DATASETS_TAG:
3737
required: true
3838
type: string
39-
RAFT_ANN_BENCH_CPU_TAG:
39+
CUVS_BENCH_CPU_TAG:
4040
required: true
4141
type: string
42-
BUILD_RAFT_ANN_BENCH_CPU_IMAGE:
42+
BUILD_CUVS_BENCH_CPU_IMAGE:
4343
required: true
4444
type: boolean
4545

@@ -120,46 +120,46 @@ jobs:
120120
PYTHON_VER=${{ inputs.PYTHON_VER }}
121121
RAPIDS_VER=${{ inputs.RAPIDS_VER }}
122122
tags: ${{ inputs.NOTEBOOKS_TAG }}-${{ matrix.ARCH }}
123-
- name: Build RAFT ANN Benchmarks GPU image
123+
- name: Build cuVS Benchmarks GPU image
124124
uses: docker/build-push-action@v6
125125
with:
126126
context: context
127-
file: raft-ann-bench/gpu/Dockerfile
128-
target: raft-ann-bench
127+
file: cuvs-bench/gpu/Dockerfile
128+
target: cuvs-bench
129129
push: true
130130
pull: true
131131
build-args: |
132132
CUDA_VER=${{ inputs.CUDA_VER }}
133133
LINUX_VER=${{ inputs.LINUX_VER }}
134134
PYTHON_VER=${{ inputs.PYTHON_VER }}
135135
RAPIDS_VER=${{ inputs.RAPIDS_VER }}
136-
tags: ${{ inputs.RAFT_ANN_BENCH_TAG }}-${{ matrix.ARCH }}
137-
- name: Build RAFT ANN Benchmarks GPU with datasets image
136+
tags: ${{ inputs.CUVS_BENCH_TAG }}-${{ matrix.ARCH }}
137+
- name: Build cuVS Benchmarks GPU with datasets image
138138
uses: docker/build-push-action@v6
139139
with:
140140
context: context
141-
file: raft-ann-bench/gpu/Dockerfile
142-
target: raft-ann-bench-datasets
141+
file: cuvs-bench/gpu/Dockerfile
142+
target: cuvs-bench-datasets
143143
push: true
144144
pull: true
145145
build-args: |
146146
CUDA_VER=${{ inputs.CUDA_VER }}
147147
LINUX_VER=${{ inputs.LINUX_VER }}
148148
PYTHON_VER=${{ inputs.PYTHON_VER }}
149149
RAPIDS_VER=${{ inputs.RAPIDS_VER }}
150-
tags: ${{ inputs.RAFT_ANN_BENCH_DATASETS_TAG }}-${{ matrix.ARCH }}
151-
- name: Build RAFT ANN Benchmarks CPU image
152-
if: inputs.BUILD_RAFT_ANN_BENCH_CPU_IMAGE
150+
tags: ${{ inputs.CUVS_BENCH_DATASETS_TAG }}-${{ matrix.ARCH }}
151+
- name: Build cuVS Benchmarks CPU image
152+
if: inputs.BUILD_CUVS_BENCH_CPU_IMAGE
153153
uses: docker/build-push-action@v6
154154
with:
155155
context: context
156-
file: raft-ann-bench/cpu/Dockerfile
157-
target: raft-ann-bench-cpu
156+
file: cuvs-bench/cpu/Dockerfile
157+
target: cuvs-bench-cpu
158158
push: true
159159
pull: true
160160
build-args: |
161161
CUDA_VER=${{ inputs.CUDA_VER }}
162162
LINUX_VER=${{ inputs.LINUX_VER }}
163163
PYTHON_VER=${{ inputs.PYTHON_VER }}
164164
RAPIDS_VER=${{ inputs.RAPIDS_VER }}
165-
tags: ${{ inputs.RAFT_ANN_BENCH_CPU_TAG }}-${{ matrix.ARCH }}
165+
tags: ${{ inputs.CUVS_BENCH_CPU_TAG }}-${{ matrix.ARCH }}

‎.github/workflows/build-test-publish-images.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ jobs:
5757
outputs:
5858
BASE_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.BASE_IMAGE_REPO }}
5959
NOTEBOOKS_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.NOTEBOOKS_IMAGE_REPO }}
60-
RAFT_ANN_BENCH_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.RAFT_ANN_BENCH_IMAGE_REPO }}
61-
RAFT_ANN_BENCH_DATASETS_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.RAFT_ANN_BENCH_DATASETS_IMAGE_REPO }}
62-
RAFT_ANN_BENCH_CPU_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.RAFT_ANN_BENCH_CPU_IMAGE_REPO }}
60+
CUVS_BENCH_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.CUVS_BENCH_IMAGE_REPO }}
61+
CUVS_BENCH_DATASETS_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.CUVS_BENCH_DATASETS_IMAGE_REPO }}
62+
CUVS_BENCH_CPU_IMAGE_REPO: ${{ steps.compute-image-repo.outputs.CUVS_BENCH_CPU_IMAGE_REPO }}
6363
MATRIX: ${{ steps.compute-matrix.outputs.MATRIX }}
6464
TEST_MATRIX: ${{ steps.compute-test-matrix.outputs.TEST_MATRIX }}
6565
BASE_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.BASE_TAG_PREFIX }}
6666
NOTEBOOKS_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.NOTEBOOKS_TAG_PREFIX }}
67-
RAFT_ANN_BENCH_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.RAFT_ANN_BENCH_TAG_PREFIX }}
68-
RAFT_ANN_BENCH_DATASETS_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.RAFT_ANN_BENCH_DATASETS_TAG_PREFIX }}
69-
RAFT_ANN_BENCH_CPU_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.RAFT_ANN_BENCH_CPU_TAG_PREFIX }}
67+
CUVS_BENCH_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.CUVS_BENCH_TAG_PREFIX }}
68+
CUVS_BENCH_DATASETS_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.CUVS_BENCH_DATASETS_TAG_PREFIX }}
69+
CUVS_BENCH_CPU_TAG_PREFIX: ${{ steps.compute-tag-prefix.outputs.CUVS_BENCH_CPU_TAG_PREFIX }}
7070
RAPIDS_VER: ${{ steps.compute-rapids-ver.outputs.RAPIDS_VER }}
7171
ALPHA_TAG: ${{ steps.compute-rapids-ver.outputs.ALPHA_TAG }}
7272
steps:
@@ -87,35 +87,35 @@ jobs:
8787
pr_num="${GITHUB_REF_NAME##*/}"
8888
BASE_TAG_PREFIX="docker-${pr_num}-"
8989
NOTEBOOKS_TAG_PREFIX="docker-notebooks-${pr_num}-"
90-
RAFT_ANN_BENCH_TAG_PREFIX="docker-raft-ann-bench-${pr_num}-"
91-
RAFT_ANN_BENCH_DATASETS_TAG_PREFIX="docker-raft-ann-bench-datasets-${pr_num}-"
92-
RAFT_ANN_BENCH_CPU_TAG_PREFIX="docker-raft-ann-bench-cpu-${pr_num}-"
90+
CUVS_BENCH_TAG_PREFIX="docker-cuvs-bench-${pr_num}-"
91+
CUVS_BENCH_DATASETS_TAG_PREFIX="docker-cuvs-bench-datasets-${pr_num}-"
92+
CUVS_BENCH_CPU_TAG_PREFIX="docker-cuvs-bench-cpu-${pr_num}-"
9393
fi
9494
echo "BASE_TAG_PREFIX=${BASE_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
9595
echo "NOTEBOOKS_TAG_PREFIX=${NOTEBOOKS_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
96-
echo "RAFT_ANN_BENCH_TAG_PREFIX=${RAFT_ANN_BENCH_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
97-
echo "RAFT_ANN_BENCH_DATASETS_TAG_PREFIX=${RAFT_ANN_BENCH_DATASETS_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
98-
echo "RAFT_ANN_BENCH_CPU_TAG_PREFIX=${RAFT_ANN_BENCH_CPU_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
96+
echo "CUVS_BENCH_TAG_PREFIX=${CUVS_BENCH_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
97+
echo "CUVS_BENCH_DATASETS_TAG_PREFIX=${CUVS_BENCH_DATASETS_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
98+
echo "CUVS_BENCH_CPU_TAG_PREFIX=${CUVS_BENCH_CPU_TAG_PREFIX}" | tee -a ${GITHUB_OUTPUT}
9999
- name: Compute image repo
100100
id: compute-image-repo
101101
run: |
102102
base_repo="base"
103103
notebooks_repo="notebooks"
104-
raft_ann_bench_repo="raft-ann-bench"
105-
raft_ann_bench_datasets_repo="raft-ann-bench-datasets"
106-
raft_ann_bench_cpu_repo="raft-ann-bench-cpu"
104+
cuvs_bench_repo="cuvs-bench"
105+
cuvs_bench_datasets_repo="cuvs-bench-datasets"
106+
cuvs_bench_cpu_repo="cuvs-bench-cpu"
107107
if [ "${{ inputs.build_type }}" = "pull-request" ]; then
108108
base_repo="staging"
109109
notebooks_repo="staging"
110-
raft_ann_bench_repo="staging"
111-
raft_ann_bench_datasets_repo="staging"
112-
raft_ann_bench_cpu_repo="staging"
110+
cuvs_bench_repo="staging"
111+
cuvs_bench_datasets_repo="staging"
112+
cuvs_bench_cpu_repo="staging"
113113
fi
114114
echo "BASE_IMAGE_REPO=${base_repo}" | tee -a ${GITHUB_OUTPUT}
115115
echo "NOTEBOOKS_IMAGE_REPO=${notebooks_repo}" | tee -a ${GITHUB_OUTPUT}
116-
echo "RAFT_ANN_BENCH_IMAGE_REPO=${raft_ann_bench_repo}" | tee -a ${GITHUB_OUTPUT}
117-
echo "RAFT_ANN_BENCH_DATASETS_IMAGE_REPO=${raft_ann_bench_datasets_repo}" | tee -a ${GITHUB_OUTPUT}
118-
echo "RAFT_ANN_BENCH_CPU_IMAGE_REPO=${raft_ann_bench_cpu_repo}" | tee -a ${GITHUB_OUTPUT}
116+
echo "CUVS_BENCH_IMAGE_REPO=${cuvs_bench_repo}" | tee -a ${GITHUB_OUTPUT}
117+
echo "CUVS_BENCH_DATASETS_IMAGE_REPO=${cuvs_bench_datasets_repo}" | tee -a ${GITHUB_OUTPUT}
118+
echo "CUVS_BENCH_CPU_IMAGE_REPO=${cuvs_bench_cpu_repo}" | tee -a ${GITHUB_OUTPUT}
119119
- name: Compute RAPIDS_VER
120120
id: compute-rapids-ver
121121
run: |
@@ -152,7 +152,7 @@ jobs:
152152
LINUX_VER: ${{ matrix.LINUX_VER }}
153153
PYTHON_VER: ${{ matrix.PYTHON_VER }}
154154
RAPIDS_VER: ${{ needs.compute-matrix.outputs.RAPIDS_VER }}
155-
BUILD_RAFT_ANN_BENCH_CPU_IMAGE: ${{ matrix.BUILD_RAFT_ANN_BENCH_CPU_IMAGE }}
155+
BUILD_CUVS_BENCH_CPU_IMAGE: ${{ matrix.BUILD_CUVS_BENCH_CPU_IMAGE }}
156156
BASE_TAG:
157157
"rapidsai/${{ needs.compute-matrix.outputs.BASE_IMAGE_REPO }}:\
158158
${{ needs.compute-matrix.outputs.BASE_TAG_PREFIX }}\
@@ -167,23 +167,23 @@ jobs:
167167
${{ needs.compute-matrix.outputs.ALPHA_TAG }}-\
168168
cuda${{ matrix.CUDA_TAG }}-\
169169
py${{ matrix.PYTHON_VER }}"
170-
RAFT_ANN_BENCH_TAG:
171-
"rapidsai/${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_IMAGE_REPO }}:\
172-
${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_TAG_PREFIX }}\
170+
CUVS_BENCH_TAG:
171+
"rapidsai/${{ needs.compute-matrix.outputs.CUVS_BENCH_IMAGE_REPO }}:\
172+
${{ needs.compute-matrix.outputs.CUVS_BENCH_TAG_PREFIX }}\
173173
${{ needs.compute-matrix.outputs.RAPIDS_VER }}\
174174
${{ needs.compute-matrix.outputs.ALPHA_TAG }}-\
175175
cuda${{ matrix.CUDA_TAG }}-\
176176
py${{ matrix.PYTHON_VER }}"
177-
RAFT_ANN_BENCH_DATASETS_TAG:
178-
"rapidsai/${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_DATASETS_IMAGE_REPO }}:\
179-
${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_DATASETS_TAG_PREFIX }}\
177+
CUVS_BENCH_DATASETS_TAG:
178+
"rapidsai/${{ needs.compute-matrix.outputs.CUVS_BENCH_DATASETS_IMAGE_REPO }}:\
179+
${{ needs.compute-matrix.outputs.CUVS_BENCH_DATASETS_TAG_PREFIX }}\
180180
${{ needs.compute-matrix.outputs.RAPIDS_VER }}\
181181
${{ needs.compute-matrix.outputs.ALPHA_TAG }}-\
182182
cuda${{ matrix.CUDA_TAG }}-\
183183
py${{ matrix.PYTHON_VER }}"
184-
RAFT_ANN_BENCH_CPU_TAG:
185-
"rapidsai/${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_CPU_IMAGE_REPO }}:\
186-
${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_CPU_TAG_PREFIX }}\
184+
CUVS_BENCH_CPU_TAG:
185+
"rapidsai/${{ needs.compute-matrix.outputs.CUVS_BENCH_CPU_IMAGE_REPO }}:\
186+
${{ needs.compute-matrix.outputs.CUVS_BENCH_CPU_TAG_PREFIX }}\
187187
${{ needs.compute-matrix.outputs.RAPIDS_VER }}\
188188
${{ needs.compute-matrix.outputs.ALPHA_TAG }}-\
189189
py${{ matrix.PYTHON_VER }}"
@@ -206,7 +206,7 @@ jobs:
206206
- name: Create multiarch manifest
207207
shell: bash
208208
env:
209-
RAFT_ANN_BENCH_CPU_IMAGE_BUILT: ${{ matrix.BUILD_RAFT_ANN_BENCH_CPU_IMAGE }}
209+
CUVS_BENCH_CPU_IMAGE_BUILT: ${{ matrix.BUILD_CUVS_BENCH_CPU_IMAGE }}
210210
BASE_IMAGE_REPO: ${{ needs.compute-matrix.outputs.BASE_IMAGE_REPO }}
211211
BASE_TAG_PREFIX: ${{ needs.compute-matrix.outputs.BASE_TAG_PREFIX }}
212212
RAPIDS_VER: ${{ needs.compute-matrix.outputs.RAPIDS_VER }}
@@ -215,12 +215,12 @@ jobs:
215215
PYTHON_VER: ${{ matrix.PYTHON_VER }}
216216
NOTEBOOKS_IMAGE_REPO: ${{ needs.compute-matrix.outputs.NOTEBOOKS_IMAGE_REPO }}
217217
NOTEBOOKS_TAG_PREFIX: ${{ needs.compute-matrix.outputs.NOTEBOOKS_TAG_PREFIX }}
218-
RAFT_ANN_BENCH_IMAGE_REPO: ${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_IMAGE_REPO }}
219-
RAFT_ANN_BENCH_TAG_PREFIX: ${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_TAG_PREFIX }}
220-
RAFT_ANN_BENCH_DATASETS_IMAGE_REPO: ${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_DATASETS_IMAGE_REPO }}
221-
RAFT_ANN_BENCH_DATASETS_TAG_PREFIX: ${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_DATASETS_TAG_PREFIX }}
222-
RAFT_ANN_BENCH_CPU_IMAGE_REPO: ${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_CPU_IMAGE_REPO }}
223-
RAFT_ANN_BENCH_CPU_TAG_PREFIX: ${{ needs.compute-matrix.outputs.RAFT_ANN_BENCH_CPU_TAG_PREFIX }}
218+
CUVS_BENCH_IMAGE_REPO: ${{ needs.compute-matrix.outputs.CUVS_BENCH_IMAGE_REPO }}
219+
CUVS_BENCH_TAG_PREFIX: ${{ needs.compute-matrix.outputs.CUVS_BENCH_TAG_PREFIX }}
220+
CUVS_BENCH_DATASETS_IMAGE_REPO: ${{ needs.compute-matrix.outputs.CUVS_BENCH_DATASETS_IMAGE_REPO }}
221+
CUVS_BENCH_DATASETS_TAG_PREFIX: ${{ needs.compute-matrix.outputs.CUVS_BENCH_DATASETS_TAG_PREFIX }}
222+
CUVS_BENCH_CPU_IMAGE_REPO: ${{ needs.compute-matrix.outputs.CUVS_BENCH_CPU_IMAGE_REPO }}
223+
CUVS_BENCH_CPU_TAG_PREFIX: ${{ needs.compute-matrix.outputs.CUVS_BENCH_CPU_TAG_PREFIX }}
224224
GPUCIBOT_DOCKERHUB_USER: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
225225
GPUCIBOT_DOCKERHUB_TOKEN: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
226226
ARCHES: ${{ toJSON(matrix.ARCHES) }}

‎ci/compute-matrix.jq‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def compute_cuda_tag($x):
2121
def latest_cuda_version($cuda_versions):
2222
$cuda_versions | max_by(. | split(".") | map(tonumber));
2323

24-
def compute_build_raft_ann_bench_cpu_image($x; $latest_cuda_version):
25-
$x + {BUILD_RAFT_ANN_BENCH_CPU_IMAGE: ($x.CUDA_VER == $latest_cuda_version)}; # we don't need to build CPU packages for different CUDA versions
24+
def compute_build_cuvs_bench_cpu_image($x; $latest_cuda_version):
25+
$x + {BUILD_CUVS_BENCH_CPU_IMAGE: ($x.CUDA_VER == $latest_cuda_version)}; # we don't need to build CPU packages for different CUDA versions
2626

2727
# Checks the current entry to see if it matches the given exclude
2828
def matches($entry; $exclude):
@@ -48,7 +48,7 @@ def compute_matrix($input):
4848
lists2dict($matrix_keys; .) |
4949
compute_ubuntu_version(.) |
5050
compute_cuda_tag(.) |
51-
compute_build_raft_ann_bench_cpu_image(.; $latest_cuda_version) |
51+
compute_build_cuvs_bench_cpu_image(.; $latest_cuda_version) |
5252
filter_excludes(.; $excludes) |
5353
compute_arch(.)
5454
] |

‎ci/create-multiarch-manifest.sh‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ org="rapidsai"
1616
# Initialize arrays to store source tags for each image
1717
base_source_tags=()
1818
notebooks_source_tags=()
19-
raft_ann_bench_source_tags=()
20-
raft_ann_bench_datasets_source_tags=()
21-
raft_ann_bench_cpu_source_tags=()
19+
cuvs_bench_source_tags=()
20+
cuvs_bench_datasets_source_tags=()
21+
cuvs_bench_cpu_source_tags=()
2222

2323
# Define tag arrays for different images
2424
base_tag="${BASE_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-cuda${CUDA_TAG}-py${PYTHON_VER}"
2525
notebooks_tag="${NOTEBOOKS_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-cuda${CUDA_TAG}-py${PYTHON_VER}"
26-
raft_ann_bench_tag="${RAFT_ANN_BENCH_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-cuda${CUDA_TAG}-py${PYTHON_VER}"
27-
raft_ann_bench_datasets_tag="${RAFT_ANN_BENCH_DATASETS_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-cuda${CUDA_TAG}-py${PYTHON_VER}"
28-
raft_ann_bench_cpu_tag="${RAFT_ANN_BENCH_CPU_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-py${PYTHON_VER}"
26+
cuvs_bench_tag="${CUVS_BENCH_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-cuda${CUDA_TAG}-py${PYTHON_VER}"
27+
cuvs_bench_datasets_tag="${CUVS_BENCH_DATASETS_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-cuda${CUDA_TAG}-py${PYTHON_VER}"
28+
cuvs_bench_cpu_tag="${CUVS_BENCH_CPU_TAG_PREFIX}${RAPIDS_VER}${ALPHA_TAG}-py${PYTHON_VER}"
2929

3030
# Function to check if a Docker tag exists
3131
check_tag_exists() {
@@ -45,25 +45,25 @@ check_tag_exists() {
4545
for arch in $(echo "${ARCHES}" | jq .[] -r); do
4646
full_base_tag="${base_tag}-${arch}"
4747
full_notebooks_tag="${notebooks_tag}-${arch}"
48-
full_raft_ann_bench_tag="${raft_ann_bench_tag}-${arch}"
49-
full_raft_ann_bench_datasets_tag="${raft_ann_bench_datasets_tag}-${arch}"
50-
full_raft_ann_bench_cpu_tag="${raft_ann_bench_cpu_tag}-${arch}"
48+
full_cuvs_bench_tag="${cuvs_bench_tag}-${arch}"
49+
full_cuvs_bench_datasets_tag="${cuvs_bench_datasets_tag}-${arch}"
50+
full_cuvs_bench_cpu_tag="${cuvs_bench_cpu_tag}-${arch}"
5151

5252
check_tag_exists "$BASE_IMAGE_REPO" "$full_base_tag"
5353
base_source_tags+=("${org}/${BASE_IMAGE_REPO}:$full_base_tag")
5454

5555
check_tag_exists "$NOTEBOOKS_IMAGE_REPO" "$full_notebooks_tag"
5656
notebooks_source_tags+=("${org}/${NOTEBOOKS_IMAGE_REPO}:$full_notebooks_tag")
5757

58-
check_tag_exists "$RAFT_ANN_BENCH_IMAGE_REPO" "$full_raft_ann_bench_tag"
59-
raft_ann_bench_source_tags+=("${org}/${RAFT_ANN_BENCH_IMAGE_REPO}:$full_raft_ann_bench_tag")
58+
check_tag_exists "$CUVS_BENCH_IMAGE_REPO" "$full_cuvs_bench_tag"
59+
cuvs_bench_source_tags+=("${org}/${CUVS_BENCH_IMAGE_REPO}:$full_cuvs_bench_tag")
6060

61-
check_tag_exists "$RAFT_ANN_BENCH_DATASETS_IMAGE_REPO" "$full_raft_ann_bench_datasets_tag"
62-
raft_ann_bench_datasets_source_tags+=("${org}/${RAFT_ANN_BENCH_DATASETS_IMAGE_REPO}:$full_raft_ann_bench_datasets_tag")
61+
check_tag_exists "$CUVS_BENCH_DATASETS_IMAGE_REPO" "$full_cuvs_bench_datasets_tag"
62+
cuvs_bench_datasets_source_tags+=("${org}/${CUVS_BENCH_DATASETS_IMAGE_REPO}:$full_cuvs_bench_datasets_tag")
6363

64-
if [ "$RAFT_ANN_BENCH_CPU_IMAGE_BUILT" = "true" ]; then
65-
check_tag_exists "$RAFT_ANN_BENCH_CPU_IMAGE_REPO" "$full_raft_ann_bench_cpu_tag"
66-
raft_ann_bench_cpu_source_tags+=("${org}/${RAFT_ANN_BENCH_CPU_IMAGE_REPO}:$full_raft_ann_bench_cpu_tag")
64+
if [ "$CUVS_BENCH_CPU_IMAGE_BUILT" = "true" ]; then
65+
check_tag_exists "$CUVS_BENCH_CPU_IMAGE_REPO" "$full_cuvs_bench_cpu_tag"
66+
cuvs_bench_cpu_source_tags+=("${org}/${CUVS_BENCH_CPU_IMAGE_REPO}:$full_cuvs_bench_cpu_tag")
6767
fi
6868
done
6969

@@ -74,13 +74,13 @@ docker manifest push "${org}/${BASE_IMAGE_REPO}:${base_tag}"
7474
docker manifest create "${org}/${NOTEBOOKS_IMAGE_REPO}:${notebooks_tag}" "${notebooks_source_tags[@]}"
7575
docker manifest push "${org}/${NOTEBOOKS_IMAGE_REPO}:${notebooks_tag}"
7676

77-
docker manifest create "${org}/${RAFT_ANN_BENCH_IMAGE_REPO}:${raft_ann_bench_tag}" "${raft_ann_bench_source_tags[@]}"
78-
docker manifest push "${org}/${RAFT_ANN_BENCH_IMAGE_REPO}:${raft_ann_bench_tag}"
77+
docker manifest create "${org}/${CUVS_BENCH_IMAGE_REPO}:${cuvs_bench_tag}" "${cuvs_bench_source_tags[@]}"
78+
docker manifest push "${org}/${CUVS_BENCH_IMAGE_REPO}:${cuvs_bench_tag}"
7979

80-
docker manifest create "${org}/${RAFT_ANN_BENCH_DATASETS_IMAGE_REPO}:${raft_ann_bench_datasets_tag}" "${raft_ann_bench_datasets_source_tags[@]}"
81-
docker manifest push "${org}/${RAFT_ANN_BENCH_DATASETS_IMAGE_REPO}:${raft_ann_bench_datasets_tag}"
80+
docker manifest create "${org}/${CUVS_BENCH_DATASETS_IMAGE_REPO}:${cuvs_bench_datasets_tag}" "${cuvs_bench_datasets_source_tags[@]}"
81+
docker manifest push "${org}/${CUVS_BENCH_DATASETS_IMAGE_REPO}:${cuvs_bench_datasets_tag}"
8282

83-
if [ "$RAFT_ANN_BENCH_CPU_IMAGE_BUILT" = "true" ]; then
84-
docker manifest create "${org}/${RAFT_ANN_BENCH_CPU_IMAGE_REPO}:${raft_ann_bench_cpu_tag}" "${raft_ann_bench_cpu_source_tags[@]}"
85-
docker manifest push "${org}/${RAFT_ANN_BENCH_CPU_IMAGE_REPO}:${raft_ann_bench_cpu_tag}"
83+
if [ "$CUVS_BENCH_CPU_IMAGE_BUILT" = "true" ]; then
84+
docker manifest create "${org}/${CUVS_BENCH_CPU_IMAGE_REPO}:${cuvs_bench_cpu_tag}" "${cuvs_bench_cpu_source_tags[@]}"
85+
docker manifest push "${org}/${CUVS_BENCH_CPU_IMAGE_REPO}:${cuvs_bench_cpu_tag}"
8686
fi

‎ci/release/update-version.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sed_runner "s/v[[:digit:]]\+\.[[:digit:]]\+/v${NEXT_SHORT_TAG}/g" dockerhub-read
4141
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+-cuda/${NEXT_SHORT_TAG}-cuda/g" dockerhub-readme.md
4242
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+a-cuda/${NEXT_SHORT_TAG}a-cuda/g" dockerhub-readme.md
4343

44-
sed_runner "s/v[[:digit:]]\+\.[[:digit:]]\+/v${NEXT_SHORT_TAG}/g" raft-ann-bench/README.md
45-
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+-cuda/${NEXT_SHORT_TAG}-cuda/g" raft-ann-bench/README.md
46-
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+a-py/${NEXT_SHORT_TAG}a-py/g" raft-ann-bench/README.md
47-
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+a-cuda/${NEXT_SHORT_TAG}a-cuda/g" raft-ann-bench/README.md
44+
sed_runner "s/v[[:digit:]]\+\.[[:digit:]]\+/v${NEXT_SHORT_TAG}/g" cuvs-bench/README.md
45+
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+-cuda/${NEXT_SHORT_TAG}-cuda/g" cuvs-bench/README.md
46+
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+a-py/${NEXT_SHORT_TAG}a-py/g" cuvs-bench/README.md
47+
sed_runner "s/[[:digit:]]\+\.[[:digit:]]\+a-cuda/${NEXT_SHORT_TAG}a-cuda/g" cuvs-bench/README.md

0 commit comments

Comments
 (0)