Skip to content

Simplify Velox build changes #90

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

Merged
simoneves merged 6 commits into from
Oct 22, 2025
Merged

Simplify Velox build changes #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c768c8
Revert Dockerfile/YAML changes
simoneves Oct 21, 2025
44dd9ae
Revert changes except for the removal of --pull
simoneves Oct 21, 2025
46b6ec5
Build script
simoneves Oct 21, 2025
7cf8853
Fetch script (untested)
simoneves Oct 21, 2025
c8811c0
Merge branch 'main' into seves/avi/install-velox-centos-adapters-depe…
mattgara Oct 22, 2025
0bc9f3d
Merge branch 'main' into seves/avi/install-velox-centos-adapters-depe…
simoneves Oct 22, 2025
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
7 changes: 2 additions & 5 deletions velox/docker/adapters_build.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM velox-adapters-deps:centos9
FROM ghcr.io/facebookincubator/velox-dev:adapters
Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a direct reversion of the change in #64

Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, it WAS a direct reversion until @mattgara landed #52 in between as well!


# Build-time configuration, these may be overridden in the docker compose yaml,
# environment variables, or via the docker build command
Expand All @@ -18,7 +18,6 @@ ARG SCCACHE_DISABLE_DIST=ON
ENV VELOX_DEPENDENCY_SOURCE=SYSTEM \
GTest_SOURCE=BUNDLED \
cudf_SOURCE=BUNDLED \
simdjson_SOURCE=BUNDLED \
Copy link
Copy Markdown
Contributor

@mattgara mattgara Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if this was a necessary change? Does a recent build still work without this?

Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It worked fine for me without it, both on x86 and ARM.

Copy link
Copy Markdown
Contributor

@karthikeyann karthikeyann Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It worked fine for me without it

faiss_SOURCE=BUNDLED \
CUDA_VERSION=${CUDA_VERSION} \
TREAT_WARNINGS_AS_ERRORS=${TREAT_WARNINGS_AS_ERRORS} \
Expand Down Expand Up @@ -48,8 +47,7 @@ ${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/rapids_logger-build:\
${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/kvikio-build:\
${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/nvcomp_proprietary_binary-src/lib64" \
ENABLE_SCCACHE=${ENABLE_SCCACHE} \
SCCACHE_DISABLE_DIST=${SCCACHE_DISABLE_DIST} \
CCACHE_DIR=/ccache
SCCACHE_DISABLE_DIST=${SCCACHE_DISABLE_DIST}

WORKDIR /workspace/velox

Expand Down Expand Up @@ -94,7 +92,6 @@ COPY velox-testing/velox/docker/sccache/sccache_auth/ /sccache_auth/

# Build in Release mode into ${BUILD_BASE_DIR}
RUN --mount=type=bind,source=velox,target=/workspace/velox,ro \
--mount=type=cache,target=/ccache \
set -euxo pipefail && \
# Configure sccache if enabled
if [ "$ENABLE_SCCACHE" = "ON" ]; then \
Expand Down
13 changes: 0 additions & 13 deletions velox/docker/adapters_deps.dockerfile
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions velox/docker/docker-compose.adapters.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
services:
Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a direct reversion of the change in #64

velox-adapters-deps:
container_name: velox-adapters-deps
image: velox-adapters-deps:centos9
build:
context: ../../..
dockerfile: velox-testing/velox/docker/adapters_deps.dockerfile
velox-adapters-build:
container_name: velox-adapters-build
image: velox-adapters-build:latest
Expand Down
11 changes: 7 additions & 4 deletions velox/scripts/build_centos_deps_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/bash

set -e
container_name="velox-adapters-deps"
compose_file="../docker/docker-compose.adapters.build.yml"
docker compose -f "${compose_file}" up "${container_name}"
docker compose -f "${compose_file}" down "${container_name}"

echo "Building Velox dependencies/run-time container image..."

pushd ../../../velox
docker compose -f docker-compose.yml --progress plain build adapters-cpp
Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This uses Presto's own Docker recipe to build a local version of the base image. This uses our modified CUDA install script and hence the resulting local image will include nvjitlink which the upstream equivalent does not.

Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also just use docker compose build instead of up/down.

popd

echo "Velox dependencies/run-time container image built!"
3 changes: 0 additions & 3 deletions velox/scripts/build_velox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ cleanup_sccache_auth() {

trap cleanup_sccache_auth EXIT SIGTERM SIGINT SIGQUIT


print_help() {
cat <<EOF
Usage: $(basename "$0") [OPTIONS]
Expand Down Expand Up @@ -253,8 +252,6 @@ DOCKER_BUILD_OPTS+=(--build-arg NUM_THREADS="${NUM_THREADS}")
DOCKER_BUILD_OPTS+=(--build-arg VELOX_ENABLE_BENCHMARKS="${VELOX_ENABLE_BENCHMARKS}")
DOCKER_BUILD_OPTS+=(--build-arg TREAT_WARNINGS_AS_ERRORS="${TREAT_WARNINGS_AS_ERRORS}")
DOCKER_BUILD_OPTS+=(--build-arg BUILD_TYPE="${BUILD_TYPE}")
export DOCKER_BUILDKIT=1
export COMPOSE_DOCKER_CLI_BUILD=1

# Create sccache auth directory unconditionally, it is expected by dockerfile
mkdir -p ../docker/sccache/sccache_auth/
Expand Down
2 changes: 1 addition & 1 deletion velox/scripts/fetch_centos_deps_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
source ./config.sh
source ../../scripts/fetch_docker_image_from_s3.sh

IMAGE_NAME="velox-adapters-deps:centos9"
IMAGE_NAME="ghcr.io/facebookincubator/velox-dev:adapters"
Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just change the image name to that of the original base image instead of the intermediate image added by the now-reverted Dockerfile changes.

Copy link
Copy Markdown
Contributor Author

@simoneves simoneves Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x86 and ARM versions of this image are built and ready to copy to S3.


ARCH=$(uname -m)
BUCKET_SUBDIR="velox-docker-images"
Expand Down