Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-23.12 to branch-24.02 #619

Closed
wants to merge 2 commits into from
Closed

Forward-merge branch-23.12 to branch-24.02 #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b72a5
Update dask-sql to 2023.11.0 (#617)
raydouglass Dec 7, 2023
f986ac6
Add SHELL instruction for every stage (#618)
raydouglass Dec 7, 2023
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 Dockerfile
View file
Open in desktop
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=23.12
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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