Merge pull request #363 from rapidsai/branch-22.04

[RELEASE] cuxfilter v22.04
rapidsai · Apr 6, 2022 · f94e99c · f94e99c
2 parents 929e293 + bb78078
commit f94e99c
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 99 deletions.
diff --git a/.github/ops-bot.yaml b/.github/ops-bot.yaml
@@ -0,0 +1,8 @@
+# This file controls which features from the `ops-bot` repository below are enabled.
+# - https://github.com/rapidsai/ops-bot
+
+auto_merger: true
+branch_checker: true
+label_checker: true
+release_drafter: true
+external_contributors: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,38 @@
+# cuXfilter 22.04.00 (6 Apr 2022)
+
+## 🐛 Bug Fixes
+
+- update panel version ([#361](https://github.com/rapidsai/cuxfilter/pull/361)) [@AjayThorve](https://github.com/AjayThorve)
+
+## 📖 Documentation
+
+- Fix/examples ([#353](https://github.com/rapidsai/cuxfilter/pull/353)) [@AjayThorve](https://github.com/AjayThorve)
+- Fix deprecated code changes of `cudf` ([#348](https://github.com/rapidsai/cuxfilter/pull/348)) [@galipremsagar](https://github.com/galipremsagar)
+
+## 🛠️ Improvements
+
+- Temporarily disable new `ops-bot` functionality ([#357](https://github.com/rapidsai/cuxfilter/pull/357)) [@ajschmidt8](https://github.com/ajschmidt8)
+- Update `bokeh` version ([#355](https://github.com/rapidsai/cuxfilter/pull/355)) [@ajschmidt8](https://github.com/ajschmidt8)
+- Add `.github/ops-bot.yaml` config file ([#352](https://github.com/rapidsai/cuxfilter/pull/352)) [@ajschmidt8](https://github.com/ajschmidt8)
+
 # cuXfilter 22.02.00 (2 Feb 2022)
 
 ## 🐛 Bug Fixes
 
-- fix einit function ([#345](https://github.com/rapidsai/cuxfilter/pull/345)) [@AjayThove](https://github.com/AjayThove)
+- fix reinit function ([#345](https://github.com/rapidsai/cuxfilter/pull/345)) [@AjayThorve](https://github.com/AjayThorve)
 
 ## 📖 Documentation
 
-- Documentation &amp; 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)
+- Documentation &amp; Notebook updates ([#341](https://github.com/rapidsai/cuxfilter/pull/341)) [@AjayThorve](https://github.com/AjayThorve)
+- Merge branch-21.12 into branch-22.02 ([#340](https://github.com/rapidsai/cuxfilter/pull/340)) [@AjayThorve](https://github.com/AjayThorve)
+- Fix/remove custom extensions ([#324](https://github.com/rapidsai/cuxfilter/pull/324)) [@AjayThorve](https://github.com/AjayThorve)
 
-## 🛠️ Impovements
+## 🛠️ Improvements
 
-- 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)
+- adds layouts to in-notebook dashboards (via d.app())  similar to standalone web apps ([#324](https://github.com/rapidsai/cuxfilter/pull/324)) [@AjayThorve ](https://github.com/AjayThorve )
+- enabled google colab and amazon sagemaker studio support for in-notebook dashboards ([#324](https://github.com/rapidsai/cuxfilter/pull/324)) [@AjayThorve ](https://github.com/AjayThorve )
+- replace distutils.version class with packaging.version.Version ([#338](https://github.com/rapidsai/cuxfilter/pull/338)) [@AjayThorve](https://github.com/AjayThorve)
+- Fix imports tests syntax ([#336](https://github.com/rapidsai/cuxfilter/pull/336)) [@Ethyling](https://github.com/Ethyling)
 
 # cuXfilter 21.12.00 (9 Dec 2021)
 

diff --git a/README.md b/README.md
@@ -157,11 +157,11 @@ 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 == 22.02` :
+For `cuxfilter version == 22.04` :
 ```bash
 # for CUDA 11.5
 conda install -c rapidsai -c nvidia -c numba -c conda-forge \
-    cuxfilter=22.02 python=3.7 cudatoolkit=11.5
+    cuxfilter=22.04 python=3.7 cudatoolkit=11.5
 
 ```
 

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -59,7 +59,7 @@ gpuci_mamba_retry install -y \
                "cuspatial=$MINOR_VERSION.*" \
                "dask-cudf=$MINOR_VERSION.*" "dask-cuda=$MINOR_VERSION.*" \
                "numba>=0.54" \
-               "bokeh>=2.3.2,<=2.4" \
+               "bokeh>=2.4.2,<=2.5" \
                "rapids-build-env=$MINOR_VERSION.*" \
                "rapids-notebook-env=$MINOR_VERSION.*"
 

diff --git a/conda/environments/cuxfilter_dev_cuda11.0.yml b/conda/environments/cuxfilter_dev_cuda11.0.yml
@@ -8,22 +8,22 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<10.0.0a0
-- cuspatial=22.02
+- cuspatial=22.04
 - python>=3.6,<3.8
-- cudf=22.02
+- cudf=22.04
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.02
-- dask-cudf=22.02
-- datashader>0.12, <=0.13
+- dask-cuda=22.04
+- dask-cudf=22.04
+- datashader>0.13, <0.14
 - 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
+- bokeh>=2.4.2,<=2.5
+- panel>=0.12.7,<0.13
 - pyppeteer>=0.2.6
 - cudatoolkit=11.0
 - nodejs

diff --git a/conda/environments/cuxfilter_dev_cuda11.2.yml b/conda/environments/cuxfilter_dev_cuda11.2.yml
@@ -8,22 +8,22 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<10.0.0a0
-- cuspatial=22.02
+- cuspatial=22.04
 - python>=3.6,<3.8
-- cudf=22.02
+- cudf=22.04
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.02
-- dask-cudf=22.02
-- datashader>0.12, <=0.13
+- dask-cuda=22.04
+- dask-cudf=22.04
+- datashader>0.13, <0.14
 - 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
+- bokeh>=2.4.2,<=2.5
+- panel>=0.12.7,<0.13
 - pyppeteer>=0.2.6
 - cudatoolkit=11.2
 - nodejs

diff --git a/conda/environments/cuxfilter_dev_cuda11.4.yml b/conda/environments/cuxfilter_dev_cuda11.4.yml
@@ -8,22 +8,22 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<10.0.0a0
-- cuspatial=22.02
+- cuspatial=22.04
 - python>=3.6,<3.8
-- cudf=22.02
+- cudf=22.04
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.02
-- dask-cudf=22.02
-- datashader>0.12, <=0.13
+- dask-cuda=22.04
+- dask-cudf=22.04
+- datashader>0.13, <0.14
 - 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
+- bokeh>=2.4.2,<=2.5
+- panel>=0.12.7,<0.13
 - pyppeteer>=0.2.6
 - cudatoolkit=11.4
 - nodejs

diff --git a/conda/environments/cuxfilter_dev_cuda11.5.yml b/conda/environments/cuxfilter_dev_cuda11.5.yml
@@ -8,22 +8,22 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<10.0.0a0
-- cuspatial=22.02
+- cuspatial=22.04
 - python>=3.6,<3.8
-- cudf=22.02
+- cudf=22.04
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.02
-- dask-cudf=22.02
-- datashader>0.12, <=0.13
+- dask-cuda=22.04
+- dask-cudf=22.04
+- datashader>0.13, <0.14
 - 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
+- bokeh>=2.4.2,<=2.5
+- panel>=0.12.7,<0.13
 - pyppeteer>=0.2.6
 - cudatoolkit=11.5
 - nodejs

diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml
@@ -31,13 +31,13 @@ requirements:
     - cuspatial {{ minor_version }}
     - dask-cudf {{ minor_version }}
     - dask-cuda {{ minor_version }}
-    - datashader>0.12, <=0.13
+    - datashader>0.13, <0.14
     - holoviews>1.14.1, <=1.14.6
     - numba >=0.54
     - cupy >=7.8.0,<10.0.0a0
-    - panel >=0.10.3,<=0.12.4
+    - panel >=0.12.7,<0.13
     - pyppeteer>=0.2.6
-    - bokeh >=2.3.2,<=2.4
+    - bokeh>=2.4.2,<=2.5
     - pyproj >=2.4, <=3.1
     - geopandas >=0.9.0,<0.10.0a0
     - nodejs >=12,<15

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -27,9 +27,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '22.02'
+version = '22.04'
 # The full version, including alpha/beta/rc tags
-release = '22.02.00'
+release = '22.04.00'
 
 nbsphinx_allow_errors = True
 # -- General configuration ---------------------------------------------------

diff --git a/docs/source/examples/NYC_taxi_example.ipynb b/docs/source/examples/NYC_taxi_example.ipynb
diff --git a/notebooks/NYC_taxi_example.ipynb b/notebooks/NYC_taxi_example.ipynb
diff --git a/notebooks/auto_accidents_example.ipynb b/notebooks/auto_accidents_example.ipynb
@@ -91,23 +91,6 @@
     "gtc_demo_red_blue_palette = [ \"#3182bd\", \"#6baed6\", \"#7b8ed8\", \"#e26798\", \"#ff0068\" , \"#323232\" ]"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "> Uncomment the below lines and replace MAPBOX_TOKEN with mapbox token string if you want to use mapbox map-tiles. Can be created for free here -https://www.mapbox.com/help/define-access-token/"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#from cuxfilter.assets.custom_tiles import get_provider, Vendors\n",
-    "#tile_provider = get_provider(Vendors.MAPBOX_LIGHT, access_token=MAPBOX_TOKEN)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -223,7 +206,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.12"
+   "version": "3.9.10"
   }
  },
  "nbformat": 4,

diff --git a/python/cuxfilter/assets/numba_kernels/gpu_datatile.py b/python/cuxfilter/assets/numba_kernels/gpu_datatile.py
@@ -106,10 +106,10 @@ def calc_1d_data_tile(
 
     result = np.zeros(shape=(min_s, max_s)).astype(np.float64)[0]
 
-    groupby_result_array_index = groupby_result.index.to_array().astype(int)
+    groupby_result_array_index = groupby_result.index.values_host.astype(int)
     groupby_result_array = groupby_result[
         groupby_result.columns[-1]
-    ].to_array()
+    ].values_host
 
     del groupby_result
 
@@ -200,7 +200,7 @@ def calc_data_tile(
 
     for groupby_result in groupby_results:
         list_of_indices = list(
-            np.unique(groupby_result[check_list[-1]].to_array().astype(int))
+            np.unique(groupby_result[check_list[-1]].values_host.astype(int))
         )
         groupby_as_ndarray = cuda.to_device(
             groupby_result.to_pandas().values.astype(float)

diff --git a/python/cuxfilter/assets/numba_kernels/gpu_histogram.py b/python/cuxfilter/assets/numba_kernels/gpu_histogram.py
@@ -41,7 +41,10 @@ def calc_value_counts(
                 .sort_index()
             )
 
-    return ((val_count.index.to_array(), val_count.to_array()), len(val_count))
+    return (
+        (val_count.index.values_host, val_count.values_host),
+        len(val_count),
+    )
 
 
 def calc_groupby(chart: Type[BaseChart], data, agg=None):

diff --git a/python/cuxfilter/charts/datashader/custom_extensions/graph_assets.py b/python/cuxfilter/charts/datashader/custom_extensions/graph_assets.py
@@ -195,8 +195,8 @@ def curved_connect_edges(
     # Make sure no control points are added for rows with source==destination
     fin_df_ = fin_df_.query(edge_source + "!=" + edge_target)
     compute_curves[cuda_args(fin_df_.shape[0])](
-        fin_df_[connected_edge_columns].as_gpu_matrix(),
-        fin_df_[["ctrl_point_x", "ctrl_point_y"]].as_gpu_matrix(),
+        fin_df_[connected_edge_columns].to_cupy(),
+        fin_df_[["ctrl_point_x", "ctrl_point_y"]].to_cupy(),
         result,
         steps,
     )
@@ -246,7 +246,7 @@ def directly_connect_edges(edges):
     result = cp.zeros(
         shape=(edges.shape[0], edges.shape[1] - 2, 3), dtype=cp.float32
     )
-    connect_edges[cuda_args(edges.shape[0])](edges.as_gpu_matrix(), result)
+    connect_edges[cuda_args(edges.shape[0])](edges.to_cupy(), result)
     if edges.shape[1] == 5:
         return cudf.DataFrame(
             {

diff --git a/python/cuxfilter/charts/datashader/datashader.py b/python/cuxfilter/charts/datashader/datashader.py
@@ -90,7 +90,7 @@ def scatter(
         Adds Bokeh.models.LinearColorMapper based legend if True,
         Note: legend currently only works with pixel_shade_type='linear'/'log'
 
-    legend_position: str, default center
+    legend_position: str, default top_right
         position of legend on the chart.
         Valid places are: right, left, bottom, top, top_right, top_left,
                         bottom_left, bottom_right
@@ -264,7 +264,7 @@ def graph(
         Adds Bokeh.models.LinearColorMapper based legend if True,
         Note: legend currently only works with pixel_shade_type='linear'/'log'
 
-    legend_position: str, default center
+    legend_position: str, default top_right
         position of legend on the chart.
         Valid places are: right, left, bottom, top, top_right, top_left,
                         bottom_left, bottom_right
@@ -394,7 +394,7 @@ def heatmap(
     legend: bool, default True
         Adds Bokeh.models.LinearColorMapper based legend if True,
 
-    legend_position: str, default center
+    legend_position: str, default top_right
         position of legend on the chart.
         Valid places are: right, left, bottom, top, top_right, top_left,
                         bottom_left, bottom_right
@@ -576,7 +576,7 @@ def stacked_lines(
         Adds Bokeh.models.LinearColorMapper based legend if True,
         Note: legend currently only works with pixel_shade_type='linear'/'log'
 
-    legend_position: str, default center
+    legend_position: str, default top_right
         position of legend on the chart.
         Valid places are: right, left, bottom, top, top_right, top_left,
                         bottom_left, bottom_right