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

Upgrade CapNProto from v0.9.1 to v1.0.2 #2575

Merged

Conversation

AlexandreSinger
Copy link
Contributor

See issue #2557 for context.

Upgraded the capnproto subtree from v0.9.1 to v1.0.2.

In order to upgrade CapNProto to a new version (simply), had to remove
the old folder entirely before upgrading to a new version.

Due to how the subtree script works, this must be done in its own
commit.
git-subtree-dir: libs/EXTERNAL/capnproto
git-subtree-split: 1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc
capnproto: Adding libs/EXTERNAL/capnproto/ as an external git subtree from https://github.com/capnproto/capnproto.git v1.0.2
@github-actions github-actions bot added VPR VPR FPGA Placement & Routing Tool lang-cpp C/C++ code lang-make CMake/Make code lang-shell Shell scripts (bash etc.) external_libs labels Jun 3, 2024
On CI, A CMake deprecation error occurs since CMake version < 3.5 will
be removed in a future version of CMake.

On the dev branch of CapNProto, they fixed this issue by setting the
minimum CMake version to 3.16:
capnproto/capnproto@2354ae2

Replicated these changes locally. Hopefully the next time we upgrade
CapNProto this will be in the changes.
@AlexandreSinger
Copy link
Contributor Author

@vaughnbetz This has passed CI. It resolves the deprecation warnings from std::iterator. Relatively basic upgrade with no big road-blocks.

This also resolves an issue with the current master. The most recent merged commit did not compile. There was an ambiguous reference to an enum in vpr/src/pack/cluster_util.cpp. I have resolved this issue in this PR.

@vaughnbetz
Copy link
Contributor

Ah, I also just saw and fixed that too :). A lesson to merge for merging PRs that have been around a while without hitting the update button -- was trying to save some CI cycles.

@vaughnbetz vaughnbetz merged commit 2d967b3 into verilog-to-routing:master Jun 4, 2024
53 checks passed
@AlexandreSinger AlexandreSinger deleted the feature-upgrade-capnp branch June 4, 2024 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
external_libs lang-cpp C/C++ code lang-make CMake/Make code lang-shell Shell scripts (bash etc.) VPR VPR FPGA Placement & Routing Tool
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants