Add arm64 profile to build arm artifacts (#9273)

Signed-off-by: Peixin Li <pxli@nyu.edu>
NVIDIA · Sep 21, 2023 · 01fce6c · 01fce6c
1 parent a90242e
commit 01fce6c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/api_validation/pom.xml b/api_validation/pom.xml
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
             <artifactId>spark-rapids-jni</artifactId>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
             <scope>provided</scope>
         </dependency>
         <!-- use aggregator jar because accessing internal classes -->
@@ -115,7 +115,7 @@
             <groupId>com.nvidia</groupId>
             <artifactId>rapids-4-spark_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -40,7 +40,7 @@
 
     <properties>
         <target.classifier/>
-        <dist.jar.name>${project.build.directory}/${project.build.finalName}-${cuda.version}.jar</dist.jar.name>
+        <dist.jar.name>${project.build.directory}/${project.build.finalName}-${jni.classifier}.jar</dist.jar.name>
         <dist.jar.pom.url>jar:file:${dist.jar.name}!/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</dist.jar.pom.url>
         <rapids.default.jar.phase>none</rapids.default.jar.phase>
     </properties>
@@ -223,7 +223,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <classifier>${cuda.version}</classifier>
+                    <classifier>${jni.classifier}</classifier>
                 </configuration>
                 <executions>
                     <execution>
@@ -235,7 +235,7 @@
                         <configuration>
                             <archive><compress>${dist.jar.compress}</compress></archive>
                             <classesDirectory>${project.build.directory}/parallel-world</classesDirectory>
-                            <classifier>${cuda.version}</classifier>
+                            <classifier>${jni.classifier}</classifier>
                         </configuration>
                     </execution>
                 </executions>
@@ -412,7 +412,7 @@ self.log("... OK")
                                 <artifactItem>
                                     <groupId>com.nvidia</groupId>
                                     <artifactId>spark-rapids-jni</artifactId>
-                                    <classifier>${cuda.version}</classifier>
+                                    <classifier>${jni.classifier}</classifier>
                                     <excludes>META-INF/**</excludes>
                                     <outputDirectory>${project.build.directory}/parallel-world</outputDirectory>
                                     <overWrite>true</overWrite>
@@ -447,7 +447,7 @@ self.log("... OK")
                         <configuration>
                             <file>${dist.jar.name}</file>
                             <artifactId>${project.artifactId}</artifactId>
-                            <classifier>${cuda.version}</classifier>
+                            <classifier>${jni.classifier}</classifier>
                             <groupId>${project.groupId}</groupId>
                             <version>${project.version}</version>
                             <packaging>jar</packaging>
@@ -477,7 +477,7 @@ self.log("... OK")
                             <file>${dist.jar.name}</file>
                             <url>file://${java.io.tmpdir}/m2-repo</url>
                             <artifactId>${project.artifactId}</artifactId>
-                            <classifier>${cuda.version}</classifier>
+                            <classifier>${jni.classifier}</classifier>
                             <groupId>${project.groupId}</groupId>
                             <packaging>jar</packaging>
                             <!-- pomFile will be taken from META-INF in jar

diff --git a/integration_tests/pom.xml b/integration_tests/pom.xml
@@ -54,7 +54,7 @@
             <groupId>com.nvidia</groupId>
             <artifactId>rapids-4-spark_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -581,6 +581,12 @@
                 <maven.compiler.target>17</maven.compiler.target>
             </properties>
         </profile>
+        <profile>
+            <id>arm64</id>
+            <properties>
+                <jni.classifier>${cuda.version}-arm64</jni.classifier>
+            </properties>
+        </profile>
     </profiles>
 
     <properties>
@@ -594,6 +600,7 @@
         <parquet.hadoop.version>1.10.1</parquet.hadoop.version>
         <spark.version.classifier>spark${buildver}</spark.version.classifier>
         <cuda.version>cuda11</cuda.version>
+        <jni.classifier>${cuda.version}</jni.classifier>
         <spark-rapids-jni.version>23.10.0-SNAPSHOT</spark-rapids-jni.version>
         <spark-rapids-private.version>23.10.0-SNAPSHOT</spark-rapids-private.version>
         <scala.binary.version>2.12</scala.binary.version>
@@ -761,7 +768,7 @@
               <groupId>com.nvidia</groupId>
               <artifactId>spark-rapids-jni</artifactId>
               <version>${spark-rapids-jni.version}</version>
-              <classifier>${cuda.version}</classifier>
+              <classifier>${jni.classifier}</classifier>
             </dependency>
             <dependency>
                 <groupId>org.openucx</groupId>

diff --git a/shuffle-plugin/pom.xml b/shuffle-plugin/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
             <artifactId>spark-rapids-jni</artifactId>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>

diff --git a/sql-plugin-api/pom.xml b/sql-plugin-api/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
             <artifactId>spark-rapids-jni</artifactId>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
         </dependency>
     </dependencies>
     <profiles>

diff --git a/sql-plugin/pom.xml b/sql-plugin/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
             <artifactId>spark-rapids-jni</artifactId>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
         </dependency>
         <dependency>
             <groupId>com.nvidia</groupId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
             <artifactId>spark-rapids-jni</artifactId>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
         </dependency>
         <!-- use aggregator jar because accessing internal classes -->
         <dependency>

diff --git a/udf-compiler/pom.xml b/udf-compiler/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.nvidia</groupId>
             <artifactId>spark-rapids-jni</artifactId>
-            <classifier>${cuda.version}</classifier>
+            <classifier>${jni.classifier}</classifier>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>