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

Moved cudf to 0.14 for CI #152

Merged
merged 4 commits into from
Jun 11, 2020
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
4 changes: 2 additions & 2 deletions integration_tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Most clusters probably will not have the RAPIDS plugin installed in the cluster
If just want to verify the SQL replacement is working you will need to add the `rapids-4-spark` and `cudf` jars to your `spark-submit` command.

```
$SPARK_HOME/bin/spark-submit --jars "rapids-4-spark_2.12-0.1-SNAPSHOT.jar,cudf-0.14-SNAPSHOT.jar" ./runtests.py
$SPARK_HOME/bin/spark-submit --jars "rapids-4-spark_2.12-0.1-SNAPSHOT.jar,cudf-0.14.jar" ./runtests.py
```

You don't have to enable the plugin for this to work, the test framework will do that for you.
Expand Down Expand Up @@ -70,7 +70,7 @@ The TPCxBB, TPCH, and Mortgage tests in this framework can be enabled by providi
As an example, here is the `spark-submit` command with the TPCxBB parameters:

```
$SPARK_HOME/bin/spark-submit --jars "rapids-4-spark_2.12-0.1-SNAPSHOT.jar,cudf-0.14-SNAPSHOT.jar,rapids-4-spark-tests_2.12-0.1-SNAPSHOT.jar" ./runtests.py --tpcxbb_format="csv" --tpcxbb_path="/path/to/tpcxbb/csv"
$SPARK_HOME/bin/spark-submit --jars "rapids-4-spark_2.12-0.1-SNAPSHOT.jar,cudf-0.14.jar,rapids-4-spark-tests_2.12-0.1-SNAPSHOT.jar" ./runtests.py --tpcxbb_format="csv" --tpcxbb_path="/path/to/tpcxbb/csv"
```

## Writing tests
Expand Down
2 changes: 1 addition & 1 deletion jenkins/Jenkinsfile.integration
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pipeline {
}

parameters {
string(name: 'CUDF_VER', defaultValue: '0.14-SNAPSHOT',
string(name: 'CUDF_VER', defaultValue: '0.14',
description: '-Dcudf.version= \n\n Default for cudf version')
string(name: 'CUDA_CLASSIFIER', defaultValue: '',
description: '-Dclassifier=\n\n cuda10-1, cuda10-2, EMPTY as cuda10-1')
Expand Down
4 changes: 2 additions & 2 deletions jenkins/Jenkinsfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pipeline {
-v ${HOME}/.zinc:${HOME}/.zinc:rw \
-v /etc/passwd:/etc/passwd -v /etc/group:/etc/group") {
sh "mvn -U -B clean deploy $MVN_URM_MIRROR"
sh "jenkins/printJarVersion.sh 'CUDFVersion' '${HOME}/.m2/repository/ai/rapids/cudf/0.14-SNAPSHOT' 'cudf-0.14-' '-cuda10-1.jar'"
sh "jenkins/printJarVersion.sh 'CUDFVersion' '${HOME}/.m2/repository/ai/rapids/cudf/0.14' 'cudf-0.14' '-cuda10-1.jar'"
sh "jenkins/printJarVersion.sh 'SPARKVersion' '${HOME}/.m2/repository/org/apache/spark/spark-core_2.12/3.0.1-SNAPSHOT' 'spark-core_2.12-3.0.1-' '.jar'"
}
}
Expand All @@ -78,7 +78,7 @@ pipeline {
build(job: 'spark/rapids_integration-0.1-github',
propagate: false,
parameters: [string(name: 'REF', value: 'branch-0.1'),
string(name: 'CUDF_VER', value: '0.14-SNAPSHOT'),
string(name: 'CUDF_VER', value: '0.14'),
booleanParam(name: 'BUILD_CENTOS7', value: false),])

slack("#rapidsai-spark-cicd", "Success", color: "#33CC33")
Expand Down
2 changes: 2 additions & 0 deletions jenkins/spark-premerge-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

set -ex

nvidia-smi

if [ "$SPARK_VER"x == x ];then
SPARK_VER="3.0.1-SNAPSHOT"
fi
Expand Down
2 changes: 1 addition & 1 deletion jenkins/spark-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

set -ex
if [ "$CUDF_VER"x == x ];then
CUDF_VER="0.14-SNAPSHOT"
CUDF_VER="0.14"
fi

if [ "$PROJECT_VER"x == x ];then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ object GpuDeviceManager extends Logging {
GpuDeviceManager.setGpuDeviceAndAcquire(addr)
} catch {
case NonFatal(e) =>
logInfo(s"Will not use GPU $addr because of $e")
// we may have lost a race trying to acquire this addr or GPU is already busy
return false
}
Expand Down