Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-dedupe ASM-relocated shim dependencies #3565

Merged
merged 1 commit into from
Sep 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
<version>21.10.0-SNAPSHOT</version>

<properties>
<rapids.shade.package>com.nvidia.shaded.${spark.version.classifier}.spark</rapids.shade.package>
<!--
we store ASM-relocated packages in /spark3xx parallel worlds in dist
and they are auto-deduped using binary diff
-->
<rapids.shade.package>com.nvidia.shaded.spark</rapids.shade.package>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/binary-dedupe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ echo PWD
# it's now safe to delete duplicate .class files from the original locations
# don't use rm */% because globbing is broken for files containing $
for shimDir in $SHIM_DIRS; do
xargs --arg-file="$SPARK3XX_COMMON_TXT" -n 100 -I% rm "$PARALLEL_WORLDS_DIR/$shimDir/%"
xargs --arg-file="$SPARK3XX_COMMON_TXT" -P 4 -n 100 -I% rm "$PARALLEL_WORLDS_DIR/$shimDir/%"
done

mv "$SPARK3XX_COMMON_DIR" $PARALLEL_WORLDS_DIR/
Expand Down
1 change: 0 additions & 1 deletion dist/unshimmed-base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ META-INF/DEPENDENCIES
META-INF/LICENSE
META-INF/NOTICE
META-INF/maven/**
com/nvidia/shaded/**
com/nvidia/spark/RapidsUDF*
com/nvidia/spark/SQLPlugin*
com/nvidia/spark/rapids/ExecutionPlanCaptureCallback*
Expand Down