Manually merge Branch 23.08 into 23.10

README.md

@@ -18,10 +18,6 @@ The current version of cuxfilter leverages jupyter notebook and bokeh server to
 
 ![layout architecture](./docs/_images/RAPIDS_cuxfilter.png)
 
-### What is cuDataTiles?
-
-cuxfilter implements cuDataTiles, a GPU accelerated version of data tiles based on the work of [Falcon](https://github.com/uwdata/falcon). When starting to interact with specific charts in a cuxfilter dashboard, values for the other charts are precomputed to allow for fast slider scrubbing without having to recalculate values.
-
 ### Open Source Projects
 
 cuxfilter wouldn’t be possible without using these great open source projects:
@@ -56,14 +52,15 @@ cux_df = cuxfilter.DataFrame.from_arrow(DATA_DIR+'/auto_accidents.arrow')
 cux_df.data['ST_CASE'] = cux_df.data['ST_CASE'].astype('float64')
 
 label_map = {1: 'Sunday',    2: 'Monday',    3: 'Tuesday',    4: 'Wednesday',   5: 'Thursday',    6: 'Friday',    7: 'Saturday',    9: 'Unknown'}
+cux_df.data['DAY_WEEK_STR'] = cux_df.data.DAY_WEEK.map(label_map)
 gtc_demo_red_blue_palette = [ "#3182bd", "#6baed6", "#7b8ed8", "#e26798", "#ff0068" , "#323232" ]
 
 #declare charts
 chart1 = cuxfilter.charts.scatter(x='dropoff_x', y='dropoff_y', aggregate_col='DAY_WEEK', aggregate_fn='mean',
                                 color_palette=gtc_demo_red_blue_palette, tile_provider='CartoLight', unselected_alpha=0.2,
                                 pixel_shade_type='linear')
 chart2 = cuxfilter.charts.multi_select('YEAR')
-chart3 = cuxfilter.charts.bar('DAY_WEEK', x_label_map=label_map)
+chart3 = cuxfilter.charts.bar('DAY_WEEK_STR')
 chart4 = cuxfilter.charts.bar('MONTH')
 
 #declare dashboard
@@ -96,26 +93,26 @@ datasets_check('mortgage', base_dir=DATA_DIR)
 
 cux_df = cuxfilter.DataFrame.from_arrow(DATA_DIR + '/146M_predictions_v2.arrow')
 
-MAPBOX_API_KEY= "<mapbox-api-key>"
 geoJSONSource='https://raw.githubusercontent.com/rapidsai/cuxfilter/GTC-2018-mortgage-visualization/javascript/demos/GTC%20demo/src/data/zip3-ms-rhs-lessprops.json'
 
 chart0 = cuxfilter.charts.choropleth( x='zip', color_column='delinquency_12_prediction', color_aggregate_fn='mean',
             elevation_column='current_actual_upb', elevation_factor=0.00001, elevation_aggregate_fn='sum',
-            geoJSONSource=geoJSONSource, mapbox_api_key=MAPBOX_API_KEY, data_points=1000
+            geoJSONSource=geoJSONSource, data_points=1000
 )
 chart2 = cuxfilter.charts.bar('delinquency_12_prediction',data_points=50)
 chart3 = cuxfilter.charts.range_slider('borrower_credit_score',data_points=50)
 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')
+d = cux_df.dashboard([chart0, chart2],sidebar=[chart3, chart1], layout=cuxfilter.layouts.feature_and_double_base,theme = cuxfilter.themes.dark, title='Mortgage Dashboard')
 
 # run the dashboard within the notebook cell
 # Bokeh and Datashader based charts also have a `save` tool on the side toolbar, which can download and save the individual chart when interacting with the dashboard.
 # d.app()
 
 #run the dashboard as a webapp:
-d.show('jupyter-notebook/lab-url')
+# if running on a port other than localhost:8888, run d.show(jupyter-notebook-lab-url:port)
+d.show()
 
 ```
 
@@ -182,15 +179,6 @@ See [build instructions](CONTRIBUTING.md#setting-up-your-build-environment).
 
 ## Troubleshooting
 
-**libxcomposite.so.1 not found error**
-
-If the `await d.preview()` throws a libxcomposite.so.1 not found error, execute the following commands:
-
-```bash
-apt-get update
-apt-get install libxcomposite1 libxcursor1 libxdamage1 libxfixes3 libxi6 libxrandr2 libxtst6 libcups2 libxss1 libasound2 libpangocairo-1.0-0 libpango-1.0-0 libatk1.0-0 libgtk-3-0 libgdk-pixbuf2.0-0
-```
-
 **bokeh server in jupyter lab**
 
 To run the bokeh server in a jupyter lab, install jupyterlab dependencies
@@ -233,11 +221,11 @@ Currently supported layout templates and example code can be found on the [layou
 
 | Library       | Chart type                                                                                       |
 | ------------- | ------------------------------------------------------------------------------------------------ |
-| bokeh         | bar, line                                                                                        |
+| bokeh         | bar                                                                                              |
 | datashader    | scatter, scatter_geo, line, stacked_lines, heatmap, graph                                        |
 | panel_widgets | range_slider, date_range_slider, float_slider, int_slider, drop_down, multi_select, card, number |
 | custom        | view_dataframe                                                                                   |
-| pydeck        | choropleth(3d and 2d)                                                                            |
+| deckgl        | choropleth(3d and 2d)                                                                            |
 
 ## Contributing Developers Guide
 

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -6,7 +6,7 @@ channels:
 - conda-forge
 - nvidia
 dependencies:
-- bokeh>=2.4.2,<=2.5
+- bokeh>=3.1
 - cuda-version=11.8
 - cudatoolkit
 - cudf==23.10.*
@@ -17,7 +17,8 @@ dependencies:
 - dask-cudf==23.10.*
 - datashader>=0.15
 - geopandas>=0.11.0
-- holoviews>=1.15.0,<=1.15.4
+- holoviews>=1.16.0
+- ipykernel
 - ipython
 - jupyter-server-proxy
 - jupyter_sphinx
@@ -30,12 +31,9 @@ dependencies:
 - numpydoc
 - packaging
 - pandoc<=2.0.0
-- panel>=0.14.0,<=0.14.1
+- panel>=1.0
 - pre-commit
 - pydata-sphinx-theme
-- pydeck>=0.3,<=0.5.0
-- pyppeteer>=0.2.6
-- pyproj>=2.4,<=3.4
 - pytest
 - pytest-cov
 - pytest-xdist

conda/environments/all_cuda-120_arch-x86_64.yaml

@@ -6,7 +6,7 @@ channels:
 - conda-forge
 - nvidia
 dependencies:
-- bokeh>=2.4.2,<=2.5
+- bokeh>=3.1
 - cuda-version=12.0
 - cudf==23.10.*
 - cugraph==23.10.*
@@ -16,7 +16,8 @@ dependencies:
 - dask-cudf==23.10.*
 - datashader>=0.15
 - geopandas>=0.11.0
-- holoviews>=1.15.0,<=1.15.4
+- holoviews>=1.16.0
+- ipykernel
 - ipython
 - jupyter-server-proxy
 - jupyter_sphinx
@@ -29,12 +30,9 @@ dependencies:
 - numpydoc
 - packaging
 - pandoc<=2.0.0
-- panel>=0.14.0,<=0.14.1
+- panel>=1.0
 - pre-commit
 - pydata-sphinx-theme
-- pydeck>=0.3,<=0.5.0
-- pyppeteer>=0.2.6
-- pyproj>=2.4,<=3.4
 - pytest
 - pytest-cov
 - pytest-xdist

conda/recipes/cuxfilter/meta.yaml

@@ -24,24 +24,22 @@ requirements:
     - setuptools
     - cuda-version ={{ cuda_version }}
   run:
-    - bokeh >=2.4.2,<=2.5
+    - bokeh >=3.1
     - cudf ={{ minor_version }}
     - cupy >=12.0.0
     - cuspatial ={{ minor_version }}
     - dask-cudf ={{ minor_version }}
     - datashader >=0.15
     - geopandas >=0.11.0
-    - holoviews>=1.15.0,<=1.15.4
+    - holoviews>=1.16
     - jupyter-server-proxy
     - libwebp
     - nodejs >=14
     - numba >=0.57
     - numpy >=1.21
     - packaging
-    - panel >=0.14.0,<=0.14.1
-    - pydeck >=0.3,<=0.5.0
+    - panel >=1.0
     - pyppeteer >=0.2.6
-    - pyproj >=2.4,<=3.4
     - python
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
 

dependencies.yaml

@@ -107,6 +107,7 @@ dependencies:
     common:
       - output_types: [conda, requirements]
         packages:
+          - ipykernel
           - ipython
           - jupyter_sphinx
           - nbsphinx
@@ -147,21 +148,18 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - bokeh>=2.4.2,<=2.5
+          - bokeh>=3.1
           - cudf==23.10.*
           - cuspatial==23.10.*
           - dask-cudf==23.10.*
           - datashader>=0.15
           - geopandas>=0.11.0
-          - holoviews>=1.15.0,<=1.15.4
+          - holoviews>=1.16.0
           - jupyter-server-proxy
           - numba>=0.57
           - numpy>=1.21
           - packaging
-          - panel>=0.14.0,<=0.14.1
-          - pydeck>=0.3,<=0.5.0
-          - pyppeteer>=0.2.6
-          - pyproj>=2.4,<=3.4
+          - panel>=1.0
       - output_types: conda
         packages:
           - cupy>=12.0.0
@@ -174,7 +172,7 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
+          - ipython
           - pytest
           - pytest-cov
           - pytest-xdist
-

docs/source/conf.py

@@ -1,5 +1,4 @@
 # Copyright (c) 2019-2023, NVIDIA CORPORATION.
-import pydata_sphinx_theme
 
 # -- Project information -----------------------------------------------------
 project = "cuxfilter"
@@ -63,9 +62,7 @@
 # Removes sidebar
 htmlhelp_basename = "cuxfilterdoc"
 
-html_sidebars = {
-  "user_guide/index": []
-}
+html_sidebars = {"user_guide/index": []}
 
 html_theme_options = {
     "external_links": [],
@@ -79,4 +76,6 @@
 
 def setup(app):
     app.add_css_file("https://docs.rapids.ai/assets/css/custom.css")
-    app.add_js_file("https://docs.rapids.ai/assets/js/custom.js", loading_method="defer")
+    app.add_js_file(
+        "https://docs.rapids.ai/assets/js/custom.js", loading_method="defer"
+    )

docs/source/index.rst

@@ -10,7 +10,7 @@ cuxfilter enables GPU accelerated cross-filtering dashboards from notebooks, in
    user_guide/index
    api_reference/dataframe
 
-   
+
 Indices and tables
 ==================