Skip to content

Commit

Permalink
Preparing for Gltuen v1.2.1-rc0 (#8110)
Browse files Browse the repository at this point in the history
  • Loading branch information
@weiting-chen
weiting-chen authored Nov 29, 2024
1 parent 6e86564 commit 1a50a68
Show file tree
Hide file tree
Showing 39 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion backends-clickhouse/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion backends-velox/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ep/build-velox/src/get_velox.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -exu


VELOX_REPO=https://github.com/oap-project/velox.git
VELOX_BRANCH=branch-1.2
VELOX_BRANCH=gluten-1.2.2
VELOX_HOME=""

#Set on run gluten on HDFS
Expand Down
2 changes: 1 addition & 1 deletion gluten-celeborn/clickhouse/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-celeborn</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-celeborn/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-celeborn</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-celeborn/package/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-celeborn</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion gluten-celeborn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-celeborn/velox/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-celeborn</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion gluten-data/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-delta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-iceberg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ras/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-ras</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<artifactId>gluten-ras-common</artifactId>
<name>Gluten Ras Common</name>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ras/planner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-ras</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<artifactId>gluten-ras-planner</artifactId>
<name>Gluten Ras Planner</name>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ras/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<artifactId>gluten-ras</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>

<artifactId>gluten-ui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion gluten-uniffle/package/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-uniffle</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-uniffle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-parent</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-uniffle/velox/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-uniffle</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-ut</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/spark32/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-ut</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/spark33/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-ut</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/spark34/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-ut</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/spark35/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-ut</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion gluten-ut/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gluten-ut</artifactId>
<groupId>org.apache.gluten</groupId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion package/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<packaging>pom</packaging>

<name>Gluten Parent Pom</name>
Expand Down
2 changes: 1 addition & 1 deletion shims/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>spark-sql-columnar-shims</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion shims/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-parent</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion shims/spark32/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>spark-sql-columnar-shims</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion shims/spark33/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>spark-sql-columnar-shims</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion shims/spark34/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>spark-sql-columnar-shims</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion shims/spark35/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>spark-sql-columnar-shims</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions tools/gluten-it/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-it</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>

<artifactId>gluten-it-common</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...s/gluten-it/common/src/main/java/org/apache/gluten/integration/command/SparkRunModes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public Map<String, String> extraSparkConf() {

private static class LocalClusterMode implements Mode {
// We should transfer the jars to be tested in the integration testing to executors
public static final String[] EXTRA_JARS = new String[]{"gluten-package-1.2.0.jar"};
public static final String[] EXTRA_JARS = new String[]{"gluten-package-1.2.1.jar"};

@CommandLine.Option(names = {"--local-cluster"}, description = "Run in Spark local cluster mode", required = true)
private boolean enabled;
Expand Down
2 changes: 1 addition & 1 deletion tools/gluten-it/package/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.gluten</groupId>
<artifactId>gluten-it</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
</parent>
<artifactId>gluten-it-package</artifactId>
<name>Archetype - assembly</name>
Expand Down
4 changes: 2 additions & 2 deletions tools/gluten-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.apache.gluten</groupId>
<artifactId>gluten-it</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1</version>
<packaging>pom</packaging>
<modules>
<module>common</module>
Expand All @@ -23,7 +23,7 @@
<spark.major.version>3</spark.major.version>
<celeborn.version>0.3.2-incubating</celeborn.version>
<uniffle.version>0.8.0</uniffle.version>
<gluten.version>1.2.1-SNAPSHOT</gluten.version>
<gluten.version>1.2.1</gluten.version>
<guava.version>32.0.1-jre</guava.version>
<tpch.version>1.1</tpch.version>
<tpcds.version>1.4</tpcds.version>
Expand Down
2 changes: 1 addition & 1 deletion tools/workload/tpcds/run_tpcds/run_tpcds.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ cat tpcds_parquet.scala | ${SPARK_HOME}/bin/spark-shell \
# e.g.
# --conf spark.gluten.loadLibFromJar=true \
# --jars /PATH_TO_GLUTEN_HOME/package/target/thirdparty-lib/gluten-thirdparty-lib-ubuntu-22.04-x86_64.jar,
# /PATH_TO_GLUTEN_HOME/package/target/gluten-velox-bundle-spark3.3_2.12-ubuntu_22.04_x86_64-1.2.0.jar
# /PATH_TO_GLUTEN_HOME/package/target/gluten-velox-bundle-spark3.3_2.12-ubuntu_22.04_x86_64-1.2.1.jar

0 comments on commit 1a50a68

Please sign in to comment.