Commit c5ab56c
authored
[hipDNN] Use regular FlatBuffers dependency install (ROCm#8092)
## Summary
This PR follows up on [PR
ROCm#8026](ROCm#8026) by removing
`hipdnn_flatbuffers_sdk`'s standalone/local dependency vendoring path.
Fetched FlatBuffers now participates in the normal dependency install
flow, and the installed flatbuffers SDK package resolves FlatBuffers
through `find_dependency(flatbuffers REQUIRED)` instead of exporting or
copying dependency headers itself.
## Risk Assessment
Medium risk. This changes standalone hipDNN install/package layout for
locally fetched FlatBuffers, but keeps the build-time dependency
resolution model and consumer CMake dependency declarations intact;
focused install and external-consumer validation passed for both
local-fetch and `/opt/rocm` FlatBuffers paths.
## Testing Summary
- Verified standalone hipDNN configure/build/install with local
FlatBuffers and nlohmann fetch forced by disabling system package
lookup.
- Verified standalone hipDNN configure/build/install with FlatBuffers
resolved from `/opt/rocm` and nlohmann fetched locally.
- Confirmed installed package layout keeps dependency package
configs/headers separate from `hipdnn_flatbuffers_sdk` and exports only
the hipDNN target.
- Verified external installed-package consumers configure/build against
`hipdnn_flatbuffers_sdk` and `hipdnn_frontend`, including the
`/opt/rocm` FlatBuffers path.
## Testing Checklist
- [x] Standalone local-fetch configure - `cmake -G Ninja
-DCMAKE_DISABLE_FIND_PACKAGE_flatbuffers=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_nlohmann_json=TRUE
-DCMAKE_INSTALL_PREFIX=/tmp/hipdnn-install
/home/sareeder/ROCm-workspace/repos/rocm-libraries/projects/hipdnn` -
ASICs: gfx90a - Status: Passed
- [x] Standalone local-fetch build/install - `cd /tmp/hipdnn-build &&
ninja && cmake --install .` - ASICs: gfx90a - Status: Passed
- [x] Installed package layout validation - checked dependency package
configs/headers, absence of vendored dependency headers under
`include/hipdnn/flatbuffers_sdk`, and
`hipdnn_flatbuffers_sdkTargets.cmake` exporting only
`hipdnn_flatbuffers_sdk` - Status: Passed
- [x] Installed consumer configure/build - `cd /tmp/test-consumer-build
&& cmake -G Ninja /tmp/test-consumer && ninja` - ASICs: gfx90a - Status:
Passed
- [x] `/opt/rocm` FlatBuffers build/install and consumer - Docker
`hipdnn_env:fullbuild_20260602_gfx90a`; hipDNN configured with
`-DCMAKE_PREFIX_PATH=/opt/rocm`, installed, then consumer
configured/built/run with
`-DCMAKE_PREFIX_PATH="/tmp/hipdnn-optfb-install;/opt/rocm"` - Status:
Passed
- [ ] PR CI - GitHub PR checks - Status: Pending
## Technical Changes
- Removes `hipdnn_flatbuffers_sdk` local dependency export/include
bundling machinery and deletes the local-only package config template.
- Exports and installs only the `hipdnn_flatbuffers_sdk` target from
`hipdnn_flatbuffers_sdkTargets.cmake`.
- Uses the installed-package `flatbuffers::flatbuffers` target spelling
during local fetch builds by aliasing the fetched `FlatBuffers` target
for build-time include propagation.
- Enables regular FlatBuffers install participation in
`Dependencies.cmake` by building/installing the FlatBuffers package
target and not excluding the fetched subdirectory from parent install
rules.1 parent f3a04f0 commit c5ab56c
5 files changed
Lines changed: 15 additions & 110 deletions
File tree
- projects/hipdnn
- cmake
- flatbuffers_sdk
- cmake
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
177 | 177 | | |
178 | 178 | | |
179 | 179 | | |
180 | | - | |
| 180 | + | |
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
| |||
199 | 199 | | |
200 | 200 | | |
201 | 201 | | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | 202 | | |
208 | 203 | | |
209 | 204 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | 52 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
101 | 58 | | |
102 | | - | |
103 | 59 | | |
104 | 60 | | |
105 | 61 | | |
| |||
180 | 136 | | |
181 | 137 | | |
182 | 138 | | |
183 | | - | |
| 139 | + | |
184 | 140 | | |
185 | 141 | | |
186 | 142 | | |
187 | | - | |
188 | | - | |
189 | | - | |
| 143 | + | |
190 | 144 | | |
191 | 145 | | |
192 | 146 | | |
| |||
210 | 164 | | |
211 | 165 | | |
212 | 166 | | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
237 | 172 | | |
238 | 173 | | |
239 | 174 | | |
| |||
Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
| 5 | + | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
0 commit comments