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

Add timeOperations include to fed-filter example and missing quotes to log messages #49

Merged
merged 5 commits into from
May 25, 2022

Conversation

laurmarinovici
Copy link
Collaborator

I have merged the bug fix in main and the helics3-ns3 updates in helics3-update-v2 and tested it. I would like to have all these updates in the main branch, so that main can be HELICS V3 compatible.

@nightlark
Copy link
Member

nightlark commented Feb 28, 2022

Currently there are two blockers for this -- first is that the current source release of HELICS has a bug that is breaks the CI tests for helics-ns3, and the second is #45 needs to get merged to main which I think will require some form of tag to mark the "last compatible" HELICS v2 version of this module.

The broken CI builds should be resolved (this week?) when 3.2 is released.

ns-3 is also switching from waf to CMake, so it would be nice to get #47 into the last v2 compatible release to try to keep it working with new ns-3 releases for a bit longer.

@nightlark
Copy link
Member

Okay, so update on where things are at right now:

  • HELICS 3.2 should be getting tagged and released next week
  • I'm going to be out until the following week; when I get back I'll target getting helics-ns3 updated the week of May 9-13

@nightlark nightlark changed the title Helics3 update v2 merge into main Add timeOperations include to fed-filter example and missing quotes to log messages May 25, 2022
@nightlark
Copy link
Member

nightlark commented May 25, 2022

I updated the description of this PR to match the changes made relative to PR #45.

@laurmarinovici can you test the main branch once this is merged to make sure it works for you (with an ns-3 version prior to ns-3.36)? If it works without issues, I'll make a release with a tag for this as the one to use for versions prior to ns-3.35.

Next will be adding support for building with CMake for compatibility with ns-3.36 and later (and likely drop support for building with waf; aside from having a slightly broken contrib module system, ns-3.36 also includes breaking changes to the code that will make helics-ns3 not be backwards compatible).

@nightlark nightlark merged commit be95fbf into main May 25, 2022
@nightlark nightlark deleted the helics3-update-v2 branch May 25, 2022 19:05
@nightlark nightlark added the bug Something isn't working label May 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants