From 8c768c82ce92ee7ecb22e6b07ad1af3c211d1b16 Mon Sep 17 00:00:00 2001 From: Simon Eves Date: Tue, 21 Oct 2025 15:07:37 -0700 Subject: [PATCH 1/4] Revert Dockerfile/YAML changes --- velox/docker/adapters_build.dockerfile | 15 ++++++--------- velox/docker/adapters_deps.dockerfile | 13 ------------- velox/docker/docker-compose.adapters.build.yml | 6 ------ 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 velox/docker/adapters_deps.dockerfile diff --git a/velox/docker/adapters_build.dockerfile b/velox/docker/adapters_build.dockerfile index 945b3ae9..62ccf66c 100644 --- a/velox/docker/adapters_build.dockerfile +++ b/velox/docker/adapters_build.dockerfile @@ -1,4 +1,4 @@ -FROM velox-adapters-deps:centos9 +FROM ghcr.io/facebookincubator/velox-dev:adapters # Build-time configuration, these may be overridden in the docker compose yaml, # environment variables, or via the docker build command @@ -16,7 +16,6 @@ ARG BUILD_TYPE=release ENV VELOX_DEPENDENCY_SOURCE=SYSTEM \ GTest_SOURCE=BUNDLED \ cudf_SOURCE=BUNDLED \ - simdjson_SOURCE=BUNDLED \ faiss_SOURCE=BUNDLED \ CUDA_VERSION=${CUDA_VERSION} \ TREAT_WARNINGS_AS_ERRORS=${TREAT_WARNINGS_AS_ERRORS} \ @@ -40,12 +39,11 @@ ENV VELOX_DEPENDENCY_SOURCE=SYSTEM \ -DVELOX_ENABLE_CUDF=${BUILD_WITH_VELOX_ENABLE_CUDF} \ -DVELOX_ENABLE_FAISS=ON" \ LD_LIBRARY_PATH="${BUILD_BASE_DIR}/${BUILD_TYPE}/lib:\ - ${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/cudf-build:\ - ${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/rmm-build:\ - ${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" \ - CCACHE_DIR=/ccache +${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/cudf-build:\ +${BUILD_BASE_DIR}/${BUILD_TYPE}/_deps/rmm-build:\ +${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" WORKDIR /workspace/velox @@ -70,7 +68,6 @@ RUN if [ "$VELOX_ENABLE_BENCHMARKS" = "ON" ]; then \ # Build using the specified build type and directory RUN --mount=type=bind,source=velox,target=/workspace/velox,ro \ - --mount=type=cache,target=/ccache \ set -euxo pipefail && \ make cmake BUILD_DIR="${BUILD_TYPE}" BUILD_TYPE="${BUILD_TYPE}" EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS[*]}" BUILD_BASE_DIR="${BUILD_BASE_DIR}" && \ make build BUILD_DIR="${BUILD_TYPE}" BUILD_BASE_DIR="${BUILD_BASE_DIR}" diff --git a/velox/docker/adapters_deps.dockerfile b/velox/docker/adapters_deps.dockerfile deleted file mode 100644 index 15542a36..00000000 --- a/velox/docker/adapters_deps.dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ghcr.io/facebookincubator/velox-dev:adapters - -ARG CUDA_VERSION=12.8 - -# Copy and run CentOS adapters setup script -COPY velox/scripts/ /scripts - -RUN set -euxo pipefail && \ - if ! dnf list installed cuda-nvcc-$(echo ${CUDA_VERSION} | tr '.' '-') 1>/dev/null || \ - ! dnf list installed libnvjitlink-devel-$(echo ${CUDA_VERSION} | tr '.' '-') 1>/dev/null; then \ - bash -c "source /scripts/setup-centos-adapters.sh && install_cuda ${CUDA_VERSION}"; \ - fi && \ - pip install cmake==3.30.4 diff --git a/velox/docker/docker-compose.adapters.build.yml b/velox/docker/docker-compose.adapters.build.yml index e251f99d..62c48101 100644 --- a/velox/docker/docker-compose.adapters.build.yml +++ b/velox/docker/docker-compose.adapters.build.yml @@ -1,10 +1,4 @@ services: - 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 From 44dd9ae10ab4893dd31237076a624a9453abed9e Mon Sep 17 00:00:00 2001 From: Simon Eves Date: Tue, 21 Oct 2025 15:08:42 -0700 Subject: [PATCH 2/4] Revert changes except for the removal of --pull That is needed to allow use of a local copy of the base image, per Avi --- velox/scripts/build_velox.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/velox/scripts/build_velox.sh b/velox/scripts/build_velox.sh index 6b08da55..a201d60b 100755 --- a/velox/scripts/build_velox.sh +++ b/velox/scripts/build_velox.sh @@ -28,7 +28,6 @@ LOG_ENABLED=false TREAT_WARNINGS_AS_ERRORS="${TREAT_WARNINGS_AS_ERRORS:-1}" LOGFILE="./build_velox.log" - print_help() { cat < Date: Tue, 21 Oct 2025 15:13:18 -0700 Subject: [PATCH 3/4] Build script --- velox/scripts/build_centos_deps_image.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/velox/scripts/build_centos_deps_image.sh b/velox/scripts/build_centos_deps_image.sh index fbe0632a..7c169c87 100755 --- a/velox/scripts/build_centos_deps_image.sh +++ b/velox/scripts/build_centos_deps_image.sh @@ -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 +popd + echo "Velox dependencies/run-time container image built!" From 7cf88534e258f05a6bd3504bc972fefdd7204915 Mon Sep 17 00:00:00 2001 From: Simon Eves Date: Tue, 21 Oct 2025 15:13:26 -0700 Subject: [PATCH 4/4] Fetch script (untested) --- velox/scripts/fetch_centos_deps_image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/velox/scripts/fetch_centos_deps_image.sh b/velox/scripts/fetch_centos_deps_image.sh index 770c58d7..02a9c9e2 100755 --- a/velox/scripts/fetch_centos_deps_image.sh +++ b/velox/scripts/fetch_centos_deps_image.sh @@ -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" ARCH=$(uname -m) BUCKET_SUBDIR="velox-docker-images"