Split treelite fil import from `forest` object definition #4306

levsnv · 2021-10-23T08:30:20Z

To improve readability of the code, split fil.cu in two files. Clean up transitive includes along the way.

This change only moves code (LoC) around and then edits header include list to comply with IWYU.
To verify that no other lines have been altered by this PR, one can:

git remote add levs git@github.com:levsnv/cuml.git
git fetch levs

cd cpp/src/fil
git checkout f6ded9e72458898c71a3688b72cc51b73dc47d6b fil.cu
cp fil.cu old-fil.cu
git reset --hard

git checkout levs/split-treelite-fil-import

diff <(cat old-fil.cu | sort) <(cat treelite_import.cu fil.cu | sort)

This will also show renaming 4 to MAX_N_ITEMS, which happened in a different PR in the meantime.

cpp/src/fil/infer.cu

…portable

robertmaynard

CMake changes LGTM

wphicks

Beautiful! 😄

canonizer

Great work!

Approved, provided that the comments (few and technical) are addressed.

cpp/src/fil/fil.cu

canonizer · 2021-10-27T16:23:14Z

cpp/src/fil/fil.cu


-#include "common.cuh"
+#include "common.cuh"    // for predict_params, sparse_storage, dense_storage


Great work tracking down the symbols used from each include file!

I wonder, though, how much extra work would it be to maintain these lists?

If we have this in place, it provides a starting place for later integration of automated tooling to maintain it. IWYU does this, and (assuming nothing changes with IWYU cuda support), we might slowly build up scripts with cppclean and ctags (similar to the work that @levsnv has already begun) that would provide similar functionality in the long term. I very much appreciate having them there given our efforts to clean up includes and improve build time, and I'm happy to manually maintain them in any of my changes until we have better tooling.

Since I've shared the scripts, this is how a typical output looks like: fil.cu tag-header pair candidates
135 lines for fil.cu. After merging branch-21.12, the (dwdiff --color) highlights only two new terms:

cats_present common.cuh 44;" function line:44 struct:ML::fil::storage_base signature:() const cats_present internal.cuh 329;" function line:329 struct:ML::fil::categorical_sets signature:() const

The rest are line number changes. Someone just needs to wrap this into a bash one-liner.

cpp/src/fil/fil.cu

cpp/src/fil/treelite_import.cu

Co-authored-by: Andy Adinets <adinetz@gmail.com>

…eelite-fil-import

…to split-treelite-fil-import

codecov-commenter · 2021-10-28T05:01:12Z

Codecov Report

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

@@               Coverage Diff               @@
##             branch-21.12    #4306   +/-   ##
===============================================
  Coverage                ?   86.06%           
===============================================
  Files                   ?      231           
  Lines                   ?    18702           
  Branches                ?        0           
===============================================
  Hits                    ?    16095           
  Misses                  ?     2607           
  Partials                ?        0

