Merge branch 'main' into branch-0.18

CHANGELOG.md

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # BlazingSQL 0.18.0 (February 24, 2021)
+=======
+# BlazingSQL 0.17.0 (December 10, 2020)
+>>>>>>> main
 
 ## New Features
 - #1139 Adding centralized task executor for kernels
@@ -72,8 +76,13 @@
 - #1201 Implement string TRIM
 - #1216 Add unit test for DAYOFWEEK
 - #1205 Implement string REVERSE
+<<<<<<< HEAD
 - #1220 Implement string LEFT and RIGHT
 - #1223 Add support for UNION statement
+=======
+- #1220 Implement string LEFT and RIGHT 
+- #1250 updated README.md and CHANGELOG and others preparing for 0.17 release
+>>>>>>> main
 
 
 ## Improvements
@@ -102,6 +111,7 @@
 - #1224 Added cudaSetDevice to thread initialization so that the cuda context is available to UCX
 - #1229 Change hardcoded version from setup.py
 - #1231 Adding docker support for gpuCI scripts
+- #1248 Jenkins and Docker scripts were improved for building
 
 
 ## Bug Fixes
@@ -129,8 +139,13 @@
 - #1203 Changed code back so that parquet is not read a single rowgroup at a time
 - #1207 Calcite uses literal as int32 if not explicit CAST was provided
 - #1212 Fixed issue when building the thirdpart, cmake version set to 3.18.4
+<<<<<<< HEAD
 - #1225 Fixed issue due to change in gather API
 - #1258 Fixing gtest version issue
+=======
+- #1225 Fixed issue due to change in gather API 
+- #1254 Fixing support of nightly and stable on localhost
+>>>>>>> main
 
 
 # BlazingSQL 0.16.0 (October 22, 2020)

README.md

@@ -118,17 +118,27 @@ This is the recommended way of building all of the BlazingSQL components and dep
 conda create -n bsql python=$PYTHON_VERSION
 conda activate bsql
 conda install --yes -c conda-forge spdlog=1.7.0 google-cloud-cpp=1.16 ninja
+<<<<<<< HEAD
 conda install --yes -c rapidsai -c nvidia -c conda-forge -c defaults dask-cuda=0.18 dask-cudf=0.18 cudf=0.18 ucx-py=0.18 ucx-proc=*=gpu python=3.7 cudatoolkit=$CUDA_VERSION
 conda install --yes -c conda-forge cmake=3.18 gtest gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive tqdm ipywidgets
+=======
+conda install --yes -c rapidsai -c nvidia -c conda-forge -c defaults dask-cuda=0.17 dask-cudf=0.17 cudf=0.17 ucx-py=0.17 ucx-proc=*=gpu python=3.7 cudatoolkit=$CUDA_VERSION
+conda install --yes -c conda-forge cmake=3.18 gtest gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive
+>>>>>>> main
 ```
 Where $CUDA_VERSION is is 10.1, 10.2 or 11.0 and $PYTHON_VERSION is 3.7 or 3.8
 *For example for CUDA 10.1 and Python 3.7:*
 ```bash
 conda create -n bsql python=3.7
 conda activate bsql
 conda install --yes -c conda-forge spdlog=1.7.0 google-cloud-cpp=1.16 ninja
+<<<<<<< HEAD
 conda install --yes -c rapidsai -c nvidia -c conda-forge -c defaults dask-cuda=0.18 dask-cudf=0.18 cudf=0.18 ucx-py=0.18 ucx-proc=*=gpu python=3.7 cudatoolkit=10.1
 conda install --yes -c conda-forge cmake=3.18 gtest gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive tqdm ipywidgets
