-
Notifications
You must be signed in to change notification settings - Fork 231
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
Suffix artifactId with amd64/arm64 for the dist jars [skip ci] #7070
Conversation
Build on x86_64/amd64 hosts to aggregate rapids-4-spark dist jar with -Dcpu_arch=amd64 Suffix 'amd64' for dist artifact, e.g., rapids-4-spark-amd64_2.12 Build on arm64/aarch64 hosts to aggregate rapids-4-spark dist jar with -Dcpu_arch=arm64 Suffix 'arm64' for dist artifact, e.g., rapids-4-spark-arm64_2.12 Signed-off-by: Tim Liu <timl@nvidia.com>
build |
The solution is still under discussing. Will update scala/doc files when the final solution is made |
If we would like to have UCX on arm, the build must support to correctly switch arch-based jucx dependency also cc @abellina for help |
Signed-off-by: Tim Liu <timl@nvidia.com>
build |
@@ -24,7 +24,7 @@ | |||
<artifactId>rapids-4-spark-parent</artifactId> | |||
<version>22.12.0-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>rapids-4-spark_2.12</artifactId> | |||
<artifactId>rapids-4-spark-${cpu_arch}_2.12</artifactId> |
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.
Based on an earlier discussion, I thought it was not allowed to have a variable in the artifactId? Seems like we want to split dist into dist-amd64 and dist-arm64, and maybe they rely on a dist-common that builds an intermediate jar using the CPU architecture in the classifier, similar to how we use the Spark version in the classifier of our sql-plugin intermediate jars.
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.
I thought it was not allowed to have a variable in the artifactId?
maven does not allow to put a var in project root module (rapids-4-spark-parent in our case),
but we could add it in submodule artifactID.
do you think directly use artifactID+{cpu.arch} might be easier than parallel world dist-common+classifier{cpu.arch}?
build/buildall
Outdated
aarch64|arm64) | ||
cpu_arch='arm64';; | ||
*) | ||
echo "Non-support cpu architecture: ${arch}"; exit 1;; |
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.
Nit, applies to all the places where it was copied. Not must-fix.
echo "Non-support cpu architecture: ${arch}"; exit 1;; | |
echo "Unsupported CPU architecture: ${arch}"; exit 1;; |
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.
Fixed
Signed-off-by: Tim Liu <timl@nvidia.com>
Signed-off-by: Tim Liu <timl@nvidia.com>
jenkins/Jenkinsfile-blossom.premerge
Outdated
@@ -166,7 +166,11 @@ pipeline { | |||
steps { | |||
script { | |||
// Retrieve PROJECT_VER from version-def.sh, e.g, '<major>.<minor>.<patch>-SNAPSHOT' | |||
PROJECT_VER = sh(returnStdout: true, script: "bash $JENKINS_ROOT/version-def.sh | cut -d ',' -f 3 | cut -d ' ' -f 3") |
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.
Change to retrieve PROJECT_VER
The previous way of parsing the bash output by | cut -d ',' -f 3 ...
from version-def.sh
can not work well, if we change echo
string in version-def.sh
The previous output from version-def
is:
CUDF_VER: 22.12.0-SNAPSHOT, CUDA_CLASSIFIER: cuda11, PROJECT_VER: 22.12.0-SNAPSHOT, SPARK_VER: 3.1.1 ...
But | cut -d ',' -f 3 ...
does not work if we :
add echo $arcg
ahead,
--> bash output : amd64 CUDF_VER: 22.12.0-SNAPSHOT, CUDA_CLASSIFIER: cuda11, PROJECT_VER: 22.12.0-SNAPSHOT, SPARK_VER: 3.1.1 ..
--> PROJECT_VER=amd64 22.12.0-SNAPSHOT
or if remove CUDF_VER: 22.12.0-SNAPSHOT,
from previous output:
--> bash output : CUDA_CLASSIFIER: cuda11, PROJECT_VER: 22.12.0-SNAPSHOT, SPARK_VER: 3.1.1 ..
--> PROJECT_VER=3.1.1
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.
please revert this file change too
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.
sure, will update jenkins/Jenkinsfile-blossom.premerge
in follow up issue PR changing the | cut -d ',' -f 3 ...
build |
Signed-off-by: Tim Liu <timl@nvidia.com>
Signed-off-by: Tim Liu <timl@nvidia.com>
build |
NOTE: This PR should be merged along w/ many internal CICD updates, otherwise it may break regular CICD pipelines. So please allow devops guys to merge this one at the appropriate time, thanks! |
CI IT against the new artifact name
|
build |
build |
build/buildall
Outdated
aarch64|arm64) | ||
cpu_arch='arm64';; | ||
*) | ||
echo "Unsupport CPU architecture: ${arch}"; exit 1;; |
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.
Unsupported
I think Jason already commented
Convert to draft to avoid accidental merge, thx |
also filed #7116 to tracking potential jucx update |
Signed-off-by: Tim Liu <timl@nvidia.com>
|
build |
1 similar comment
build |
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.
Let's merge this and focus on corresponding CICD update.
If any issue, please help file new follow-ups, thanks!
NVIDIA#7070)" This reverts commit c7f87f4.
…]] (#7070)(#7120)" (#7135) * Revert "Suffix artifactId with amd64/arm64 for the dist jars [skip ci] (#7070)" This reverts commit c7f87f4. * Revert "Build noSnapshots without cdh shims on arm CPU [skip ci] (#7120)" This reverts commit b7a79d3. Signed-off-by: Tim Liu <timl@nvidia.com> Signed-off-by: Tim Liu <timl@nvidia.com>
To fix #6881
Build on x86_64/amd64 hosts to aggregate rapids-4-spark dist jar with -Dcpu_arch=amd64 Suffix 'amd64' for dist artifact, e.g., rapids-4-spark-amd64_2.12
Build on arm64/aarch64 hosts to aggregate rapids-4-spark dist jar with -Dcpu_arch=arm64 Suffix 'arm64' for dist artifact, e.g., rapids-4-spark-arm64_2.12
Signed-off-by: Tim Liu timl@nvidia.com
NOTE:
This PR should be merged along w/ many internal CICD updates, otherwise it may break regular CICD pipelines.
So please allow devops guys to merge this one at the appropriate time, thanks!