Make new build default and combine into dist package #3411
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (c) 2021, NVIDIA CORPORATION. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>com.nvidia</groupId> | ||
| <artifactId>rapids-4-spark-parent</artifactId> | ||
| <version>21.10.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>rapids-4-spark-aggregator_2.12</artifactId> | ||
| <name>RAPIDS Accelerator for Apache Spark Aggregator</name> | ||
| <description>Creates an aggregated shaded package of the RAPIDS plugin for Apache Spark</description> | ||
| <version>21.10.0-SNAPSHOT</version> | ||
|
|
||
| <properties> | ||
| <rapids.shade.package>com.nvidia.shaded.${spark.version.classifier}.spark</rapids.shade.package> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.nvidia</groupId> | ||
| <artifactId>rapids-4-spark-sql_${scala.binary.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>${spark.version.classifier}</classifier> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.nvidia</groupId> | ||
| <artifactId>rapids-4-spark-shuffle_${scala.binary.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>${spark.version.classifier}</classifier> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.nvidia</groupId> | ||
| <artifactId>rapids-4-spark-udf_${scala.binary.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>${spark.version.classifier}</classifier> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.nvidia</groupId> | ||
| <artifactId>rapids-4-spark-shims-${spark.version.classifier}_${scala.binary.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-shade-plugin</artifactId> | ||
| <configuration> | ||
| <artifactSet> | ||
|
There was a problem hiding this comment. nit: Indention appears to be off here. |
||
| <excludes>org.slf4j:*</excludes> | ||
| </artifactSet> | ||
| <transformers> | ||
| <transformer | ||
| implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> | ||
| </transformers> | ||
| <createDependencyReducedPom>true</createDependencyReducedPom> | ||
| <shadedArtifactAttached>true</shadedArtifactAttached> | ||
| <shadedClassifierName>${spark.version.classifier}</shadedClassifierName> | ||
| <relocations> | ||
| <relocation> | ||
| <pattern>org.apache.orc.</pattern> | ||
| <shadedPattern>${rapids.shade.package}.orc.</shadedPattern> | ||
| </relocation> | ||
| <relocation> | ||
| <pattern>org.apache.hadoop.hive.</pattern> | ||
| <shadedPattern>${rapids.shade.package}.hadoop.hive.</shadedPattern> | ||
| <excludes> | ||
| <exclude>org.apache.hadoop.hive.conf.HiveConf</exclude> | ||
| <exclude>org.apache.hadoop.hive.ql.exec.UDF</exclude> | ||
| <exclude>org.apache.hadoop.hive.ql.udf.generic.GenericUDF</exclude> | ||
| </excludes> | ||
| </relocation> | ||
| <relocation> | ||
| <pattern>org.apache.hive.</pattern> | ||
| <shadedPattern>${rapids.shade.package}.hive.</shadedPattern> | ||
| </relocation> | ||
| <relocation> | ||
| <pattern>io.airlift.compress.</pattern> | ||
| <shadedPattern>${rapids.shade.package}.io.airlift.compress.</shadedPattern> | ||
| </relocation> | ||
| <relocation> | ||
| <pattern>org.apache.commons.codec.</pattern> | ||
| <shadedPattern>${rapids.shade.package}.org.apache.commons.codec.</shadedPattern> | ||
| </relocation> | ||
| <relocation> | ||
| <pattern>org.apache.commons.lang.</pattern> | ||
| <shadedPattern>${rapids.shade.package}.org.apache.commons.lang.</shadedPattern> | ||
| </relocation> | ||
| <relocation> | ||
| <pattern>com.google</pattern> | ||
| <shadedPattern>${rapids.shade.package}.com.google</shadedPattern> | ||
| </relocation> | ||
| </relocations> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>shade</goal> | ||
| </goals> | ||
| <configuration> | ||
| <filters> | ||
| <filter> | ||
| <artifact>com.nvidia:rapids-4-spark-aggregator_2.12</artifact> | ||
| <includes> | ||
| <include>META-INF/**</include> | ||
| </includes> | ||
| <excludes> | ||
| <exclude>META-INF/services/**</exclude> | ||
| </excludes> | ||
| </filter> | ||
| </filters> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.rat</groupId> | ||
| <artifactId>apache-rat-plugin</artifactId> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| set -ex | ||
|
|
||
|
There was a problem hiding this comment. Should we do something to make sure that the directory is the correct one? This assumes that you are in the root directory calling |
||
| # Install all the versions we support | ||
| mvn -U -Dbuildver=302 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
|
There was a problem hiding this comment. I'm not sure if this was discussed before, but if we don't want rat, or tests or javadocs/etc, why do we have them on by default in the maven build at all? I would much rather see a way to pass parameters to the shell script on to the maven build so I can decide what I want and what I don't instead. There was a problem hiding this comment. yeah the build script is very basic right now just to get started, lots of improvements to it need to be done |
||
| mvn -U -Dbuildver=303 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
| mvn -U -Dbuildver=304 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
| mvn -U -Dbuildver=311 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
| mvn -U -Dbuildver=312 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
| mvn -U -Dbuildver=313 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
| mvn -U -Dbuildver=311cdh clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
| mvn -U -Dbuildver=320 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -pl aggregator -am | ||
| mvn -U -Dbuildver=301 clean install -Drat.skip=true -DskipTests -Psnapshots | ||
jlowe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,31 @@ | ||||||
| --- | ||||||
| layout: page | ||||||
| title: Testing | ||||||
| nav_order: 1 | ||||||
| parent: Developer Overview | ||||||
| --- | ||||||
| # RAPIDS Accelerator for Apache Spark Distribution Packaging | ||||||
|
|
||||||
| The distribution module creates a jar with support for the Spark versions you need combined into a single jar. | ||||||
|
|
||||||
| See the [CONTRIBUTING.md](../CONTRIBUTING.md) doc for details on building and profiles available to build an Uber jar. | ||||||
jlowe marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
| Note that when you use the profiles to build an Uber jar there are currently some hardcoded service provider files that get put into place. One file for each of the | ||||||
| above profiles. Please note that you will need to update these if adding or removing support for a Spark version. | ||||||
|
|
||||||
| Files are: `com.nvidia.spark.rapids.SparkShimServiceProvider.sparkNonSnapshot`, `com.nvidia.spark.rapids.SparkShimServiceProvider.sparkSnapshot`, `com.nvidia.spark.rapids.SparkShimServiceProvider.sparkNonSnapshotDB`, and `com.nvidia.spark.rapids.SparkShimServiceProvider.sparkSnapshotDB`. | ||||||
|
|
||||||
| The new Uber jar is structured like: | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| 1. Base common classes are user visible classes. For these we use Spark 3.0.1 versions | ||||||
| 2. META-INF/services. This is a file that has to list all the shim versions supported by this jar. The files talked about above for each profile are put into place here for uber jars. | ||||||
| 3. META-INF base files are from 3.0.1 - maven, LICENSE, NOTICE, etc | ||||||
| 4. shaded dependencies for Spark 3.0.1 in case the base common classes needed them. | ||||||
| 5. Spark specific directory for each version of Spark supported in the jar. ie spark301/, spark302/, spark311/, etc. | ||||||
|
|
||||||
| If you have to change the contents of the uber jar the following files control what goes into the base jar as classes that are not shaded. | ||||||
|
|
||||||
| 1. `unshimmed-base-classes.txt` - this has classes that should go into the base jar with their normal package name (not shaded). This includes user visible classes (ie com/nvidia/spark/SQLPlugin). Uses Spark 3.0.1 built jar for any of the uber jars. | ||||||
| 2. `unshimmed-base-extras.txt` - these are other files applied to the base version of Spark that stay in the base of the jar and not put into Spark version specific directories. Note we choose Spark 3.0.1 as the base version to use for base and unshimmed classes. | ||||||
| 3. `unshimmed-extras.txt` - These are files that are put into the base of the jar and not into the Spark specific directory from all of the other Spark version jars. | ||||||
jlowe marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| com.nvidia.spark.rapids.shims.spark301.SparkShimServiceProvider | ||
|
There was a problem hiding this comment. Note hardcoded these for now, hopefully can make this smarter and generate on the fly later. |
||
| com.nvidia.spark.rapids.shims.spark302.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark303.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark312.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311cdh.SparkShimServiceProvider | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| com.nvidia.spark.rapids.shims.spark301.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark302.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark303.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark312.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311cdh.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark301db.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311db.SparkShimServiceProvider |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| com.nvidia.spark.rapids.shims.spark301.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark302.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark303.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark304.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark312.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark313.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311cdh.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark320.SparkShimServiceProvider |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| com.nvidia.spark.rapids.shims.spark301.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark302.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark303.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark304.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark312.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark313.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311cdh.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark320.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark301db.SparkShimServiceProvider | ||
| com.nvidia.spark.rapids.shims.spark311db.SparkShimServiceProvider |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?