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] Add treelite include paths to treelite targets #4023

Merged

Conversation

trxcllnt
Copy link
Collaborator

@trxcllnt trxcllnt commented Jul 1, 2021

Follow-up to #4018, but this time it actually works.

Makes ${Treelite_SOURCE_DIR}/include part of the build interface so users consuming an installed cuml++ don't get an include path to the build dir.

@trxcllnt trxcllnt requested a review from a team as a code owner July 1, 2021 17:45
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.

One quick question, besides that it lgtm

if(Treelite_ADDED AND NOT TARGET treelite::treelite_static)
add_library(treelite::treelite_static ALIAS treelite_static)
add_library(treelite::treelite_runtime_static ALIAS treelite_runtime_static)
if(Treelite_ADDED)
Copy link
Member

Choose a reason for hiding this comment

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

Should this be made not conditional on treelite as we were talking about offline?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Turns out Treelite_SOURCE_DIR and Treelite_BINARY_DIR aren't populated if Treelite_ADDED is false.

@trxcllnt
Copy link
Collaborator Author

trxcllnt commented Jul 1, 2021

rerun tests

@caryr35 caryr35 added this to PR-WIP in v21.08 Release via automation Jul 1, 2021
@dantegd
Copy link
Member

dantegd commented Jul 1, 2021

@gpucibot merge

@dantegd dantegd added bug Something isn't working non-breaking Non-breaking change labels Jul 1, 2021
@rapids-bot rapids-bot bot merged commit f7fb363 into rapidsai:branch-21.08 Jul 2, 2021
v21.08 Release automation moved this from PR-WIP to Done Jul 2, 2021
@codecov-commenter
Copy link

Codecov Report

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

Impacted file tree graph

@@               Coverage Diff               @@
##             branch-21.08    #4023   +/-   ##
===============================================
  Coverage                ?   85.46%           
===============================================
  Files                   ?      230           
  Lines                   ?    18133           
  Branches                ?        0           
===============================================
  Hits                    ?    15498           
  Misses                  ?     2635           
  Partials                ?        0           
Flag Coverage Δ
dask 48.14% <0.00%> (?)
non-dask 77.75% <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 033a21f...101a2f1. Read the comment docs.

vimarsh6739 pushed a commit to vimarsh6739/cuml that referenced this pull request Oct 9, 2023
Follow-up to rapidsai#4018, but this time it actually works.

Makes `${Treelite_SOURCE_DIR}/include` part of the build interface so users consuming an installed `cuml++` don't get an include path to the build dir.

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

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

URL: rapidsai#4023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working CMake CUDA/C++ non-breaking Non-breaking change
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants