Merge pull request #346 from rapidsai/branch-22.02

CHANGELOG.md

@@ -1,6 +1,25 @@
-# cuXfilter 21.12.00 (Date TBD)
+# cuXfilter 22.02.00 (2 Feb 2022)
 
-Please see https://github.com/rapidsai/cuxfilter/releases/tag/v21.12.00a for the latest changes to this development branch.
+## 🐛 Bug Fixes
+
+- fix einit function ([#345](https://github.com/rapidsai/cuxfilter/pull/345)) [@AjayThove](https://github.com/AjayThove)
+
+## 📖 Documentation
+
+- Documentation & Notebook updates ([#341](https://github.com/rapidsai/cuxfilter/pull/341)) [@AjayThove](https://github.com/AjayThove)
+- Mege banch-21.12 into banch-22.02 ([#340](https://github.com/rapidsai/cuxfilter/pull/340)) [@AjayThove](https://github.com/AjayThove)
+- Fix/emove custom extensions ([#324](https://github.com/rapidsai/cuxfilter/pull/324)) [@AjayThove](https://github.com/AjayThove)
+
+## 🛠️ Impovements
+
+- eplace distutils.vesion class with packaging.vesion.Vesion ([#338](https://github.com/rapidsai/cuxfilter/pull/338)) [@AjayThove](https://github.com/AjayThove)
+- Fix impots tests syntax ([#336](https://github.com/rapidsai/cuxfilter/pull/336)) [@Ethyling](https://github.com/Ethyling)
+
+# cuXfilter 21.12.00 (9 Dec 2021)
+
+## 📖 Documentation
+
+- update docstrings examples to fix #328 ([#329](https://github.com/rapidsai/cuxfilter/pull/329)) [@AjayThorve](https://github.com/AjayThorve)
 
 # cuXfilter 21.10.00 (7 Oct 2021)
 

README.md

@@ -42,7 +42,10 @@ The original version (0.2) of cuxfilter, most known for the backend powering the
 
 ## Usage
 
-### Example 1
+### Example 1 
+[![Open In Studio Lab](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/rapidsai/cuxfilter/blob/branch-22.02/notebooks/auto_accidents_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Studio Lab Environment-gray.svg">](./notebooks/README.md#amazon-sagemaker-studio-lab)
+
+[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/rapidsai/cuxfilter/blob/branch-22.02/notebooks/auto_accidents_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Colab Environment-gray.svg">](./notebooks/README.md#google-colab)
 
 ```python
 import cuxfilter
@@ -68,13 +71,20 @@ chart4 = cuxfilter.charts.bar('MONTH')
 
 #declare dashboard
 d = cux_df.dashboard([chart1, chart3, chart4], sidebar=[chart2], layout=cuxfilter.layouts.feature_and_double_base, title='Auto Accident Dataset')
+
 #run the dashboard as a webapp:
-d.show('jupyter-notebook/lab-url')
+# d.show('jupyter-notebook/lab-url')
+
+#run the dashboard within the notebook cell
+d.app()
+
 ```
 ![output dashboard](./docs/_images/demo.gif)
 
-### Example 2
-
+### Example 2 
+[![Open In Studio Lab](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/rapidsai/cuxfilter/blob/branch-22.02/notebooks/Mortgage_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Studio Lab Environment-gray.svg">](./notebooks/README.md#amazon-sagemaker-studio-lab)
+
+[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/rapidsai/cuxfilter/blob/branch-22.02/notebooks/Mortgage_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Colab Environment-gray.svg">](./notebooks/README.md#google-colab)
 
 ```python
 import cuxfilter
@@ -100,8 +110,12 @@ chart1 = cuxfilter.charts.drop_down('dti')
 #declare dashboard
 d = cux_df.dashboard([chart0, chart2],sidebar=[chart3, chart1], layout=cuxfilter.layouts.feature_and_double_base,theme = cuxfilter.themes.light, title='Mortgage Dashboard')
 
+#run the dashboard within the notebook cell
+# d.app()
+
 #run the dashboard as a webapp:
 d.show('jupyter-notebook/lab-url')
+
 ```
 ![output dashboard](./docs/_images/demo2.gif)
 
@@ -143,27 +157,19 @@ Please see the [Demo Docker Repository](https://hub.docker.com/r/rapidsai/rapids
 
 cuxfilter can be installed with conda ([miniconda](https://conda.io/miniconda.html), or the full [Anaconda distribution](https://www.anaconda.com/download)) from the `rapidsai` channel:
 
-For `cuxfilter version == 21.12` :
+For `cuxfilter version == 22.02` :
 ```bash
-# for CUDA 11.0
+# for CUDA 11.5
 conda install -c rapidsai -c nvidia -c numba -c conda-forge \
-    cuxfilter=21.12 python=3.7 cudatoolkit=11.0
-
-# or, for CUDA 11.2
-conda install -c rapidsai -c nvidia -c numba -c conda-forge \
-    cuxfilter=21.12 python=3.7 cudatoolkit=11.2
+    cuxfilter=22.02 python=3.7 cudatoolkit=11.5
 
 ```
 
 For the nightly version of `cuxfilter` :
 ```bash
-# for CUDA 11.0
-conda install -c rapidsai-nightly -c nvidia -c numba -c conda-forge \
-    cuxfilter python=3.7 cudatoolkit=11.0
-
-# or, for CUDA 11.2
+# for CUDA 11.5
 conda install -c rapidsai-nightly -c nvidia -c numba -c conda-forge \
-    cuxfilter python=3.7 cudatoolkit=11.2
+    cuxfilter python=3.7 cudatoolkit=11.5
 ```
 
 Note: cuxfilter is supported only on Linux, and with Python versions 3.7 and later.
@@ -207,6 +213,8 @@ The notebooks inside `python/notebooks` already have a check function which veri
 
 While in the directory you want the datasets to be saved, execute the following
 
+> Note: Auto Accidents dataset has corrupted coordinate data from the years 2012-2014
+
 ```bash
 #go the the environment where cuxfilter is installed. Skip if in a docker container
 source activate test_env
@@ -232,7 +240,6 @@ Currently supported layout templates and example code can be found on the [layou
 | custom    | view_dataframe |
 | pydeck    | choropleth(3d and 2d)   |
 
-
 ## Contributing Developers Guide
 
 cuxfilter acts like a connector library and it is easy to add support for new libraries. The `python/cuxfilter/charts/core` directory has all the core chart classes which can be inherited and used to implement a few (viz related) functions and support dashboarding in cuxfilter directly.

ci/gpu/build.sh

@@ -58,7 +58,7 @@ gpuci_mamba_retry install -y \
                "cugraph=$MINOR_VERSION.*" \
                "cuspatial=$MINOR_VERSION.*" \
                "dask-cudf=$MINOR_VERSION.*" "dask-cuda=$MINOR_VERSION.*" \
-               "numba>=0.51.2" \
+               "numba>=0.54" \
                "bokeh>=2.3.2,<=2.4" \
                "rapids-build-env=$MINOR_VERSION.*" \
                "rapids-notebook-env=$MINOR_VERSION.*"

conda/environments/cuxfilter_dev_cuda11.0.yml

@@ -3,19 +3,21 @@ channels:
 - rapidsai
 - rapidsai-nightly
 - nvidia
+- pyviz
 - conda-forge
 - anaconda
 dependencies:
 - cupy>7.1.0,<10.0.0a0
-- cuspatial=21.12
+- cuspatial=22.02
 - python>=3.6,<3.8
-- cudf=21.12
+- cudf=22.02
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=21.12
-- dask-cudf=21.12
-- datashader>=0.11.1
-- numba>=0.51.2
+- dask-cuda=22.02
+- dask-cudf=22.02
+- datashader>0.12, <=0.13
+- holoviews>1.14.1, <=1.14.6
+- numba>=0.54
 - geopandas >=0.9.0,<0.10.0a0
 - pyproj>=2.4, <=3.1
 - libwebp
@@ -38,8 +40,10 @@ dependencies:
 - jupyterlab
 - flake8=3.8.3
 - black=19.10
-- pip
 - pydeck>=0.3, <=0.5.0
+- packaging
+- pip
 - pip:
   - sphinx-markdown-tables
   - jupyter-server-proxy
+  - pyviz-comms

conda/environments/cuxfilter_dev_cuda10.2.yml → conda/environments/cuxfilter_dev_cuda11.2.yml

@@ -1,4 +1,4 @@
-# name: cudf_dev10.0
+# name: cudf_dev11.2
 channels:
 - rapidsai
 - rapidsai-nightly
@@ -8,23 +8,24 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<10.0.0a0
-- cuspatial=21.12
+- cuspatial=22.02
 - python>=3.6,<3.8
-- cudf=21.12
+- cudf=22.02
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=21.12
-- dask-cudf=21.12
-- datashader>=0.11.1
-- numba>=0.51.2
+- dask-cuda=22.02
+- dask-cudf=22.02
+- datashader>0.12, <=0.13
+- holoviews>1.14.1, <=1.14.6
+- numba>=0.54
 - geopandas >=0.9.0,<0.10.0a0
 - pyproj>=2.4, <=3.1
 - libwebp
 - pandoc=<2.0.0
 - bokeh>=2.3.2,<=2.4
 - panel>=0.10.3,<=0.12.4
 - pyppeteer>=0.2.6
-- cudatoolkit=10.2
+- cudatoolkit=11.2
 - nodejs
 - recommonmark
 - pytest
@@ -40,7 +41,9 @@ dependencies:
 - flake8=3.8.3
 - black=19.10
 - pydeck>=0.3, <=0.5.0
+- packaging
 - pip
 - pip:
   - sphinx-markdown-tables
   - jupyter-server-proxy
+  - pyviz-comms

conda/environments/cuxfilter_dev_cuda10.1.yml → conda/environments/cuxfilter_dev_cuda11.4.yml

@@ -1,29 +1,31 @@
-# name: cudf_dev10.0
+# name: cudf_dev11.4
 channels:
 - rapidsai
 - rapidsai-nightly
 - nvidia
+- pyviz
 - conda-forge
 - anaconda
 dependencies:
 - cupy>7.1.0,<10.0.0a0
-- cuspatial=21.12
+- cuspatial=22.02
 - python>=3.6,<3.8
-- cudf=21.12
+- cudf=22.02
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=21.12
-- dask-cudf=21.12
-- datashader>=0.11.1
-- numba>=0.51.2
+- dask-cuda=22.02
+- dask-cudf=22.02
+- datashader>0.12, <=0.13
+- holoviews>1.14.1, <=1.14.6
+- numba>=0.54
 - geopandas >=0.9.0,<0.10.0a0
 - pyproj>=2.4, <=3.1
 - libwebp
 - pandoc=<2.0.0
 - bokeh>=2.3.2,<=2.4
 - panel>=0.10.3,<=0.12.4
 - pyppeteer>=0.2.6
-- cudatoolkit=10.1
+- cudatoolkit=11.4
 - nodejs
 - recommonmark
 - pytest
@@ -39,7 +41,9 @@ dependencies:
 - flake8=3.8.3
 - black=19.10
 - pydeck>=0.3, <=0.5.0
+- packaging
 - pip
 - pip:
   - sphinx-markdown-tables
   - jupyter-server-proxy
+  - pyviz-comms

conda/environments/cuxfilter_dev_cuda11.5.yml

@@ -0,0 +1,49 @@
+# name: cudf_dev11.5
+channels:
+- rapidsai
+- rapidsai-nightly
+- nvidia
+- pyviz
+- conda-forge
+- anaconda
+dependencies:
+- cupy>7.1.0,<10.0.0a0
+- cuspatial=22.02
+- python>=3.6,<3.8
+- cudf=22.02
+- dask>=2.12.0
+- distributed>=2.12.0
+- dask-cuda=22.02
+- dask-cudf=22.02
+- datashader>0.12, <=0.13
+- holoviews>1.14.1, <=1.14.6
+- numba>=0.54
+- geopandas >=0.9.0,<0.10.0a0
+- pyproj>=2.4, <=3.1
+- libwebp
+- pandoc=<2.0.0
+- bokeh>=2.3.2,<=2.4
+- panel>=0.10.3,<=0.12.4
+- pyppeteer>=0.2.6
+- cudatoolkit=11.5
+- nodejs
+- recommonmark
+- pytest
+- mock
+- sphinx
+- sphinx_rtd_theme
+- jupyter_sphinx
+- sphinxcontrib-websupport
+- nbsphinx
+- numpydoc
+- ipython
+- jupyterlab
+- flake8=3.8.3
+- black=19.10
+- pydeck>=0.3, <=0.5.0
+- packaging
+- pip
+- pip:
+  - sphinx-markdown-tables
+  - jupyter-server-proxy
+  - pyviz-comms

conda/recipes/cuxfilter/meta.yaml

@@ -31,8 +31,9 @@ requirements:
     - cuspatial {{ minor_version }}
     - dask-cudf {{ minor_version }}
     - dask-cuda {{ minor_version }}
-    - datashader >=0.11.1, <0.12
-    - numba >=0.51.2
+    - datashader>0.12, <=0.13
+    - holoviews>1.14.1, <=1.14.6
+    - numba >=0.54
     - cupy >=7.8.0,<10.0.0a0
     - panel >=0.10.3,<=0.12.4
     - pyppeteer>=0.2.6
@@ -43,12 +44,13 @@ requirements:
     - libwebp
     - jupyter-server-proxy
     - pydeck >=0.3, <=0.5.0
+    - packaging
 
 test:                                   # [linux64]
   requires:                             # [linux64]
     - cudatoolkit {{ cuda_version }}.*  # [linux64]
-  commands:                             # [linux64]
-    - python -c "import cuxfilter"      # [linux64]
+  imports:                              # [linux64]
+    - cuxfilter                         # [linux64]
 
 about:
   home: http://rapids.ai/

docs/source/10_minutes_to_cuxfilter.ipynb

@@ -444,14 +444,14 @@
     "\"\"\"\n",
     "1. d.show('current_notebook_url:current_notebook_port') remote dashboard\n",
     "\n",
-    "2. d.app('current_notebook_url:current_notebook_port') inline in notebook (layout is ignored, and charts are displayed one below another)\n",
+    "2. d.app() inline within the notebook cell\n",
     "\n",
     "Incase you need to stop the server:\n",
     "\n",
     "- d.stop()\n",
     "\"\"\"\n",
     "\n",
-    "d.show('notebook_url')"
+    "d.app()"
    ]
   },
   {
@@ -900,7 +900,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -914,7 +914,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.6"
+   "version": "3.8.12"
   }
  },
  "nbformat": 4,

docs/source/conf.py

@@ -27,9 +27,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '21.12'
+version = '22.02'
 # The full version, including alpha/beta/rc tags
-release = '21.12.00'
+release = '22.02.00'
 
 nbsphinx_allow_errors = True
 # -- General configuration ---------------------------------------------------