Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/branch-23.12' into branch-24.0…
Browse files Browse the repository at this point in the history
…2-merge-23.12
  • Loading branch information
raydouglass committed Dec 11, 2023
2 parents d7d46c0 + f986ac6 commit f6beaf3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG PYTHON_VER=3.10
ARG LINUX_VER=ubuntu22.04

ARG RAPIDS_VER=24.02
ARG DASK_SQL_VER=2023.10.0
ARG DASK_SQL_VER=2023.11.0

# Gather dependency information
FROM rapidsai/ci-conda:latest AS dependencies
Expand Down Expand Up @@ -35,6 +35,8 @@ ARG PYTHON_VER
ARG RAPIDS_VER
ARG DASK_SQL_VER

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

RUN useradd -rm -d /home/rapids -s /bin/bash -g conda -u 1001 rapids

USER rapids
Expand Down Expand Up @@ -63,6 +65,8 @@ CMD ["ipython"]
# Notebooks image
FROM base as notebooks

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

USER rapids

WORKDIR /home/rapids
Expand Down
2 changes: 1 addition & 1 deletion matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ PYTHON_VER:
- "3.9"
- "3.10"
DASK_SQL_VER:
- "2023.10.0"
- "2023.11.0"
2 changes: 2 additions & 0 deletions raft-ann-bench/cpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ ENTRYPOINT ["/bin/bash", "/data/scripts/run_benchmark.sh"]

FROM bench-base as raft-ann-bench-cpu-datasets

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

COPY raft-ann-bench/get_datasets.sh /home/rapids/raftannbench/get_datasets.sh

COPY raft-ann-bench/run_benchmark.sh /data/scripts/run_benchmark_preloaded_datasets.sh
Expand Down
2 changes: 2 additions & 0 deletions raft-ann-bench/gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ ENTRYPOINT ["/bin/bash", "/data/scripts/run_benchmark.sh"]

FROM raft-ann-bench as raft-ann-bench-datasets

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

COPY raft-ann-bench/get_datasets.sh /home/rapids/raftannbench/get_datasets.sh

COPY raft-ann-bench/run_benchmarks_preloaded_datasets.sh /data/scripts/run_benchmarks_preloaded_datasets.sh
Expand Down

0 comments on commit f6beaf3

Please sign in to comment.