From ba8bd804cf71bb1685d57d30e4396bccbe61a13f Mon Sep 17 00:00:00 2001
From: Peter <peter@neurallayer.com>
Date: Sat, 23 May 2020 00:06:02 +0200
Subject: [PATCH] Add cuda102 docker support and updated gquant version (#84)

updated docker build and version number
---
 .gitignore      |  2 ++
 docker/build.sh | 18 +++++++++++-------
 setup.py        |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 docker/build.sh

diff --git a/.gitignore b/.gitignore
index c2babddf..b95d728b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ dist/
 build/
 gquant.egg-info/
 *.swp
+docker/Dockerfile.Rapids
+docker/gQuant
diff --git a/docker/build.sh b/docker/build.sh
old mode 100644
new mode 100755
index e9cbb744..9f3d96e7
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -28,9 +28,10 @@ esac
 echo -e "\nPlease, select your cuda version:\n" \
      " - '1' for cuda 9.2\n" \
      " - '2' for cuda 10.0\n" \
-     " - '3' for cuda 10.1.2"
+     " - '3' for cuda 10.1.2\n" \
+     " - '4' for cuda 10.2"
 
-read -p "Enter your option and hit return [1]-3: " CUDA_VERSION
+read -p "Enter your option and hit return [1]-4: " CUDA_VERSION
 
 RAPIDS_VERSION="0.13"
 
@@ -44,6 +45,10 @@ case $CUDA_VERSION in
 	echo "cuda 10.1.2 selected."
 	CONTAINER_VER='10.1'
 	;;
+    4)
+	echo "cuda 10.2 selected."
+	CONTAINER_VER='10.2'
+	;;
     *)
 	echo "cuda 9.2 selected."
 	CONTAINER_VER='9.2'
@@ -60,6 +65,7 @@ cp -r ../task_example ./gQuant
 cp ../setup.cfg ./gQuant
 cp ../setup.py ./gQuant
 cp ../LICENSE ./gQuant
+cp ../download_data.sh ./gQuant
 rsync -av --progress ../notebooks ./gQuant --exclude data --exclude .cache --exclude many-small --exclude storage --exclude dask-worker-space --exclude __pycache__
 
 gquant_ver=$(grep version gQuant/setup.py | sed "s/^.*version='\([^;]*\)'.*/\1/")
@@ -84,15 +90,13 @@ RUN source activate rapids \
     && cd /rapids/gQuant \
     && pip install .
 RUN source activate rapids \ 
-    && conda install -y -c conda-forge dask-labextension recommonmark numpydoc sphinx_rtd_theme pudb \
-    python-graphviz bqplot=0.11.5 nodejs=11.11.0 jupyterlab=0.35.4 ipywidgets=7.4.2 pytables mkl numexpr \
-    pydot
+    && conda install -y -c conda-forge python-graphviz bqplot nodejs ipywidgets pytables mkl numexpr pydot
 #
 # required set up
 #
 RUN source activate rapids \ 
-    && jupyter labextension install @jupyter-widgets/jupyterlab-manager@0.38.1 --no-build \
-    && jupyter labextension install bqplot@0.4.5 --no-build \
+    && jupyter labextension install @jupyter-widgets/jupyterlab-manager --no-build \
+    && jupyter labextension install bqplot --no-build \
     && mkdir /.local /.jupyter /.config /.cupy  \
     && chmod 777 /.local /.jupyter /.config /.cupy
 RUN source activate rapids \ 
diff --git a/setup.py b/setup.py
index 1979587e..10439dcf 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='gquant',
-    version='0.3',
+    version='0.4',
     description='gquant - RAPIDS Financial Services Algorithms',
     author='NVIDIA Corporation',
     packages=find_packages(include=['gquant', 'gquant.*']),