Skip to content

TEMP: post-#1860 cleanup — rename inference-addon-cppConfig.cmake.in + bump qvac-lib-inference-addon-cpp / qvac-lint-cpp pins#1959

Merged
gianni-cor merged 1 commit into
tetherto:mainfrom
darkynt:feat/mc/cmakelists-fixup
May 8, 2026
Merged

Conversation

@darkynt

@darkynt darkynt commented May 8, 2026

Copy link
Copy Markdown
Contributor

⚠️ Temporary PR. It only makes sense in combination with tetherto/qvac-registry-vcpkg#139. Land that registry PR first, then this one. Both should eventually be superseded by a single follow-up that also bumps each package's `vcpkg-configuration.json` baseline; until that happens the deps below dangle until consumers' registry caches are refreshed.

Summary

PR #1860 (commit `1d1d8c3a`) renamed the monorepo packages and switched every consumer's CMakeLists / source #include directives to the post-rename namespaces (`share/lint-cpp/`, `include/inference-addon-cpp/`). It missed two things:

  1. `packages/inference-addon-cpp/cmake/qvac-lib-inference-addon-cppConfig.cmake.in` was never `git mv`'d to its post-rename name. The package's own `CMakeLists.txt:41` already references `cmake/inference-addon-cppConfig.cmake.in`, so any vcpkg port build of `qvac-lib-inference-addon-cpp` that pulls source at `1d1d8c3a` fails at `configure_package_config_file()`.

  2. Each consumer's `vcpkg.json` still pins old port revisions (`qvac-lib-inference-addon-cpp >= 1.1.5#1` / `qvac-lint-cpp >= 1.4.4#2`). Those pre-rename revisions install under the legacy paths (`include/qvac-lib-inference-addon-cpp/`, `share/qvac-lint-cpp/`), so the new `find_path()` probes return `NOTFOUND` and `#include <inference-addon-cpp/...>` doesn't resolve.

What this PR does

  • `git mv packages/inference-addon-cpp/cmake/qvac-lib-inference-addon-cppConfig.cmake.in packages/inference-addon-cpp/cmake/inference-addon-cppConfig.cmake.in` — completes the rename PR QVAC-16441 feat: simplify package folders, files and paths in the monorepo #1860 forgot. Template file body is just `@PACKAGE_INIT@` + `@PROJECT_NAME@` substitutions, no edits needed.

  • Bumps `version>=` constraints in 10 consumer `vcpkg.json` files:

    • `qvac-lib-inference-addon-cpp`: `1.1.5#1` (or `1.1.6`) → `1.1.7#1`
    • `qvac-lint-cpp`: `1.4.4#2` → `1.4.4#3`

    Affected packages: `bci-whispercpp`, `diffusion-cpp`, `embed-llamacpp`, `llm-llamacpp`, `ocr-onnx`, `onnx`, `transcription-parakeet`, `transcription-whispercpp`, `translation-nmtcpp`, `tts-onnx`. (`lint-cpp` and `inference-addon-cpp` themselves are skipped — they declare the ports rather than consuming them.)

The two new revisions `qvac-lib-inference-addon-cpp@1.1.7#1` and `qvac-lint-cpp@1.4.4#3` are exactly what tetherto/qvac-registry-vcpkg#139 publishes — bumping `QVAC_REF` to `1d1d8c3a` so they install under the post-rename namespaces.

NOT in this PR

  • No `vcpkg-configuration.json` baseline bumps (consumers will lift their baseline pin in a separate, larger sweep so qvac-fabric and the rest of the registry are coordinated together).
  • No source / CMakeLists rewrites.
  • No `vcpkg/ports/*` overlay vendoring (we tried that path; it's redundant once test: verify cpp-lint workflow fix #139 lands).
  • No fix for downstream API churn — `qvac-lib-inference-addon-cpp@1.1.7` source uses `common_init_result_ptr` (PR Port LlamacppUtils.hpp helpers to common_init_result_ptr API #1887); consumer source files (e.g. `packages/llm-llamacpp/addon/src/model-interface/LlamaModel.cpp`) still call the pre-`_ptr` API. CI on `llm-llamacpp` / `embed-llamacpp` will hit a `'common_init_result_ptr' → 'common_init_result'` conversion error until a separate follow-up ports the consumer code to the new helper API.

Merge order

  1. Merge tetherto/qvac-registry-vcpkg#139. This publishes `qvac-lint-cpp@1.4.4#3` and `qvac-lib-inference-addon-cpp@1.1.7#1`.
  2. Refresh consumer registry caches (`bare-make generate` / vcpkg manifest install) so the new revisions are visible.
  3. Merge this PR. The bumped `version>=` pins resolve to the new revisions, install paths line up with the post-QVAC-16441 feat: simplify package folders, files and paths in the monorepo #1860 `find_path()` / `#include` directives, and the addon CMakeLists configures cleanly.

@gianni-cor gianni-cor force-pushed the feat/mc/cmakelists-fixup branch from de05b31 to 542ea59 Compare May 8, 2026 21:54
…1 / #1860)

PR #1860 (commit 1d1d8c3) renamed the inference-addon-cpp package and
updated its CMakeLists.txt to look up the package config template at
cmake/inference-addon-cppConfig.cmake.in, but the template file itself
was never moved off the legacy filename. As a result every vcpkg port
build of qvac-lib-inference-addon-cpp@1.1.7#1 fails at configure time:

    CMake Error at .../cmake/CMakePackageConfigHelpers.cmake:519 (configure_file):
      configure_file Problem configuring file
    Call Stack (most recent call first):
      CMakeLists.txt:41 (configure_package_config_file)

Just complete the rename: git mv the template to the short post-rename
name. Contents are template-only (`@PACKAGE_INIT@` + `@PROJECT_NAME@`)
and need no edits.

Co-authored-by: Cursor <cursoragent@cursor.com>
@donriddo

donriddo commented May 8, 2026

Copy link
Copy Markdown
Contributor

/review

@github-actions

github-actions Bot commented May 8, 2026

Copy link
Copy Markdown
Contributor

Tier-based Approval Status

**PR Tier:** TIER1

**Current Status:** ✅ APPROVED

**Requirements:**
- 1 Team Member approval ✅ (1/1)
- 1 Team Lead OR Management approval ✅ (1/1)



---
*This comment is automatically updated when reviews change.*

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - iOS

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: iOS
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

@github-actions

github-actions Bot commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

❌ E2E Mobile Test Results - Android

Overall Status: FAILED
Device Farm Result: UNKNOWN
Platform: Android
Addon: @qvac/translation-nmtcpp
PR: #1959
Commit: 1d1d8c3

Test Summary

Metric Count
Total Tests 0
✅ Passed 0
❌ Failed 0
⏭️ Skipped 0

Links


Automated E2E mobile testing powered by AWS Device Farm
Tests located in: test/mobile/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants