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

Promote trustworthiness_score to public header, add missing includes, update dependencies #3968

Conversation

trxcllnt
Copy link
Collaborator

@trxcllnt trxcllnt commented Jun 9, 2021

  • Updates dask/distributed versions to match cuDF (Update minimum Dask requirement to 2021.6.0 cudf#8458)
  • Updates to Thrust v1.12.0 to align with cuDF and cuGraph
  • Don't include the src and src_prims directories in cuml::cuml++ target's public include paths
  • Add missing <cstddef> and <cstdint> include directives
  • Promote trustworthiness_score to public cuml/metrics/metrics.hpp header and update Cython
  • Compile Cython with -std=c++17
  • Remove -Wstrict-prototypes Cython warning
  • Fixes linker error in debug builds
  • Fixes [BUG] Thrust 1.12 causes segfault in SVC pytest #3885

@trxcllnt trxcllnt requested review from a team as code owners June 9, 2021 16:42
@github-actions github-actions bot added CMake conda conda issue CUDA/C++ Cython / Python Cython or Python issue gpuCI gpuCI issue labels Jun 9, 2021
@trxcllnt trxcllnt changed the title Promote trustworthiness_score to public header, fix include paths, update dependencies Promote trustworthiness_score to public header, add missing includes, update dependencies Jun 9, 2021
@cjnolet cjnolet added non-breaking Non-breaking change improvement Improvement / enhancement to an existing function labels Jun 9, 2021
@ajschmidt8
Copy link
Member

ajschmidt8 commented Jun 11, 2021

rerun tests

(we just pushed/deployed some CI fixes)

Copy link
Member

@dantegd dantegd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all the improvements! Approving, though the relevant CI jobs are showing the following doxygen issue (which is tricky to parse in the logs):

Generating docs for compound ML:/workspace/cpp/include/cuml/metrics/metrics.hpp:344: error: argument 'in' of command @param is not found in the argument list of ML::Metrics::trustworthiness_score(const raft::handle_t &h, const math_t *X, math_t *X_embedded, int n, int m, int d, int n_neighbors, int batchSize) (warning treated as error, aborting now)

We should be able to merge once that's fixed. Thanks!

NULL, cub_bytes, f_idx.data(), f_idx_sorted.data(), f_sorted.data(),
f_sorted.data(), n_train, 0, 8 * sizeof(int), stream);
NULL, cub_bytes, f_sorted.data(), f_sorted.data(), f_idx.data(),
f_idx_sorted.data(), n_train, 0, 8 * sizeof(math_t), stream);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @tfeher this fixes the issue with thrust 1.12 if I'm not mistaken (#3885 )

@trxcllnt
Copy link
Collaborator Author

E   ImportError: cannot import name 'apply' from 'dask.compatibility' (/opt/conda/envs/rapids/lib/python3.8/site-packages/dask/compatibility.py)

😿

…ude-paths-dependency-versions-and-metrics-header
@github-actions github-actions bot removed the gpuCI gpuCI issue label Jun 15, 2021
@codecov-commenter
Copy link

Codecov Report

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

Impacted file tree graph

@@               Coverage Diff               @@
##             branch-21.08    #3968   +/-   ##
===============================================
  Coverage                ?   85.32%           
===============================================
  Files                   ?      230           
  Lines                   ?    18095           
  Branches                ?        0           
===============================================
  Hits                    ?    15439           
  Misses                  ?     2656           
  Partials                ?        0           
Flag Coverage Δ
dask 47.90% <0.00%> (?)
non-dask 77.67% <0.00%> (?)

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


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c35680f...45597ae. Read the comment docs.

@dantegd
Copy link
Member

dantegd commented Jun 16, 2021

@gpucibot merge

@rapids-bot rapids-bot bot merged commit afdeda9 into rapidsai:branch-21.08 Jun 16, 2021
@@ -23,6 +23,10 @@ dependencies:
- umap-learn
- scikit-learn=0.23.1
- treelite=1.3.0
- statsmodels
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are these new dependencies for? Just curious.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They're required in cuML Python tests, but only listed in the rapids-test-env metapackage.

vimarsh6739 pushed a commit to vimarsh6739/cuml that referenced this pull request Oct 9, 2023
…s, update dependencies (rapidsai#3968)

* Updates dask/distributed versions to match cuDF (rapidsai/cudf#8458)
* Updates to Thrust v1.12.0 to align with cuDF and cuGraph
* Don't include the src and src_prims directories in `cuml::cuml++` target's public include paths
* Add missing `<cstddef>` and `<cstdint>` include directives
* Promote `trustworthiness_score` to public `cuml/metrics/metrics.hpp` header and update Cython
* Compile Cython with `-std=c++17`
* Remove `-Wstrict-prototypes` Cython warning
* Fixes linker error in debug builds
* Fixes rapidsai#3885

Authors:
  - Paul Taylor (https://github.com/trxcllnt)

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

URL: rapidsai#3968
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 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.

[BUG] Thrust 1.12 causes segfault in SVC pytest
6 participants