PHILO-HE commented on code in PR #5120:
URL: https://github.com/apache/incubator-gluten/pull/5120#discussion_r1539159436
##########
.github/workflows/velox_docker.yml:
##########
@@ -84,69 +95,49 @@ jobs:
path: ./cpp/build/releases
- name: Setup java and maven
run: |
- apt-get update && \
- apt-get install -y openjdk-8-jdk maven && \
+ if [ "${{ matrix.java }}" = "java-17" ]; then
+ apt-get update && apt-get install -y openjdk-17-jdk maven
+ else
+ apt-get update && apt-get install -y openjdk-8-jdk maven
+ fi
apt remove openjdk-11* -y
- - name: Build for Spark ${{ matrix.spark }}
- run: |
- cd $GITHUB_WORKSPACE/ && \
- mvn clean install -P${{ matrix.spark }} -Pbackends-velox -DskipTests
- - name: Build and run TPCH/DS ${{ matrix.spark }}
- run: |
- cd $GITHUB_WORKSPACE/tools/gluten-it && \
- mvn clean install -P${{ matrix.spark }} \
- && GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare \
- --local --preset=velox --benchmark-type=h --error-on-memleak
--off-heap-size=10g -s=1.0 --threads=16 --iterations=1 \
- && GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare \
- --local --preset=velox --benchmark-type=ds --error-on-memleak
--off-heap-size=10g -s=1.0 --threads=16 --iterations=1
-
-
- run-tpc-test-centos7:
- needs: build-native-lib
- strategy:
- fail-fast: false
- matrix:
- spark: ["spark-3.2", "spark-3.3", "spark-3.4", "spark-3.5"]
- runs-on: ubuntu-20.04
- container: centos:7
- steps:
- - uses: actions/checkout@v2
- - name: Download All Artifacts
- uses: actions/download-artifact@v2
- with:
- name: velox-native-lib-${{github.sha}}
- path: ./cpp/build/releases
- - name: Setup java and maven
- run: |
- yum update -y && yum install -y java-1.8.0-openjdk-devel wget
- wget
https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
- tar -xvf apache-maven-3.8.8-bin.tar.gz
- mv apache-maven-3.8.8 /usr/lib/maven
- - name: Build for Spark ${{ matrix.spark }}
+ - name: Build and run TPCH/DS
run: |
cd $GITHUB_WORKSPACE/
- export MAVEN_HOME=/usr/lib/maven
- export PATH=${PATH}:${MAVEN_HOME}/bin
- mvn clean install -P${{ matrix.spark }} -Pbackends-velox -DskipTests
- - name: Build and run TPCH/DS ${{ matrix.spark }}
- run: |
- cd $GITHUB_WORKSPACE/tools/gluten-it
- export MAVEN_HOME=/usr/lib/maven
- export PATH=${PATH}:${MAVEN_HOME}/bin
- mvn clean install -P${{ matrix.spark }} \
+ if [ "${{ matrix.java }}" = "java-17" ]; then
+ export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
Review Comment:
Nit:
export JAVA_HOME=/usr/lib/jvm/${{ matrix.java }}-openjdk-amd64
##########
.github/workflows/velox_docker.yml:
##########
@@ -73,6 +73,17 @@ jobs:
matrix:
os: ["ubuntu:20.04", "ubuntu:22.04"]
spark: ["spark-3.2", "spark-3.3", "spark-3.4", "spark-3.5"]
+ java: [ "java-8", "java-17" ]
+ # Spark supports JDK17 since 3.3 and later, see
https://issues.apache.org/jira/browse/SPARK-33772
+ exclude:
Review Comment:
Nit: maybe, better to use `include` for simplicity.
##########
docs/get-started/Velox.md:
##########
@@ -5,28 +5,34 @@ nav_order: 1
parent: Getting-Started
---
# Supported Version
-| Type | Version |
-|-------|------------------------------|
-| Spark | 3.2.2, 3.3.1 |
-| OS | Ubuntu20.04/22.04, Centos7/8 |
-| jdk | openjdk8 |
-| scala | 2.12
-Spark3.4.0 support is still WIP. TPCH/DS can pass, UT is not yet passed.
+| Type | Version |
+|-------|---------------------------------|
+| Spark | 3.2.2, 3.3.1, 3.4.2, 3.5.1(wip) |
+| OS | Ubuntu20.04/22.04, Centos7/8 |
+| jdk | openjdk8/jdk17 |
+| scala | 2.12 |
-There are pending PRs for jdk11 support.
+**JDK17**
Review Comment:
Maybe, better to document this part in a common place, as it is not specific
to Velox backend.
##########
.github/workflows/velox_docker.yml:
##########
@@ -84,69 +95,49 @@ jobs:
path: ./cpp/build/releases
- name: Setup java and maven
run: |
- apt-get update && \
- apt-get install -y openjdk-8-jdk maven && \
+ if [ "${{ matrix.java }}" = "java-17" ]; then
+ apt-get update && apt-get install -y openjdk-17-jdk maven
+ else
+ apt-get update && apt-get install -y openjdk-8-jdk maven
+ fi
apt remove openjdk-11* -y
- - name: Build for Spark ${{ matrix.spark }}
- run: |
- cd $GITHUB_WORKSPACE/ && \
- mvn clean install -P${{ matrix.spark }} -Pbackends-velox -DskipTests
- - name: Build and run TPCH/DS ${{ matrix.spark }}
- run: |
- cd $GITHUB_WORKSPACE/tools/gluten-it && \
- mvn clean install -P${{ matrix.spark }} \
- && GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare \
- --local --preset=velox --benchmark-type=h --error-on-memleak
--off-heap-size=10g -s=1.0 --threads=16 --iterations=1 \
- && GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare \
- --local --preset=velox --benchmark-type=ds --error-on-memleak
--off-heap-size=10g -s=1.0 --threads=16 --iterations=1
-
-
- run-tpc-test-centos7:
- needs: build-native-lib
- strategy:
- fail-fast: false
- matrix:
- spark: ["spark-3.2", "spark-3.3", "spark-3.4", "spark-3.5"]
- runs-on: ubuntu-20.04
- container: centos:7
- steps:
- - uses: actions/checkout@v2
- - name: Download All Artifacts
- uses: actions/download-artifact@v2
- with:
- name: velox-native-lib-${{github.sha}}
- path: ./cpp/build/releases
- - name: Setup java and maven
- run: |
- yum update -y && yum install -y java-1.8.0-openjdk-devel wget
- wget
https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
- tar -xvf apache-maven-3.8.8-bin.tar.gz
- mv apache-maven-3.8.8 /usr/lib/maven
- - name: Build for Spark ${{ matrix.spark }}
+ - name: Build and run TPCH/DS
run: |
cd $GITHUB_WORKSPACE/
- export MAVEN_HOME=/usr/lib/maven
- export PATH=${PATH}:${MAVEN_HOME}/bin
- mvn clean install -P${{ matrix.spark }} -Pbackends-velox -DskipTests
- - name: Build and run TPCH/DS ${{ matrix.spark }}
- run: |
- cd $GITHUB_WORKSPACE/tools/gluten-it
- export MAVEN_HOME=/usr/lib/maven
- export PATH=${PATH}:${MAVEN_HOME}/bin
- mvn clean install -P${{ matrix.spark }} \
+ if [ "${{ matrix.java }}" = "java-17" ]; then
+ export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ else
+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+ fi
+ echo "JAVA_HOME: $JAVA_HOME"
+ mvn clean install -P${{ matrix.spark }} -P${{ matrix.java }}
-Pbackends-velox -DskipTests
+ cd $GITHUB_WORKSPACE/tools/gluten-it
+ mvn clean install -P${{ matrix.spark }} -P${{ matrix.java }} \
&& GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare \
--local --preset=velox --benchmark-type=h --error-on-memleak
--off-heap-size=10g -s=1.0 --threads=16 --iterations=1 \
&& GLUTEN_IT_JVM_ARGS=-Xmx5G sbin/gluten-it.sh queries-compare \
--local --preset=velox --benchmark-type=ds --error-on-memleak
--off-heap-size=10g -s=1.0 --threads=16 --iterations=1
- run-tpc-test-centos8:
+ run-tpc-test-centos:
needs: build-native-lib
strategy:
fail-fast: false
matrix:
+ os: ["centos:7", "centos:8"]
spark: ["spark-3.2", "spark-3.3", "spark-3.4", "spark-3.5"]
+ java: ["java-8", "java-17"]
+ # Spark supports JDK17 since 3.3 and later, see
https://issues.apache.org/jira/browse/SPARK-33772
+ exclude:
Review Comment:
Consider to use `include`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
