Fixes

- binary-dedupe should not look outside paralle-world directory - when unpack is skipped we should restore jni from a staged dir Signed-off-by: Gera Shegalov <[email protected]>
NVIDIA · Nov 16, 2023 · 24ca3c7 · 24ca3c7
1 parent 5efd1c2
commit 24ca3c7
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -324,6 +324,19 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-jni-and-ucx-classes</id>
+                        <!-- after optional unpack -->
+                        <phase>process-resources</phase>
+                        <goals><goal>run</goal></goals>
+                        <configuration>
+                            <target>
+                                <copy todir="${project.build.directory}/parallel-world">
+                                    <fileset dir="${project.build.directory}/jni-deps"/>
+                                </copy>
+                            </target>
+                        </configuration>
+                    </execution>
                     <execution>
                         <phase>verify</phase>
                         <goals>
@@ -456,14 +469,14 @@ self.log("... OK")
                                     <artifactId>spark-rapids-jni</artifactId>
                                     <classifier>${jni.classifier}</classifier>
                                     <excludes>META-INF/**</excludes>
-                                    <outputDirectory>${project.build.directory}/parallel-world</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/jni-deps</outputDirectory>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.openucx</groupId>
                                     <artifactId>jucx</artifactId>
                                     <excludes>META-INF/**</excludes>
-                                    <outputDirectory>${project.build.directory}/parallel-world</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/jni-deps</outputDirectory>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                             </artifactItems>

diff --git a/dist/scripts/binary-dedupe.sh b/dist/scripts/binary-dedupe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2021-2022, NVIDIA CORPORATION.
+# Copyright (c) 2021-2023, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -157,7 +157,7 @@ mv "$SPARK3XX_COMMON_DIR" parallel-world/
 # Determine the list of unshimmed class files
 UNSHIMMED_LIST_TXT=unshimmed-result.txt
 echo "$((++STEP))/ creating sorted list of unshimmed classes > $UNSHIMMED_LIST_TXT"
-find . -name '*.class' -not -path './parallel-world/spark3*' | \
+find ./parallel-world -name '*.class' -not -path './parallel-world/spark3*' | \
   cut -d/ -f 3- | sort > "$UNSHIMMED_LIST_TXT"
 
 function verify_same_sha_for_unshimmed() {

diff --git a/scala2.13/dist/pom.xml b/scala2.13/dist/pom.xml
@@ -324,6 +324,19 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-jni-and-ucx-classes</id>
+                        <!-- after optional unpack -->
+                        <phase>process-resources</phase>
+                        <goals><goal>run</goal></goals>
+                        <configuration>
+                            <target>
+                                <copy todir="${project.build.directory}/parallel-world">
+                                    <fileset dir="${project.build.directory}/jni-deps"/>
+                                </copy>
+                            </target>
+                        </configuration>
+                    </execution>
                     <execution>
                         <phase>verify</phase>
                         <goals>
@@ -456,14 +469,14 @@ self.log("... OK")
                                     <artifactId>spark-rapids-jni</artifactId>
                                     <classifier>${jni.classifier}</classifier>
                                     <excludes>META-INF/**</excludes>
-                                    <outputDirectory>${project.build.directory}/parallel-world</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/jni-deps</outputDirectory>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.openucx</groupId>
                                     <artifactId>jucx</artifactId>
                                     <excludes>META-INF/**</excludes>
-                                    <outputDirectory>${project.build.directory}/parallel-world</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/jni-deps</outputDirectory>
                                     <overWrite>true</overWrite>
                                 </artifactItem>
                             </artifactItems>