Skip to content

Commit

Permalink
Migrate nightly&integration pipelines to blossom [skip ci] (NVIDIA#862)
Browse files Browse the repository at this point in the history
* migrate nightly to blossom

Signed-off-by: Peixin Li <pxli@nyu.edu>

* fix license 2019 and 2020 for dockerfiles

* fix ARGs in dockerfiles of integration test
  • Loading branch information
pxLi authored and sperlingxx committed Nov 20, 2020
1 parent 4614f8b commit de5937a
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 9 deletions.
56 changes: 56 additions & 0 deletions jenkins/Dockerfile-blossom.integration.centos7
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

###
#
# Arguments:
# CUDA_VER=10.1 or 10.2
# CUDF_VER=0.15 or 0.16-SNAPSHOT
# URM_URL=<maven repo url>
###
ARG CUDA_VER=10.1
ARG CUDF_VER
ARG URM_URL

FROM nvidia/cuda:${CUDA_VER}-runtime-centos7

#Install java-8, maven, docker image
RUN yum update -y && \
yum install -y centos-release-scl && \
yum install -y java-1.8.0-openjdk-devel wget expect

# The default mvn verision is 3.05 on centos7 docker container.
# The plugin: net.alchim31.maven requires a higher mvn version.
ENV MAVEN_HOME "/usr/local/apache-maven-3.6.3"
RUN wget ${URM_URL}/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz -P /usr/local && \
tar xzvf $MAVEN_HOME-bin.tar.gz -C /usr/local && \
rm -f $MAVEN_HOME-bin.tar.gz

RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm -f ~/miniconda.sh

ENV PATH="/opt/conda/bin:$MAVEN_HOME/bin:${PATH}"

# 'pyarrow' and 'pandas' will be installed as the dependencies of cudf below
RUN conda install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.7 cudatoolkit=${CUDA_VER} && \
conda install -y spacy && python -m spacy download en_core_web_sm && \
conda install -y -c anaconda pytest requests && \
conda install -y -c conda-forge sre_yield && \
conda clean -ay

# Set ENV for mvn
ENV JAVA_HOME "/usr/lib/jvm/java-1.8.0-openjdk"
12 changes: 6 additions & 6 deletions jenkins/Dockerfile.integration.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@

###
#
# Arguments: CUDA_VER=10.1 or 10.2
#
# Arguments:
# CUDA_VER=10.1 or 10.2
# CUDF_VER=0.15 or 0.16-SNAPSHOT
# URM_URL=<maven repo url>
###
ARG CUDA_VER=10.1

FROM nvidia/cuda:${CUDA_VER}-runtime-centos7

ARG CUDA_VER=10.1
ARG CUDF_VER
ARG URM_URL

FROM nvidia/cuda:${CUDA_VER}-runtime-centos7

#Install java-8, maven, docker image
RUN yum update -y && \
yum install -y centos-release-scl && \
Expand Down
2 changes: 1 addition & 1 deletion jenkins/Dockerfile.integration.ubuntu16
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
9 changes: 7 additions & 2 deletions jenkins/spark-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

set -ex

nvidia-smi

. jenkins/version-def.sh

ARTF_ROOT="$WORKSPACE/jars"
Expand Down Expand Up @@ -59,7 +61,9 @@ tar zxf $SPARK_HOME.tgz -C $ARTF_ROOT && \
PARQUET_PERF="$WORKSPACE/integration_tests/src/test/resources/parquet_perf"
PARQUET_ACQ="$WORKSPACE/integration_tests/src/test/resources/parquet_acq"
OUTPUT="$WORKSPACE/output"
BASE_SPARK_SUBMIT_ARGS="--master spark://$HOSTNAME:7077 --executor-memory 32G \
BASE_SPARK_SUBMIT_ARGS="--master spark://$HOSTNAME:7077 \
--executor-memory 12G \
--total-executor-cores 6 \
--conf spark.sql.shuffle.partitions=12 \
--conf spark.driver.extraClassPath=${CUDF_JAR}:${RAPIDS_PLUGIN_JAR} \
--conf spark.executor.extraClassPath=${CUDF_JAR}:${RAPIDS_PLUGIN_JAR} \
Expand All @@ -75,7 +79,8 @@ CUDF_UDF_TEST_ARGS="--conf spark.rapids.memory.gpu.allocFraction=0.1 \
--conf spark.rapids.python.memory.gpu.allocFraction=0.1 \
--conf spark.rapids.python.concurrentPythonWorkers=2 \
--conf spark.executorEnv.PYTHONPATH=${RAPIDS_FILE_NAME} \
--py-files ${RAPIDS_PLUGIN_JAR}"
--conf spark.pyspark.python=/opt/conda/bin/python \
--py-files ${RAPIDS_PLUGIN_JAR}" # explicitly specify python binary path in env w/ multiple python versions

TEST_PARAMS="$SPARK_VER $PARQUET_PERF $PARQUET_ACQ $OUTPUT"

Expand Down

0 comments on commit de5937a

Please sign in to comment.