This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 6dd3899c34 [GLUTEN-9243][VL] Fix cuda docker image (#9333)
6dd3899c34 is described below
commit 6dd3899c34de878dfc6d61f7d72c886e95171c16
Author: Yuan <[email protected]>
AuthorDate: Fri Apr 18 16:02:15 2025 +0100
[GLUTEN-9243][VL] Fix cuda docker image (#9333)
---
.github/workflows/docker_image.yml | 73 +++++++++++++-------------------------
dev/docker/cudf/Dockerfile | 2 +-
ep/build-velox/src/build_velox.sh | 3 +-
3 files changed, 27 insertions(+), 51 deletions(-)
diff --git a/.github/workflows/docker_image.yml
b/.github/workflows/docker_image.yml
index 4e94e73e9d..3403ab762d 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -60,23 +60,13 @@ jobs:
push: true
tags: ${{ env.DOCKERHUB_REPO }}:vcpkg-centos-7
- build-vcpkg-centos-8:
+ build-centos-9-jdk8-cudf:
if: ${{ startsWith(github.repository, 'apache/') }}
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- os: [ ubuntu-latest, ubuntu-24.04-arm ]
+ runs-on: ubuntu-latest
steps:
- name: Checkout repository
- uses: actions/checkout@v2
-
- - name: Docker meta
- id: meta
- uses: docker/metadata-action@v5
- with:
- images: ${{ env.DOCKERHUB_REPO }}
- tags: vcpkg-centos-8
+ uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -87,30 +77,15 @@ jobs:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Build and push by digest
- id: build
+ - name: Build and push Docker image
uses: docker/build-push-action@v6
with:
context: .
- file: dev/docker/Dockerfile.centos8-static-build
- labels: ${{ steps.meta.outputs.labels }}
- outputs: type=image,"name=${{ env.DOCKERHUB_REPO
}}",push-by-digest=true,push=true
-
- - name: Export digest
- run: |
- mkdir -p ${{ runner.temp }}/digests
- digest="${{ steps.build.outputs.digest }}"
- touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
- - name: Upload digest
- uses: actions/upload-artifact@v4
- with:
- name: digests-vcpkg-centos-8-${{ matrix.os }}
- path: ${{ runner.temp }}/digests/*
- if-no-files-found: error
- retention-days: 1
+ file: dev/docker/cudf/Dockerfile
+ push: true
+ tags: ${{ env.DOCKERHUB_REPO }}:centos-9-jdk8-cudf
- build-centos-8-jdk8:
+ build-vcpkg-centos-8:
if: ${{ startsWith(github.repository, 'apache/') }}
runs-on: ${{ matrix.os }}
strategy:
@@ -126,7 +101,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKERHUB_REPO }}
- tags: centos-8-jdk8
+ tags: vcpkg-centos-8
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -142,7 +117,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
- file: dev/docker/Dockerfile.centos8-dynamic-build
+ file: dev/docker/Dockerfile.centos8-static-build
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,"name=${{ env.DOCKERHUB_REPO
}}",push-by-digest=true,push=true
@@ -155,12 +130,12 @@ jobs:
- name: Upload digest
uses: actions/upload-artifact@v4
with:
- name: digests-centos-8-jdk8-${{ matrix.os }}
+ name: digests-vcpkg-centos-8-${{ matrix.os }}
path: ${{ runner.temp }}/digests/*
if-no-files-found: error
retention-days: 1
- build-centos-8-jdk11:
+ build-centos-8-jdk8:
if: ${{ startsWith(github.repository, 'apache/') }}
runs-on: ${{ matrix.os }}
strategy:
@@ -176,7 +151,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKERHUB_REPO }}
- tags: centos-8-jdk11
+ tags: centos-8-jdk8
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -192,7 +167,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
- file: dev/docker/Dockerfile.centos8-dynamic-build-jdk11
+ file: dev/docker/Dockerfile.centos8-dynamic-build
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,"name=${{ env.DOCKERHUB_REPO
}}",push-by-digest=true,push=true
@@ -205,12 +180,12 @@ jobs:
- name: Upload digest
uses: actions/upload-artifact@v4
with:
- name: digests-centos-8-jdk11-${{ matrix.os }}
+ name: digests-centos-8-jdk8-${{ matrix.os }}
path: ${{ runner.temp }}/digests/*
if-no-files-found: error
retention-days: 1
- build-centos-8-jdk17:
+ build-centos-8-jdk11:
if: ${{ startsWith(github.repository, 'apache/') }}
runs-on: ${{ matrix.os }}
strategy:
@@ -226,7 +201,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKERHUB_REPO }}
- tags: centos-8-jdk17
+ tags: centos-8-jdk11
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -242,7 +217,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
- file: dev/docker/Dockerfile.centos8-dynamic-build-jdk17
+ file: dev/docker/Dockerfile.centos8-dynamic-build-jdk11
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,"name=${{ env.DOCKERHUB_REPO
}}",push-by-digest=true,push=true
@@ -255,12 +230,12 @@ jobs:
- name: Upload digest
uses: actions/upload-artifact@v4
with:
- name: digests-centos-8-jdk17-${{ matrix.os }}
+ name: digests-centos-8-jdk11-${{ matrix.os }}
path: ${{ runner.temp }}/digests/*
if-no-files-found: error
retention-days: 1
- build-centos-9-jdk8-cudf:
+ build-centos-8-jdk17:
if: ${{ startsWith(github.repository, 'apache/') }}
runs-on: ${{ matrix.os }}
strategy:
@@ -276,7 +251,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKERHUB_REPO }}
- tags: centos-9-jdk8-cudf
+ tags: centos-8-jdk17
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -292,7 +267,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
- file: dev/docker/cudf/Dockerfile
+ file: dev/docker/Dockerfile.centos8-dynamic-build-jdk17
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,"name=${{ env.DOCKERHUB_REPO
}}",push-by-digest=true,push=true
@@ -305,7 +280,7 @@ jobs:
- name: Upload digest
uses: actions/upload-artifact@v4
with:
- name: digests-centos-9-jdk8-cudf-${{ matrix.os }}
+ name: digests-centos-8-jdk17-${{ matrix.os }}
path: ${{ runner.temp }}/digests/*
if-no-files-found: error
retention-days: 1
@@ -315,7 +290,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- digests: [ vcpkg-centos-8, centos-8-jdk8, centos-8-jdk11,
centos-8-jdk17, centos-9-jdk8-cudf ]
+ digests: [ vcpkg-centos-8, centos-8-jdk8, centos-8-jdk11,
centos-8-jdk17 ]
needs:
- build-vcpkg-centos-8
- build-centos-8-jdk8
diff --git a/dev/docker/cudf/Dockerfile b/dev/docker/cudf/Dockerfile
index e29fc41ad5..6e77b049af 100644
--- a/dev/docker/cudf/Dockerfile
+++ b/dev/docker/cudf/Dockerfile
@@ -1,7 +1,7 @@
FROM ghcr.io/facebookincubator/velox-dev:adapters
RUN yum install -y sudo patch maven perl
# After the base docker image updated, don't need to install cmake
-RUN pip install cmake==3.30.4 && ln -s /usr/local/bin/cmake /usr/bin
+RUN pip install cmake==3.30.4 && ln -sf /usr/local/bin/cmake /usr/bin
RUN git clone -b cudf --depth=1 https://github.com/apache/incubator-gluten
/opt/gluten
diff --git a/ep/build-velox/src/build_velox.sh
b/ep/build-velox/src/build_velox.sh
index c79cfc2c1a..9239156ced 100755
--- a/ep/build-velox/src/build_velox.sh
+++ b/ep/build-velox/src/build_velox.sh
@@ -128,7 +128,8 @@ function compile {
COMPILE_OPTION="$COMPILE_OPTION -DVELOX_ENABLE_BENCHMARKS=ON"
fi
if [ $ENABLE_GPU == "ON" ]; then
- COMPILE_OPTION="$COMPILE_OPTION -DVELOX_ENABLE_GPU=ON
-DVELOX_ENABLE_CUDF=ON"
+ # the cuda default options are for Centos9 image from Meta
+ COMPILE_OPTION="$COMPILE_OPTION -DVELOX_ENABLE_GPU=ON
-DVELOX_ENABLE_CUDF=ON -DCMAKE_CUDA_ARCHITECTURES=70
-DCMAKE_CUDA_COMPILER=/usr/local/cuda-12.8/bin/nvcc"
fi
if [ -n "${GLUTEN_VCPKG_ENABLED:-}" ]; then
COMPILE_OPTION="$COMPILE_OPTION -DVELOX_GFLAGS_TYPE=static"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