Flag	Coverage Δ
dask	`47.00% <0.00%> (?)`
non-dask	`78.74% <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 effa6cd...de76623. Read the comment docs.

levsnv · 2021-11-02T23:52:01Z

Blocked because cannot merge other PRs to FIL as that would complicate verifying that this PR mostly moves lines of code around.

levsnv · 2021-11-03T00:06:07Z

removed "Blocked" due to build issues on this PR

dantegd · 2021-11-03T00:14:09Z

@gpucibot merge

) To improve readability of the code, split `fil.cu` in two files. Clean up transitive includes along the way. This change only moves code (LoC) around and then edits header include list to comply with IWYU. To verify that no other lines have been altered by this PR, one can: ``` git remote add levs git@github.com:levsnv/cuml.git git fetch levs cd cpp/src/fil git checkout 33e14c8 fil.cu cp fil.cu old-fil.cu git reset --hard git checkout levs/split-treelite-fil-import diff <(cat old-fil.cu | sort) <(cat treelite_import.cu fil.cu | sort) ``` This will also show renaming `4` to `MAX_N_ITEMS`, which happened in a different PR in the meantime. Authors: - Levs Dolgovs (https://github.com/levsnv) Approvers: - Robert Maynard (https://github.com/robertmaynard) - William Hicks (https://github.com/wphicks) - Andy Adinets (https://github.com/canonizer) - Dante Gama Dessavre (https://github.com/dantegd) URL: rapidsai#4306

levsnv added 2 commits October 21, 2021 22:02

draft

fe6f603

cleaned up includes

1f07051

levsnv requested review from a team as code owners October 23, 2021 08:30

levsnv requested a review from canonizer October 23, 2021 08:30

github-actions bot added CMake CUDA/C++ labels Oct 23, 2021

levsnv added 2 - In Progress Currenty a work in progress non-breaking Non-breaking change Tech Debt Issues related to debt improvement Improvement / enhancement to an existing function labels Oct 23, 2021

levsnv commented Oct 23, 2021

View reviewed changes

cpp/src/fil/infer.cu Outdated Show resolved Hide resolved

added most token tracking for treelite_import.cu, made includes mode …

9e4839b

…portable

robertmaynard approved these changes Oct 25, 2021

View reviewed changes

caryr35 added this to PR-WIP in v21.12 Release via automation Oct 25, 2021

caryr35 moved this from PR-WIP to PR-Needs review in v21.12 Release Oct 25, 2021

iwyu-d fil.cu

4016f5f

levsnv added 4 - Waiting on Reviewer Waiting for reviewer to review or respond and removed 2 - In Progress Currenty a work in progress labels Oct 27, 2021

levsnv added 2 commits October 26, 2021 20:33

forceinline

56bda9c

style

a96b87a

levsnv requested a review from wphicks October 27, 2021 05:34

wphicks approved these changes Oct 27, 2021

View reviewed changes

canonizer approved these changes Oct 27, 2021

View reviewed changes

levsnv and others added 4 commits October 27, 2021 11:17

Apply suggestions from code review

0d75c2f

Co-authored-by: Andy Adinets <adinetz@gmail.com>

Merge branch 'branch-21.12' of github.com:rapidsai/cuml into split-tr…

87b0e40

…eelite-fil-import

style

bbbd2d4

Merge branch 'split-treelite-fil-import' of github.com:levsnv/cuml in…

de76623

…to split-treelite-fil-import

levsnv added the 0 - Blocked Cannot progress due to external reasons label Nov 2, 2021

levsnv removed the 0 - Blocked Cannot progress due to external reasons label Nov 3, 2021

dantegd approved these changes Nov 3, 2021

View reviewed changes

v21.12 Release automation moved this from PR-Needs review to PR-Reviewer approved Nov 3, 2021

rapids-bot bot merged commit 6c99d64 into rapidsai:branch-21.12 Nov 3, 2021

v21.12 Release automation moved this from PR-Reviewer approved to Done Nov 3, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split treelite fil import from `forest` object definition #4306

Split treelite fil import from `forest` object definition #4306

levsnv commented Oct 23, 2021 •

edited

robertmaynard left a comment

wphicks left a comment

canonizer left a comment

canonizer Oct 27, 2021

wphicks Oct 27, 2021

levsnv Oct 28, 2021

codecov-commenter commented Oct 28, 2021

levsnv commented Nov 2, 2021

levsnv commented Nov 3, 2021

dantegd commented Nov 3, 2021


		#include "common.cuh"
		#include "common.cuh" // for predict_params, sparse_storage, dense_storage

Split treelite fil import from forest object definition #4306

Split treelite fil import from forest object definition #4306

Conversation

levsnv commented Oct 23, 2021 • edited

robertmaynard left a comment

Choose a reason for hiding this comment

wphicks left a comment

Choose a reason for hiding this comment

canonizer left a comment

Choose a reason for hiding this comment

canonizer Oct 27, 2021

Choose a reason for hiding this comment

wphicks Oct 27, 2021

Choose a reason for hiding this comment

levsnv Oct 28, 2021

Choose a reason for hiding this comment

codecov-commenter commented Oct 28, 2021

Codecov Report

levsnv commented Nov 2, 2021

levsnv commented Nov 3, 2021

dantegd commented Nov 3, 2021

Split treelite fil import from `forest` object definition #4306

Split treelite fil import from `forest` object definition #4306

levsnv commented Oct 23, 2021 •

edited