Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor to use holoviews powered bar charts #494

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
a5df88f
remove references to reset_view and calc_datatiles
AjayThorve Jun 2, 2023
6eaa8d1
fix callback functions to only perform query in Dashboard class once …
AjayThorve Jun 6, 2023
ee2e416
format as per flake8 guidelines
AjayThorve Jun 6, 2023
35f1887
fix incorrect arguments warning for UNION
AjayThorve Jun 6, 2023
9fd7035
remove references to reset_view and calc_datatiles
AjayThorve Jun 2, 2023
553f247
fix callback functions to only perform query in Dashboard class once …
AjayThorve Jun 6, 2023
1bdf446
format as per flake8 guidelines
AjayThorve Jun 6, 2023
5b253c6
fix incorrect arguments warning for UNION
AjayThorve Jun 6, 2023
d0837e3
Merge branch 'improvement/remove-datatiles-support' of github.com:Aja…
AjayThorve Jun 6, 2023
97a5a6d
fix imports
AjayThorve Jun 6, 2023
679b13b
rm datatile tests since that class is no longer supported
AjayThorve Jun 6, 2023
83596e5
remove datatile refs
AjayThorve Jun 7, 2023
9c37a45
remove unused args
AjayThorve Jun 7, 2023
344f825
add newline
AjayThorve Jun 7, 2023
66baaae
fix tests, after removing datatiles
AjayThorve Jun 8, 2023
49d3b2a
update readme to remove datatiles info
AjayThorve Jun 8, 2023
2622e7d
update holoviews and panel versions, remove pydeck
AjayThorve Jun 8, 2023
b506737
remove default parent class variables
AjayThorve Jun 8, 2023
403e3a5
refactor to comply with bokeh 3.1.1
AjayThorve Jun 8, 2023
d7867b4
flake8
AjayThorve Jun 8, 2023
da40298
register tool
AjayThorve Jun 9, 2023
47fbd22
fix sizing_mode
AjayThorve Jun 9, 2023
67c73ce
added holoviews powered bar charts
AjayThorve Jun 20, 2023
b0c43b3
fix return type for datetime types
AjayThorve Jun 20, 2023
0e88515
checkpoint
AjayThorve Jun 29, 2023
79e0ac2
Merge branch 'branch-23.08' of github.com:rapidsai/cuxfilter into imp…
AjayThorve Jul 12, 2023
483f176
update dependencies
AjayThorve Jul 12, 2023
2f2b498
add bootstrap
AjayThorve Jul 14, 2023
b4bb1c2
checkpoint
AjayThorve Jul 28, 2023
300e021
remove fixed height parameters
AjayThorve Jul 31, 2023
c004839
refactor layouts
AjayThorve Aug 1, 2023
ba14cc7
fix incorrect imports
AjayThorve Aug 1, 2023
6fde53c
refactor
AjayThorve Aug 2, 2023
7d2a08a
remove unused package data
AjayThorve Aug 2, 2023
17dbd01
fix viewable widget names
AjayThorve Aug 2, 2023
e45afd5
fix title for holoviews datashader charts
AjayThorve Aug 2, 2023
d84a0ae
Use column and controlled height for in-notebook sidebar
AjayThorve Aug 2, 2023
c20b0fa
fix datashader chart views
AjayThorve Aug 2, 2023
1b21197
add a way to pass no-theme, and custom palettes
AjayThorve Aug 2, 2023
0595238
set default map
AjayThorve Aug 2, 2023
d034fb7
rename light to default
AjayThorve Aug 2, 2023
e46ecd8
rename light to default
AjayThorve Aug 2, 2023
dfc3f5e
remove unused imports
AjayThorve Aug 2, 2023
51a7acc
fix tests
AjayThorve Aug 2, 2023
4a379eb
bug fixes
AjayThorve Aug 2, 2023
5e4af38
fix indentation
AjayThorve Aug 2, 2023
a44cc94
remove unused imports
AjayThorve Aug 2, 2023
be97e40
Merge branch 'branch-23.08' into improvement/add-panel-1.0-support
AjayThorve Aug 2, 2023
0d50c89
fix theme issue
AjayThorve Aug 2, 2023
7508b53
add ipython to test dependencies, since CI is failing for the exact r…
AjayThorve Aug 2, 2023
4e9f22b
run rapids-dependency-file-generator
AjayThorve Aug 2, 2023
250b688
add ipykernel to avoid docs build issues
AjayThorve Aug 2, 2023
36eb313
Update dataframe api doc
AjayThorve Aug 2, 2023
9a5ef05
fix indents
AjayThorve Aug 2, 2023
5a85648
Merge branch 'improvement/add-panel-1.0-support' into refactor/replac…
AjayThorve Aug 2, 2023
ffe7207
fix indentations
AjayThorve Aug 3, 2023
663807f
Merge branch 'improvement/add-panel-1.0-support' into refactor/replac…
AjayThorve Aug 3, 2023
b242042
Merge branch 'branch-23.08' of github.com:rapidsai/cuxfilter into ref…
AjayThorve Aug 3, 2023
c7c811d
bug fixes
AjayThorve Aug 3, 2023
4cc9589
remove bokeh line
AjayThorve Aug 3, 2023
8b836e4
remove pyppeteer and preview function
AjayThorve Aug 3, 2023
742c2bc
fixes
AjayThorve Aug 3, 2023
62f9afa
remove import for screengrab
AjayThorve Aug 3, 2023
778be39
fixes
AjayThorve Aug 3, 2023
7b25d1b
fix number api
AjayThorve Aug 3, 2023
b416f57
fix stacked line issue
AjayThorve Aug 3, 2023
94701b0
fix tests
AjayThorve Aug 4, 2023
165d13b
fix api use
AjayThorve Aug 4, 2023
c5c4d16
rm test notebook
AjayThorve Aug 4, 2023
58a512c
remove unused imports
AjayThorve Aug 4, 2023
fea12dc
use Union instead of | for type annotations, for python <3.10
AjayThorve Aug 4, 2023
3501af4
fix mising title
AjayThorve Aug 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,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
Expand Down Expand Up @@ -229,11 +220,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

Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ dependencies:
- panel >=1.0
- pre-commit
- pydata-sphinx-theme
- pyppeteer>=0.2.6
- pyproj>=2.4
- pytest
- pytest-cov
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ dependencies:
- panel >=1.0
- pre-commit
- pydata-sphinx-theme
- pyppeteer>=0.2.6
- pyproj>=2.4
- pytest
- pytest-cov
Expand Down
1 change: 0 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ dependencies:
- numpy>=1.21
- packaging
- panel >=1.0
- pyppeteer>=0.2.6
- output_types: conda
packages:
- cupy>=12.0.0
Expand Down
5 changes: 1 addition & 4 deletions docs/source/user_guide/10_minutes_to_cuxfilter.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
"\n",
"chart3 = cuxfilter.charts.multi_select('DAY_WEEK', label_map=label_map)\n",
"\n",
"chart4 = cuxfilter.charts.number(x=\"AGE\", aggregate_fn=\"mean\", title=\"Mean age\", widget=True)\n",
"chart4 = cuxfilter.charts.number(expression=\"AGE\", aggregate_fn=\"mean\", title=\"Mean age\", widget=True)\n",
"chart5 = cuxfilter.charts.number(expression=\"SIDE_DRIV_STARS + FRNT_DRIV_STARS\", aggregate_fn=\"mean\", title=\"Vehicle(Mean front+side safety rating)\", widget=True)\n",
"charts_list = [chart1, chart2, chart3, chart4, chart5]"
]
Expand Down Expand Up @@ -469,9 +469,6 @@
}
],
"source": [
"# preview, uncomment below line to see the dashboard preview in a notebook cell\n",
"# await d.preview()\n",
"\n",
"# for using the interactive web-app version, use d.app() for in notebook, and d.show() for using it in a separate window as a web-app\n",
"# 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."
]
Expand Down
20 changes: 0 additions & 20 deletions docs/source/user_guide/charts/bokeh_charts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,4 @@ Example

