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

Fix compile issues #159

Merged
merged 3 commits into from
Oct 29, 2022
Merged

Fix compile issues #159

merged 3 commits into from
Oct 29, 2022

Conversation

EliasLF
Copy link
Collaborator

@EliasLF EliasLF commented Oct 27, 2022

Description

  • Bumped the minimum required version of CMAKE to 3.19 (to enable the use of find_package_check_version)
  • Fixed issue in CMAKE when z3 python root path is empty
  • replaced std::regex_match with std::regex_search in the loading of coupling maps for a more lenient handling of white spaces in coupling map files

@burgholzer
Copy link
Member

Many thanks for these bugfixes!

Could you please resolve the conflicts in this PR so that CI starts properly?
The main branch has seen some recent additions. Maybe your fork got out of sync.

The changes themselves look good to me.
There are two spots in the documentation left, where it still refers to CMake 3.18:

https://github.com/cda-tum/qmap/blob/main/docs/source/Installation.rst

https://github.com/cda-tum/qmap/blob/main/docs/source/DevelopmentGuide.rst#working-on-the-core-c-library

Would be great to change those as well.

@burgholzer
Copy link
Member

Furthermore, please merge the mainbranch in after #165 is merged. This contains some bugfixes that made a couple of our tests fail.

@codecov
Copy link

codecov bot commented Oct 28, 2022

Codecov Report

Merging #159 (e90c291) into main (710035b) will not change coverage.
The diff coverage is 100.0%.

@@          Coverage Diff          @@
##            main    #159   +/-   ##
=====================================
  Coverage   91.8%   91.8%           
=====================================
  Files         24      24           
  Lines       2099    2099           
  Branches     414     414           
=====================================
  Hits        1927    1927           
  Misses       172     172           
Flag Coverage Δ
cpp 91.2% <100.0%> (ø)
python 94.2% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/Architecture.cpp 95.2% <100.0%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@EliasLF
Copy link
Collaborator Author

EliasLF commented Oct 28, 2022

The CI problems have been fixed now. Thank you for the pointer, it was really due to the fork being out of sync.

Also changed the 2 mentions of CMAKE versions in the documentation, that I missed.

Copy link
Member

@burgholzer burgholzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks. Good to have these out of the way!

@burgholzer burgholzer merged commit 9555fad into cda-tum:main Oct 29, 2022
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.

2 participants