Merge pull request #232 from ayushdg/dask-sql

Update gpu-bdb slurm Dockerfile

conda/rapids-gpu-bdb-dask-sql.yml → conda/rapids-gpu-bdb-dask-sql-cuda11.2.yml

@@ -16,7 +16,7 @@ dependencies:
   - ucx-py
   - ucx-proc=*=gpu
   - dask-sql>=2022.1
-  - numba=0.54.*
+  - numba>=0.54.*
   - scipy
   - scikit-learn
   - cupy

gpu_bdb/bdb_tools/utils.py

@@ -246,8 +246,9 @@ def remove_benchmark_files():
 def run_query(
     config, client, query_func, write_func=write_result, sql_context=None
 ):
+    QUERY_NUM = get_query_number()
     if config.get("dask_profile"):
-        with performance_report(filename="profile.html"): 
+        with performance_report(filename=f"q{QUERY_NUM}_profile.html"): 
             if sql_context:
                 run_sql_query(
                     config=config,

gpu_bdb/benchmark_runner/slurm/Dockerfile

@@ -1,23 +1,23 @@
-ARG CUDA_VER=11.0
+ARG CUDA_VER=11.2.0
 ARG LINUX_VER=ubuntu18.04
 
 FROM nvidia/cuda:${CUDA_VER}-devel-${LINUX_VER}
 
-RUN apt update -y && apt upgrade -y && apt install -y git
+RUN apt update -y && apt-get --fix-missing upgrade -y && apt install -y git
 
 ADD https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh /miniconda.sh
 RUN bash /miniconda.sh -b -p /opt/conda
 
 
-ENV GCC_VERSION=7
-ENV CXX_VERSION=7
+ENV GCC_VERSION=9
+ENV CXX_VERSION=9
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
 ARG CONDA_HOME=/opt/conda
 ENV CONDA_HOME="$CONDA_HOME"
 
-ENV CUDA_HOME="/usr/local/cuda-11.0"
+ENV CUDA_HOME="/usr/local/cuda-11.2"
 ENV CUDA_PATH="$CUDA_HOME"
 
 ARG CUDA_SHORT_VERSION
@@ -34,8 +34,8 @@ SHELL ["/bin/bash", "-c"]
 
 ENV CONDA_ENV="rapids-gpu-bdb"
 
-COPY /rapids-gpu-bdb-cuda11.yml /rapids-gpu-bdb-cuda11.yml
-RUN conda env create --name ${CONDA_ENV} --file /rapids-gpu-bdb-cuda11.yml
+COPY /rapids-gpu-bdb-cuda11.2.yml /rapids-gpu-bdb-cuda11.2.yml
+RUN conda env create --name ${CONDA_ENV} --file /rapids-gpu-bdb-cuda11.2.yml
 RUN conda install -n ${CONDA_ENV} -c conda-forge spacy oauth2client gspread -q -y
 RUN source activate ${CONDA_ENV} && python -m spacy download en_core_web_sm
 
@@ -51,7 +51,7 @@ RUN set -x \
  && apt install -y --fix-missing software-properties-common \
  && add-apt-repository -y ppa:git-core/ppa || true \
  && apt install -y --fix-missing --no-install-recommends \
-    ed vim nano less git wget sudo tzdata \
+    ed vim bc nano less git wget sudo tzdata \
     apt-utils apt-transport-https \
     gcc g++ ninja-build bash-completion \
     curl libssl-dev libcurl4-openssl-dev zlib1g-dev \
@@ -73,8 +73,7 @@ ADD https://www.mellanox.com/downloads/ofed/MLNX_OFED-5.2-2.2.0.0/MLNX_OFED_LINU
 
 RUN tar -xzf /MLNX_OFED_LINUX-5.2-2.2.0.0-ubuntu18.04-x86_64.tgz && \
  cd MLNX_OFED_LINUX-5.2-2.2.0.0-ubuntu18.04-x86_64 && \
- apt-get update && apt-get install -y --no-install-recommends \
-    ./DEBS/libibverbs* ./DEBS/ibverbs-providers* \
+ echo y | ./mlnxofedinstall --user-space-only --without-fw-update --without-neohost-backend\
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /MLNX_OFED_LINUX*
 
@@ -84,38 +83,6 @@ RUN /opt/conda/bin/conda install -n $CONDA_ENV -c conda-forge autoconf cython au
                                  pkg-config m4 \
                                  --force --no-deps -y -q
 
-
-# Install UCX
-RUN git clone --recurse-submodules -b v1.9.x https://github.com/openucx/ucx /tmp/ucx \
- && cd /tmp/ucx \
- && source activate $CONDA_ENV \
- && ./autogen.sh \
- && ./configure \
-    --prefix="${CONDA_PREFIX}" \
-    --with-sysroot \
-    --enable-cma \
-    --enable-mt \
-    --enable-numa \
-    --with-gnu-ld \
-    --with-cm \
-    --with-rdmacm \
-    --with-verbs \
-    --with-cuda="${CUDA_HOME}" \
- && make -j${PARALLEL_LEVEL} \
- && make install
-
-# Install UCX-py
-RUN set -x \
- && git clone --recurse-submodules -j${PARALLEL_LEVEL} -b branch-0.19 https://github.com/rapidsai/ucx-py.git /tmp/ucx-py \
- && source activate $CONDA_ENV \
- && cd /tmp/ucx-py \
- && python setup.py build_ext --inplace \
- && python -m pip install . --no-deps --no-cache-dir -vvvv \
- && rm -rf /tmp/ucx-py
-
-# use login shell when exec'ing into the container
-# SHELL ["/bin/bash", "-l"]
-
 ADD creds.json /creds.json
 ENV GOOGLE_SHEETS_CREDENTIALS_PATH=/creds.json
 

gpu_bdb/benchmark_runner/slurm/rapids-gpu-bdb-cuda11.yml → gpu_bdb/benchmark_runner/slurm/rapids-gpu-bdb-cuda11.2.yml

@@ -5,15 +5,14 @@ channels:
 
 dependencies:
   - python=3.8
-  - cudatoolkit=11.0
+  - cudatoolkit=11.2
   - cudf
   - rmm
   - dask-cuda
   - dask-cudf
   - cuml
   - dask
   - distributed
-  - blazingsql
   - scipy
   - scikit-learn
   - spacy=2.3
@@ -24,6 +23,9 @@ dependencies:
   - jupyterlab
   - gspread
   - oauth2client
+  - numba>=0.54.*
+  - maven
+  - google-api-python-client
   - pip
   - pip:
     - jupyter-server-proxy