d = cux_df.dashboard([bar_chart_1])
#view the individual bar chart part of the dashboard d
#await d.preview()
bar_chart_1.view()

Line Chart
----------
.. automethod:: bokeh.line

Example
~~~~~~~
.. jupyter-execute::

import cudf
import cuxfilter

cux_df = cuxfilter.DataFrame.from_dataframe(cudf.DataFrame({'key': [0, 1, 2, 3, 4], 'val':[float(i + 10) for i in range(5)]}))
line_chart_1 = cuxfilter.charts.line('key', 'val', data_points=5, add_interaction=False)

d = cux_df.dashboard([line_chart_1])
#view the individual bar chart part of the dashboard d
#await d.preview()
line_chart_1.view()
2 changes: 1 addition & 1 deletion docs/source/user_guide/charts/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Charts

cuxfilter is able to use a wide range of chart types:

* Bokeh: line and bar
* Bokeh: bar
* Datashader: high density line, stacked line, scatter, geospatial scatter, heatmap, and graph
* DeckGL: webGL based geospatial 2D and 3D choropleth
* Widgets: sliders, dropdowns, and cards
Expand Down
2 changes: 1 addition & 1 deletion docs/source/user_guide/charts/widgets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Example 1
from cuxfilter import charts, DataFrame

cux_df = DataFrame.from_dataframe(cudf.DataFrame({'key': [0, 1, 2, 3, 4], 'val':[float(i + 10) for i in range(5)]}))
number_chart = charts.number(x='val', aggregate_fn="mean", format="{value}%")
number_chart = charts.number(expression='val', aggregate_fn="mean", format="{value}%")

d = cux_df.dashboard([number_chart])
# view the individual number_chart chart part of the dashboard d
Expand Down
7 changes: 2 additions & 5 deletions docs/source/user_guide/examples/Mortgage_example.ipynb

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions docs/source/user_guide/examples/NYC_taxi_example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,7 @@
"output_type": "display_data"
}
],
"source": [
"# preview \n",
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down
8 changes: 3 additions & 5 deletions docs/source/user_guide/examples/auto_accidents_example.ipynb

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions docs/source/user_guide/examples/graphs.ipynb

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions docs/source/user_guide/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,6 @@ Install jupyterlab dependencies
jupyter labextension install @bokeh/jupyter_bokeh


libxcomposite.so.1 not found error
*************************************

If using **await d.preview()** throws a **libxcomposite.so.1 not found error**, execute the following commands:

.. code-block:: 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


Download datasets
-----------------

Expand Down
56 changes: 14 additions & 42 deletions docs/source/user_guide/layouts/Layouts.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -174,9 +172,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -217,9 +213,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -260,9 +254,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -303,9 +295,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -346,9 +336,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -389,9 +377,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -432,9 +418,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -475,9 +459,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -518,9 +500,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -561,9 +541,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -604,9 +582,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -648,9 +624,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -692,9 +666,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "code",
Expand Down
12 changes: 3 additions & 9 deletions docs/source/user_guide/themes/Themes.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -114,9 +112,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -150,9 +146,7 @@
"output_type": "display_data"
}
],
"source": [
"await d.preview()"
]
"source": []
},
{
"cell_type": "code",
Expand Down
Loading