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

Change Databricks image from 8.2 to 9.1 [skip ci] #4049

Merged
merged 4 commits into from
Nov 12, 2021

Conversation

NvTimLiu
Copy link
Collaborator

@NvTimLiu NvTimLiu commented Nov 8, 2021

Databricks 8.2 has been deprecated, change to Databricks 9.1 LTS.

Signed-off-by: Tim Liu timl@nvidia.com

@NvTimLiu NvTimLiu changed the title Change Databricks image from 8.2 to 9.1 Change Databricks image from 8.2 to 9.1 [databricks] Nov 8, 2021
@NvTimLiu
Copy link
Collaborator Author

NvTimLiu commented Nov 8, 2021

build

@NvTimLiu NvTimLiu self-assigned this Nov 8, 2021
@NvTimLiu NvTimLiu added the build Related to CI / CD or cleanly building label Nov 8, 2021
@NvTimLiu NvTimLiu linked an issue Nov 8, 2021 that may be closed by this pull request
Copy link
Collaborator

@pxLi pxLi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this change includes the jenkinsfile change, so it would possibly failed the test and we may need to skip ci here, can you test against https://github.com/pxLi/spark-rapids/ repo?

@@ -390,7 +390,7 @@ pipeline {
}
} // end of DB runtime 7.3

stage('DB runtime 8.2') {
stage('DB runtime 9.1') {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also update stage expression,

db_build && major_ver >= 21 && minor_ver >= 6
==>
db_build && major_ver >= 21 && minor_ver >= 12

as we added spark312db shim later for 21.12 or later

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@NvTimLiu NvTimLiu changed the title Change Databricks image from 8.2 to 9.1 [databricks] Change Databricks image from 8.2 to 9.1 [skip test] Nov 8, 2021
@pxLi pxLi changed the title Change Databricks image from 8.2 to 9.1 [skip test] Change Databricks image from 8.2 to 9.1 [skip ci] Nov 8, 2021
@NvTimLiu NvTimLiu changed the title Change Databricks image from 8.2 to 9.1 [skip ci] Change Databricks image from 8.2 to 9.1 [skip ci] [databricks] Nov 8, 2021
@NvTimLiu NvTimLiu changed the title Change Databricks image from 8.2 to 9.1 [skip ci] [databricks] Change Databricks image from 8.2 to 9.1 [skip ci] Nov 8, 2021
@NvTimLiu
Copy link
Collaborator Author

NvTimLiu commented Nov 8, 2021

build

@NvTimLiu
Copy link
Collaborator Author

NvTimLiu commented Nov 8, 2021

@tgravescs @jlowe @revans2 Could you please help to review? Thanks!

Please keep this PR OPEN, I'll merge it after all the tests/verify pipelines get PASS. Thanks

Copy link
Collaborator

@revans2 revans2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine to me, but I am not the databricks expert so I will not approve this until someone else with more experience takes a look too.

@jlowe jlowe marked this pull request as draft November 8, 2021 14:01
@jlowe
Copy link
Member

jlowe commented Nov 8, 2021

Please keep this PR OPEN, I'll merge it after all the tests/verify pipelines get PASS.

Converting this to a draft PR so it cannot be accidentally merged.

Copy link
Collaborator

@tgravescs tgravescs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be done separately but it would be nice to update the jenkins/databricks/build.sh and test.sh script to default to 9.1.

jlowe
jlowe previously approved these changes Nov 8, 2021
@tgravescs
Copy link
Collaborator

tgravescs commented Nov 9, 2021

@NvTimLiu has this been tested?

${base}/envs/mamba/bin/mamba install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=$CUDF_VER cudatoolkit=11.0
conda env remove -n mamba
# Create and activate 'cudf-udf' conda env for cudf-udf tests
conda create -y -n cudf-udf && source activate && conda activate cudf-udf
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We change to create a common 'cudf-udf' conda environment for cudf udf tests, because

1, Not like 7.3 & 8.2, Databricks 9.1 does not have the default databricks-ml-gpu conda ENV

2, In 7.3 & 8.2, the script init_cudf_udf.sh create the empty MAMBA conda environment, but install everything (using MAMBA)into the default databricks-ml-gpu ENV, this looks odd.

3, We create a common and clean cudf-udf ENV specified for the cudf udf test.

@NvTimLiu
Copy link
Collaborator Author

NvTimLiu commented Nov 9, 2021

@NvTimLiu has this been tested?

Yes, this has been tested against both 7.3 & 9.1 build/IT runtime.

On 7.3, got everything PASS,

On 9.1, FAILED on the issue: rapidsai/cudf#9622

Will verify after the issue get fixed.

[[ -z $SPARK_SHIM_VER ]] && export SPARK_SHIM_VER=spark${BASE_SPARK_VER//.}db

# Try to use "cudf-udf" conda environment for the python cudf-udf tests.
if [ -d "/databricks/conda/envs/cudf-udf" ]; then
Copy link
Collaborator Author

@NvTimLiu NvTimLiu Nov 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use "cudf-udf" conda environment (created by jenkins/databricks/init_cudf_udf.sh) for the python cudf-udf tests.

Databricks 8.2 has been deprecated, change to Databricks 9.1 LTS.

Signed-off-by: Tim Liu <timl@nvidia.com>
Signed-off-by: Tim Liu <timl@nvidia.com>
@NvTimLiu
Copy link
Collaborator Author

DB 9.1 tests failed on #4069

@pxLi pxLi marked this pull request as ready for review November 12, 2021 01:17
@NvTimLiu
Copy link
Collaborator Author

build

@pxLi pxLi merged commit 86e3219 into NVIDIA:branch-21.12 Nov 12, 2021
@pxLi
Copy link
Collaborator

pxLi commented Nov 12, 2021

Going to create a dummy verification PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEA] build and test pipelines for databricks 9.1
5 participants