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

Fix forward-merge conflicts #4857

Merged
merged 7 commits into from
Aug 5, 2022
Merged

Fix forward-merge conflicts #4857

merged 7 commits into from
Aug 5, 2022

Conversation

ajschmidt8
Copy link
Member

This PR fixes the conflicts in #4849.

dantegd and others added 7 commits August 2, 2022 15:29
PR does the required changes for Scikit-build using RAPIDS-CMake. 

- [x] Update .gitignore
- [x] Create `python/cuml/CMakeLists.txt` file
- [x] Add `CMakeLists.txt` using RAPIDS-CMake to Python folders
- [x] Update `setup.py`
- [x] Update `build.sh`
- [x] Update CI files
- [x] Update conda env files
- [x] Clean code

Authors:
  - Dante Gama Dessavre (https://github.com/dantegd)

Approvers:
  - Divye Gala (https://github.com/divyegala)
  - Corey J. Nolet (https://github.com/cjnolet)
  - Sevag H (https://github.com/sevagh)
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Robert Maynard (https://github.com/robertmaynard)

URL: #4818
This PR pins `dask` & `distributed` to `2022.7.1` for `22.08` release.

xref: rapidsai/cudf#11433

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Dante Gama Dessavre (https://github.com/dantegd)
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: #4850
With this PR, the feature sampling overhead is greatly reduced, especially for wide (thousands of features) datasets. The PR requires some structural changes in RAFT therefore is marked as WIP.

Authors:
  - Vinay Deshpande (https://github.com/vinaydes)
  - Ray Douglass (https://github.com/raydouglass)
  - Andy Adinets (https://github.com/canonizer)
  - Jordan Jacobelli (https://github.com/Ethyling)
  - Jiwei Liu (https://github.com/daxiongshu)
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Christopher Akiki (https://github.com/cakiki)
  - Venkat (https://github.com/venkywonka)

Approvers:
  - Tamas Bela Feher (https://github.com/tfeher)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: #4278
This PR will utilize the common css & js code being merged here: rapidsai/docs#286

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: #4844
This PR makes a switch to utilizing common `js` & `css` code and defer's loading of custom js.

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

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

URL: #4852
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Aug 5, 2022
@ajschmidt8 ajschmidt8 requested review from a team as code owners August 5, 2022 17:34
@github-actions github-actions bot added CMake conda conda issue CUDA/C++ Cython / Python Cython or Python issue gpuCI gpuCI issue labels Aug 5, 2022
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (branch-22.10@2733ee2). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff               @@
##             branch-22.10    #4857   +/-   ##
===============================================
  Coverage                ?   78.02%           
===============================================
  Files                   ?      180           
  Lines                   ?    11385           
  Branches                ?        0           
===============================================
  Hits                    ?     8883           
  Misses                  ?     2502           
  Partials                ?        0           
Flag Coverage Δ
dask 46.21% <0.00%> (?)
non-dask 67.27% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us.

@ajschmidt8 ajschmidt8 merged commit c0061f3 into rapidsai:branch-22.10 Aug 5, 2022
@ajschmidt8 ajschmidt8 deleted the fix-merge-conflicts branch August 5, 2022 20:44
jakirkham pushed a commit to jakirkham/cuml that referenced this pull request Feb 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake conda conda issue CUDA/C++ Cython / Python Cython or Python issue gpuCI gpuCI issue improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants