Merge remote-tracking branch 'origin/branch-0.3' into resolvconf

NVIDIA · Sep 11, 2020 · 483ca19 · 483ca19
2 parents be6bb90 + 52e6399
commit 483ca19
Show file tree

Hide file tree

Showing 40 changed files with 337 additions and 143 deletions.
diff --git a/api_validation/pom.xml b/api_validation/pom.xml
@@ -22,10 +22,10 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-parent</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>rapids-4-spark-api-validation</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <profiles>
         <profile>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
 	        <artifactId>rapids-4-spark-shims-aggregator_${scala.binary.version}</artifactId>
-            <version>0.2.0-SNAPSHOT</version>
+            <version>0.3.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -22,13 +22,13 @@
   <parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-parent</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
   <groupId>com.nvidia</groupId>
   <artifactId>rapids-4-spark_2.12</artifactId>
   <name>RAPIDS Accelerator for Apache Spark Distribution</name>
   <description>Creates the distribution package of the RAPIDS plugin for Apache Spark</description>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/integration_tests/pom.xml b/integration_tests/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-parent</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-integration-tests_2.12</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <properties>
         <spark.test.version>3.0.0</spark.test.version>

diff --git a/jenkins/Jenkinsfile.301.integration b/jenkins/Jenkinsfile.301.integration
@@ -38,7 +38,7 @@ pipeline {
     parameters {
         string(name: 'OVERWRITE_PARAMS', defaultValue: '',
             description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
-        string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
+        string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
     }
 
     environment {

diff --git a/jenkins/Jenkinsfile.302.integration b/jenkins/Jenkinsfile.302.integration
@@ -38,7 +38,7 @@ pipeline {
     parameters {
         string(name: 'OVERWRITE_PARAMS', defaultValue: '',
             description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
-        string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
+        string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
     }
 
     environment {

diff --git a/jenkins/Jenkinsfile.310.integration b/jenkins/Jenkinsfile.310.integration
@@ -38,7 +38,7 @@ pipeline {
     parameters {
         string(name: 'OVERWRITE_PARAMS', defaultValue: '',
             description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
-        string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
+        string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
     }
 
     environment {

diff --git a/jenkins/Jenkinsfile.databricksnightly b/jenkins/Jenkinsfile.databricksnightly
@@ -44,14 +44,14 @@ pipeline {
         choice(name: 'DEPLOY_TO', choices: ['Urm', 'Local'],
             description: 'Where to deploy artifacts to')
         string(name: 'DATABRICKS_VERSION',
-                defaultValue: '0.2.0-SNAPSHOT', description: 'Version to set')
+                defaultValue: '0.3.0-SNAPSHOT', description: 'Version to set')
         string(name: 'CUDF_VERSION',
                 defaultValue: '0.15', description: 'Cudf version to use')
         string(name: 'CUDA_VERSION',
                 defaultValue: 'cuda10-1', description: 'cuda version to use')
         string(name: 'CLUSTER_ID',
-                defaultValue: '0617-140138-umiak14', description: 'databricks cluster id')
-        string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
+                defaultValue: '0909-141326-pawl52', description: 'databricks cluster id')
+        string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
     }
 
     environment {

diff --git a/jenkins/Jenkinsfile.integration b/jenkins/Jenkinsfile.integration
@@ -40,7 +40,7 @@ pipeline {
             description: 'parameters format XXX_VER=xxx;YYY_VER=yyy;')
         string(name: 'CUDA_CLASSIFIER', defaultValue: 'cuda10-1',
             description: '-Dclassifier=\n\n cuda10-1, cuda10-2, EMPTY as cuda10-1')
-        string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
+        string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
     }
 
     environment {

diff --git a/jenkins/Jenkinsfile.nightly b/jenkins/Jenkinsfile.nightly
@@ -34,7 +34,7 @@ pipeline {
     }
 
     parameters {
-        string(name: 'REF', defaultValue: 'branch-0.2', description: 'Commit to build')
+        string(name: 'REF', defaultValue: 'branch-0.3', description: 'Commit to build')
     }
 
     environment {
@@ -83,9 +83,9 @@ pipeline {
         always {
             script {
                 if (currentBuild.currentResult == "SUCCESS") {
-                    build(job: 'spark/rapids_integration-0.2-github',
+                    build(job: 'spark/rapids_integration-0.3-github',
                           propagate: false,
-                          parameters: [string(name: 'REF', value: 'branch-0.2')])
+                          parameters: [string(name: 'REF', value: 'branch-0.3')])
 
                     slack("#swrapids-spark-cicd", "Success", color: "#33CC33")
                 } else {

diff --git a/jenkins/spark-premerge-build.sh b/jenkins/spark-premerge-build.sh
@@ -37,7 +37,7 @@ export PATH="$SPARK_HOME/bin:$SPARK_HOME/sbin:$PATH"
 tar zxf $SPARK_HOME.tgz -C $ARTF_ROOT && \
     rm -f $SPARK_HOME.tgz
 
-mvn -U -B $MVN_URM_MIRROR '-Pinclude-databricks,!snapshot-shims' clean verify -Dpytest.TEST_TAGS='not cudf_udf'
+mvn -U -B $MVN_URM_MIRROR '-P!snapshot-shims' clean verify -Dpytest.TEST_TAGS=''
 # Run the unit tests for other Spark versions but dont run full python integration tests
 env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Pspark301tests,snapshot-shims test -Dpytest.TEST_TAGS='not cudf_udf'
 env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Pspark310tests,snapshot-shims test -Dpytest.TEST_TAGS='not cudf_udf'

diff --git a/jenkins/version-def.sh b/jenkins/version-def.sh
@@ -28,7 +28,7 @@ IFS=$PRE_IFS
 
 CUDF_VER=${CUDF_VER:-"0.15"}
 CUDA_CLASSIFIER=${CUDA_CLASSIFIER:-"cuda10-1"}
-PROJECT_VER=${PROJECT_VER:-"0.2.0-SNAPSHOT"}
+PROJECT_VER=${PROJECT_VER:-"0.3.0-SNAPSHOT"}
 SPARK_VER=${SPARK_VER:-"3.0.0"}
 SCALA_BINARY_VER=${SCALA_BINARY_VER:-"2.12"}
 SERVER_ID=${SERVER_ID:-"snapshots"}

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <artifactId>rapids-4-spark-parent</artifactId>
     <name>RAPIDS Accelerator for Apache Spark Root Project</name>
     <description>The root project of the RAPIDS Accelerator for Apache Spark</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/NVIDIA</url>

diff --git a/shims/aggregator/pom.xml b/shims/aggregator/pom.xml
@@ -22,15 +22,15 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-shims_2.12</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims-aggregator_2.12</artifactId>
     <packaging>jar</packaging>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin Shim Aggregator</name>
     <description>The RAPIDS SQL plugin for Apache Spark Shim Aggregator</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
    <profiles>
         <profile>

diff --git a/shims/pom.xml b/shims/pom.xml
@@ -22,15 +22,15 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-parent</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims_2.12</artifactId>
     <packaging>pom</packaging>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin Shims</name>
     <description>The RAPIDS SQL plugin for Apache Spark Shims</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <profiles>
         <profile>

diff --git a/shims/spark300/pom.xml b/shims/spark300/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-shims_2.12</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims-spark300_2.12</artifactId>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin Spark 3.0.0 Shim</name>
     <description>The RAPIDS SQL plugin for Apache Spark 3.0.0 Shim</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <!-- Set 'spark.version' for the shims layer -->
     <!-- Create a separate file 'SPARK_VER.properties' in the jar to save cudf & spark version info -->

diff --git a/shims/spark300db/pom.xml b/shims/spark300db/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-shims_2.12</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims-spark300-databricks_2.12</artifactId>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin Spark 3.0.0 Databricks Shim</name>
     <description>The RAPIDS SQL plugin for Apache Spark 3.0.0 Databricks Shim</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <!-- Set 'spark.version' for the shims layer -->
     <!-- Create a separate file 'SPARK_VER.properties' in the jar to save cudf & spark version info -->

diff --git a/shims/spark301/pom.xml b/shims/spark301/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-shims_2.12</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims-spark301_2.12</artifactId>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin Spark 3.0.1 Shim</name>
     <description>The RAPIDS SQL plugin for Apache Spark 3.0.1 Shim</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <!-- Set 'spark.version' for the shims layer -->
     <!-- Create a separate file 'SPARK_VER.properties' in the jar to save cudf & spark version info -->

diff --git a/shims/spark302/pom.xml b/shims/spark302/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-shims_2.12</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims-spark302_2.12</artifactId>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin Spark 3.0.2 Shim</name>
     <description>The RAPIDS SQL plugin for Apache Spark 3.0.2 Shim</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <!-- Set 'spark.version' for the shims layer -->
     <!-- Create a separate file 'SPARK_VER.properties' in the jar to save cudf & spark version info -->

diff --git a/shims/spark310/pom.xml b/shims/spark310/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-shims_2.12</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims-spark310_2.12</artifactId>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin Spark 3.1.0 Shim</name>
     <description>The RAPIDS SQL plugin for Apache Spark 3.1.0 Shim</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <!-- Set 'spark.version' for the shims layer -->
     <!-- Create a separate file 'SPARK_VER.properties' in the jar to save cudf & spark version info -->

diff --git a/shuffle-plugin/pom.xml b/shuffle-plugin/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-parent</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shuffle_2.12</artifactId>
     <name>RAPIDS Accelerator for Apache Spark Shuffle Plugin</name>
     <description>Accelerated shuffle plugin for the RAPIDS plugin for Apache Spark</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/sql-plugin/pom.xml b/sql-plugin/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-parent</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-sql_2.12</artifactId>
     <name>RAPIDS Accelerator for Apache Spark SQL Plugin</name>
     <description>The RAPIDS SQL plugin for Apache Spark</description>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>