+=======
+conda install --yes -c rapidsai -c nvidia -c conda-forge -c defaults dask-cuda=0.17 dask-cudf=0.17 cudf=0.17 ucx-py=0.17 ucx-proc=*=gpu python=3.7 cudatoolkit=10.1
+conda install --yes -c conda-forge cmake=3.18 gtest gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive
+>>>>>>> main
 ```
 
 ### Build
@@ -153,17 +163,27 @@ $CONDA_PREFIX now has a folder for the blazingsql repository.
 conda create -n bsql python=$PYTHON_VERSION
 conda activate bsql
 conda install --yes -c conda-forge spdlog=1.7.0 google-cloud-cpp=1.16 ninja
+<<<<<<< HEAD
 conda install --yes -c rapidsai-nightly -c nvidia -c conda-forge -c defaults dask-cuda=0.19 dask-cudf=0.19 cudf=0.19 ucx-py=0.19 ucx-proc=*=gpu python=3.7 cudatoolkit=$CUDA_VERSION
 conda install --yes -c conda-forge cmake=3.18 gtest==1.10.0=h0efe328_4 gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive tqdm ipywidgets
+=======
+conda install --yes -c rapidsai-nightly -c nvidia -c conda-forge -c defaults dask-cuda=0.18 dask-cudf=0.18 cudf=0.18 ucx-py=0.18 ucx-proc=*=gpu python=3.7 cudatoolkit=$CUDA_VERSION
+conda install --yes -c conda-forge cmake=3.18 gtest gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive
+>>>>>>> main
 ```
 Where $CUDA_VERSION is is 10.1, 10.2 or 11.0 and $PYTHON_VERSION is 3.7 or 3.8
 *For example for CUDA 10.1 and Python 3.7:*
 ```bash
 conda create -n bsql python=3.7
 conda activate bsql
 conda install --yes -c conda-forge spdlog=1.7.0 google-cloud-cpp=1.16 ninja
+<<<<<<< HEAD
 conda install --yes -c rapidsai-nightly -c nvidia -c conda-forge -c defaults dask-cuda=0.19 dask-cudf=0.19 cudf=0.19 ucx-py=0.19 ucx-proc=*=gpu python=3.7 cudatoolkit=10.1
 conda install --yes -c conda-forge cmake=3.18 gtest==1.10.0=h0efe328_4 gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive tqdm ipywidgets
+=======
+conda install --yes -c rapidsai-nightly -c nvidia -c conda-forge -c defaults dask-cuda=0.18 dask-cudf=0.18 cudf=0.18 ucx-py=0.18 ucx-proc=*=gpu python=3.7 cudatoolkit=10.1
+conda install --yes -c conda-forge cmake=3.18 gtest gmock cppzmq cython=0.29 openjdk=8.0 maven jpype1 netifaces pyhive
+>>>>>>> main
 ```
 
 ### Build

conda-build-docker.sh

@@ -30,13 +30,21 @@
 # BLAZING_GPUCI_JOB=gpu-build ./conda-build-docker.sh cudf_version cuda_version python_version
 #
 # Run only the CPU BUILD job and upload the blazingsql package to your conda channel with the label main
+<<<<<<< HEAD
 # BLAZING_GPUCI_JOB=cpu-build ./conda-build-docker.sh 0.18 10.2 3.7 conda_token main conda_username
+=======
+# BLAZING_GPUCI_JOB=cpu-build ./conda-build-docker.sh 0.17 10.0 3.7 conda_token main conda_username
+>>>>>>> main
 #
 # Run GPUCI jobs with defaults:
 # ./conda-build-docker.sh
 # ================================================================
 # NOTE Defaults:
+<<<<<<< HEAD
 # cudf_version=0.18
+=======
+# cudf_version=0.17
+>>>>>>> main
 # cuda_version=10.2
 # python_version=3.7
 # conda_token=""
@@ -82,14 +90,23 @@ HELP="# ================================================================
 # BLAZING_GPUCI_JOB=gpu-build ./conda-build-docker.sh cudf_version cuda_version python_version
 #
 # Run only the CPU BUILD job and upload the blazingsql package to your conda channel with the label main
+<<<<<<< HEAD
 # BLAZING_GPUCI_JOB=cpu-build ./conda-build-docker.sh 0.18 10.2 3.7 conda_token main conda_username
+=======
+# BLAZING_GPUCI_JOB=cpu-build ./conda-build-docker.sh 0.17 10.0 3.7 conda_token main conda_username
+>>>>>>> main
 #
 # Run GPUCI jobs with defaults:
 # ./conda-build-docker.sh
 # ================================================================
 # NOTE Defaults:
+<<<<<<< HEAD
 # cudf_version=0.18
 # cuda_version=10.2
+=======
+# cudf_version=0.17
+# cuda_version=10.1
+>>>>>>> main
 # python_version=3.7
 # conda_token=""
 # custom_label=""
@@ -126,7 +143,11 @@ if [ -z $BLAZING_GPUCI_OS ]; then
     echo "BLAZING_GPUCI_OS: $BLAZING_GPUCI_OS"
 fi
 
+<<<<<<< HEAD
 CUDF_VERSION="0.18"
+=======
+CUDF_VERSION="0.17"
+>>>>>>> main
 if [ ! -z $1 ]; then
     CUDF_VERSION=$1
 fi