Merge gpu into dockerfile

.github/workflows/publish.yml

@@ -42,18 +42,6 @@ jobs:
         cache: true
         tag_names: true
 
-    - name: Publish cml-gpu docker image
-      if: github.event_name == 'push' && (contains(github.ref, 'tags') || github.ref == 'refs/heads/master')
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: dvcorg/cml-gpu
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
-        dockerfile: ./docker/Dockerfile-gpu
-        context: ./
-        cache: true
-        tag_names: true
-
     - name: Publish cml-py3 docker image
       if: github.event_name == 'push' && (contains(github.ref, 'tags') || github.ref == 'refs/heads/master')
       uses: elgohr/Publish-Docker-Github-Action@master
@@ -69,21 +57,6 @@ jobs:
         tag_names: true
         buildargs: DOCKER_FROM
 
-    - name: Publish cml-gpu-py3 docker image
-      if: github.event_name == 'push' && (contains(github.ref, 'tags') || github.ref == 'refs/heads/master')
-      uses: elgohr/Publish-Docker-Github-Action@master
-      env:
-        DOCKER_FROM: cml-gpu
-      with:
-        name: dvcorg/cml-gpu-py3
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
-        dockerfile: ./docker/Dockerfile-py3
-        context: ./
-        cache: true
-        tag_names: true
-        buildargs: DOCKER_FROM
-
     - name: Publish cml-dev docker image
       if: github.event_name == 'push' && (contains(github.ref, 'tags') || github.ref == 'refs/heads/master')
       uses: elgohr/Publish-Docker-Github-Action@master
@@ -100,7 +73,14 @@ jobs:
     - name: Alias cloud-runner
       if: github.event_name == 'push' && (contains(github.ref, 'tags') || github.ref == 'refs/heads/master')
       run: | 
-        echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin 
+        echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+         
+        docker tag dvcorg/cml dvcorg/cml-gpu
+        docker push dvcorg/cml-gpu
+
+        docker tag dvcorg/cml-py3 dvcorg/cml-gpu-py3
+        docker push dvcorg/cml-gpu-py3
+
         docker tag dvcorg/cml dvcorg/cml-cloud-runner
         docker push dvcorg/cml-cloud-runner
 

docker/Dockerfile

@@ -1,4 +1,8 @@
-FROM ubuntu:18.04
+ARG ARCH=
+ARG CUDA=10.1
+ARG UBUNTU_VERSION=18.04
+
+FROM nvidia/cuda${ARCH:+-$ARCH}:${CUDA}-base-ubuntu${UBUNTU_VERSION} as base
 
 LABEL maintainer="dvc.org"
 
@@ -41,6 +45,47 @@ RUN wget https://dvc.org/deb/dvc.list -O /etc/apt/sources.list.d/dvc.list && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# CUDNN
+ARG CUDA
+ARG CUDNN=7.6.4.38-1
+ARG CUDNN_MAJOR=7
+ARG LIBNVINFER=6.0.1-1
+ARG LIBNVINFER_MAJOR=6
+ARG CUBLAS=10.2.1.243-1
+ARG CUBLAS_MAJOR=10
+
+SHELL ["/bin/bash", "-c"]
+
+RUN apt update && apt-get install -y --no-install-recommends \
+    cuda-command-line-tools-${CUDA/./-} \
+    libcublas${CUBLAS_MAJOR}=${CUBLAS} \
+    cuda-nvrtc-${CUDA/./-} \
+    cuda-cufft-${CUDA/./-} \
+    cuda-curand-${CUDA/./-} \
+    cuda-cusolver-${CUDA/./-} \
+    cuda-cusparse-${CUDA/./-} \
+    libcudnn${CUDNN_MAJOR}=${CUDNN}+cuda${CUDA} \
+    libfreetype6-dev \
+    libhdf5-serial-dev \
+    libzmq3-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
+
+# TENSORFLOW
+RUN apt update && \
+    apt-get install -y --no-install-recommends \
+        libnvinfer${LIBNVINFER_MAJOR}=${LIBNVINFER}+cuda${CUDA} \
+        libnvinfer-plugin${LIBNVINFER_MAJOR}=${LIBNVINFER}+cuda${CUDA} && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* && \
+    ln -s /usr/local/cuda/lib64/stubs/libcuda.so \
+            /usr/local/cuda/lib64/stubs/libcuda.so.1 && \
+    echo /usr/local/cuda/lib64/stubs > /etc/ld.so.conf.d/z-cuda-stubs.conf && \
+    ldconfig
+# TENSORFLOW ENDS
+
 # DOCKER, OUR CUSTOM DOCKER MACHINE FORK, GITLAB RUNNER AND GITHUB RUNNER
 # OUR DOCKER_MACHINE FORK SUPPORTS GPU ACCELARATOR
 ENV RUNNER_PATH=/home/runner
@@ -66,4 +111,4 @@ RUN wget -O /usr/local/bin/gitlab-runner https://gitlab-runner-downloads.s3.amaz
     ./bin/installdependencies.sh && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-CMD ["cml-cloud-runner-entrypoint"]
+CMD ["cml-cloud-runner-entrypoint"]