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

Forward-merge branch-23.08 to branch-23.10 #515

Closed
wants to merge 4 commits into from

Conversation

GPUtester
Copy link
Contributor

Forward-merge triggered by push to branch-23.08 that creates a PR to keep branch-23.10 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge.

This PR fixes an issue raised in #511, which prevented the cuxfilter installation. This was caused by an indirect version conflict with pyproj (<3.4). 

This PR removes the `<3.4` pin, and also removes it as a direct run-dependency, since we only use it in notebooks. 

cc @exactlyallan 

resolves #511

Authors:
  - Ajay Thorve (https://github.com/AjayThorve)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Allan (https://github.com/exactlyallan)

URL: #514
@GPUtester GPUtester requested review from a team as code owners July 31, 2023 16:15
@GPUtester
Copy link
Contributor Author

FAILURE - Unable to forward-merge due to conflicts, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/
IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

This PR adds updated Layouts, themes, a more intuitve API for show, and app commands, and support for the latest versions of panel, holoviews and bokeh.

This PR will be followed up with another PR with updated documentation, example notebooks with updated API, and updated screenshots.

Major API changes in this PR:
- cuxfilter.dashboard.show(`height`=type(int), `sidebar_width`=type(int),) #width is responsive to user screen
- cuxfilter.dashboard.app(`height`=type(int), width=type(int), `sidebar_width`=type(int),) in-notebook-cell rendering
- Added more themes -> default, dark, rapids, rapids_dark, and  `None` for custom palettes
- Updated layout to be fully responsive, and consistent, whether it be within a notebook cell, or a separate web-app
- Each chart can be rendered individually, using `chart.view(width, height)`. Executing `chart`(without explicitly calling `view()`) directly in a notebook cell, will automatically render the chart.
- Web-app layout modified to include `fast.css` based widgets and js-actions (each chart can be expanded to full-screen for deeper exploration).

cc @exactlyallan

Authors:
  - Ajay Thorve (https://github.com/AjayThorve)

Approvers:
  - Allan (https://github.com/exactlyallan)
  - Ray Douglass (https://github.com/raydouglass)

URL: #492
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@github-actions github-actions bot added the doc Documentation label Aug 3, 2023
This PR refactors the bokeh charts implementation, and uses holoviews to generate the charts, while also using box-selects instead of range_sliders. This was done for 2 reasons, stability of holoviews api, which also is much more efficient, and to use streams + custom callbacks to link all charts with bar_charts.


Some of the other notable changes:
- Using holoviews to generate bokeh plots, allows us to `str` columns directly for bar charts
- Persistent non-selection view for bar_charts
- Got rid of redundant bokeh line chart, and now a single implementation exists under datashader/line, callable `cuxfilter.charts.line`
- removed preview as pyppeteer was unstable
- Refactor to remove redundant functions and classes

Authors:
  - Ajay Thorve (https://github.com/AjayThorve)

Approvers:
  - Allan (https://github.com/exactlyallan)
  - Ray Douglass (https://github.com/raydouglass)

URL: #494
Follow up to #494, updates API docs and screenshots.

cc @exactlyallan

Authors:
   - Ajay Thorve (https://github.com/AjayThorve)

Approvers:
   - Allan (https://github.com/exactlyallan)
@codecov-commenter
Copy link

codecov-commenter commented Aug 5, 2023

Codecov Report

Patch coverage: 21.33% and project coverage change: -0.16% ⚠️

Comparison is base (e6eb47e) 26.16% compared to head (ef65166) 26.01%.
Report is 3 commits behind head on branch-23.10.

Additional details and impacted files
@@               Coverage Diff                @@
##           branch-23.10     #515      +/-   ##
================================================
- Coverage         26.16%   26.01%   -0.16%     
================================================
  Files                76       75       -1     
  Lines              4013     3756     -257     
================================================
- Hits               1050      977      -73     
+ Misses             2963     2779     -184     
Files Changed Coverage Δ
python/cuxfilter/assets/__init__.py 0.00% <ø> (ø)
python/cuxfilter/assets/custom_tiles.py 0.00% <ø> (ø)
...on/cuxfilter/assets/numba_kernels/gpu_histogram.py 0.00% <0.00%> (ø)
python/cuxfilter/charts/__init__.py 0.00% <0.00%> (ø)
python/cuxfilter/charts/bokeh/__init__.py 0.00% <0.00%> (ø)
python/cuxfilter/charts/bokeh/bokeh.py 0.00% <0.00%> (ø)
python/cuxfilter/charts/bokeh/plots/__init__.py 0.00% <0.00%> (ø)
python/cuxfilter/charts/bokeh/plots/bar.py 0.00% <0.00%> (ø)
python/cuxfilter/charts/bokeh/plots/histogram.py 0.00% <0.00%> (ø)
python/cuxfilter/charts/constants.py 0.00% <ø> (ø)
... and 42 more

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants