diff --git a/jenkins/Dockerfile-blossom.integration.rocky b/jenkins/Dockerfile-blossom.integration.rocky index 17fb6fe6107..ca4d5a5db0f 100644 --- a/jenkins/Dockerfile-blossom.integration.rocky +++ b/jenkins/Dockerfile-blossom.integration.rocky @@ -46,8 +46,9 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86 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 conda-forge mamba=1.4.9 libarchive && \ - mamba install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.9 cuda-toolkit=${CUDA_VER} && \ +RUN export CUDA_VER=`echo ${CUDA_VER} | cut -d '.' -f 1,2` && \ + conda install -y -c conda-forge mamba=1.4.9 libarchive && \ + mamba install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.9 cuda-version=${CUDA_VER} && \ mamba install -y spacy && python -m spacy download en_core_web_sm && \ mamba install -y -c anaconda pytest requests && \ mamba install -y -c conda-forge sre_yield && \ diff --git a/jenkins/Dockerfile-blossom.integration.ubuntu b/jenkins/Dockerfile-blossom.integration.ubuntu index 9a0d012268c..a4e6509098b 100644 --- a/jenkins/Dockerfile-blossom.integration.ubuntu +++ b/jenkins/Dockerfile-blossom.integration.ubuntu @@ -58,8 +58,9 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86 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 conda-forge mamba=1.4.9 libarchive && \ - mamba install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.9 cuda-toolkit=${CUDA_VER} && \ +RUN export CUDA_VER=`echo ${CUDA_VER} | cut -d '.' -f 1,2` && \ + conda install -y -c conda-forge mamba=1.4.9 libarchive && \ + mamba install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.9 cuda-version=${CUDA_VER} && \ mamba install -y spacy && python -m spacy download en_core_web_sm && \ mamba install -y -c anaconda pytest requests && \ mamba install -y -c conda-forge sre_yield && \ diff --git a/jenkins/databricks/init_cudf_udf.sh b/jenkins/databricks/init_cudf_udf.sh index c36b9f426bc..163bbc9cfbe 100755 --- a/jenkins/databricks/init_cudf_udf.sh +++ b/jenkins/databricks/init_cudf_udf.sh @@ -21,7 +21,7 @@ set -ex CUDF_VER=${CUDF_VER:-23.08} -CUDA_VER=${CUDA_VER:-11.8.0} +CUDA_VER=${CUDA_VER:-11.8} # Need to explicitly add conda into PATH environment, to activate conda environment. export PATH=/databricks/conda/bin:$PATH @@ -50,7 +50,7 @@ conda install -y -c conda-forge mamba python=$PYTHON_VERSION ${base}/envs/cudf-udf/bin/mamba remove -y c-ares zstd libprotobuf pandas || true REQUIRED_PACKAGES=( - cuda-toolkit=$CUDA_VER + cuda-version=$CUDA_VER cudf=$CUDF_VER findspark pandas