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.

Sign up for GitHub

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

Jump to bottom

Properly handle compiler versions #334

Merged
merged 285 commits into from
Aug 19, 2024
Merged

Properly handle compiler versions #334

merged 285 commits into from
Aug 19, 2024

Conversation

lukehoffmann
Copy link
Collaborator

This PR covers issue #318

Compiler.get_version() will return a tuple of integer values, e.g. (8, 5, 0) instead of the string "8.5.0". This makes it possible to do greater-than and lesser-than comparisons with required compiler versions.

The different compiler classes will also verify that the version output contains the expected compiler name.

hiker and others added 30 commits March 26, 2024 11:05
@hiker
Removed unused glob import.
ab3ac33
Merge branch 'metomi/master' into bom_master after solving conflicts
380a210
@hiker
Fixed typo picked up in review.
9b9a510
@jasonjunweilyu
Merge pull request #8 from hiker/create_artefact_store
0e4e65a 
Create artefact store
@jasonjunweilyu
Merge pull request #12 from hiker/11_rsync_links
3e27672 
11 rsync links
@hiker
Merge remote-tracking branch 'origin/master' into 13_omp_sentinels
6a55726
Merge branch 'master' into bom_master
12111d4
@hiker
Merge remote-tracking branch 'upstream/master' into create_artefact_s…
4162c78 
…tore
@hiker
Merge branch 'create_artefact_store' into add_standard_artefacts
8877c49
@hiker
Fixed failing tests.
f9ed77e
@hiker
Replaced _artefact_store with getter as much as possible.
f22bbbf
@jasonjunweilyu
Merge pull request #16 from hiker/create_artefact_store
94a2970 
Create artefact store
@hiker
Merge remote-tracking branch 'upstream/master' into create_artefact_s…
ea6c34c 
…tore
@hiker
#3 Introduce Tool, Compiler, and ToolRepository.
119c613
@hiker
#3 Made ToolRepository a singleton.
840050e
@hiker
#3 Added ToolBox.
5a22091
@hiker
#3 Added dedicated enum for categories.
d288c0e
@hiker
#3 Add the category to a tool.
5fd2cfc
@hiker
#3 Use tool category when adding a tool to the tool box.
a5dd2af
@hiker
#3 Added preprocessor, and dictionary-like accesses to ToolBox.
b74055b
@hiker
#3 Added tool_box as mandatory parameter for a BuildConfig.
126b585
@hiker
#3 Start to use new compiler objects for Fortran compilation.
0bd9c31
@hiker
#3 Added tests for Compiler class.
c13476e
@hiker
#3 Add specific C- and Fortran-compiler classes. Updated tests.
c980171
@hiker
#3 Fixed typing.
1a7300d
@hiker
#3 Moved function to remove into Flags object, added test file for Fl…
36a6c05 
…ags.
@hiker
# Fixed tests to work with new Fortran compiler handling.
44073c1
@hiker
#3 Use for compiler variables if defined.
2a5bc86
@hiker
#3 Add is_available flag to tools, added types.
6f1c18a
@hiker
#3 Added cpp as Fortran preprocessor.
5ab1d75
lukehoffmann and others added 24 commits July 16, 2024 15:46
@lukehoffmann
Update some tests to use tuple versions
c5b1b02
@lukehoffmann
Explicitly test handling of bad version format
ccf4ad8
@lukehoffmann
Fix formatting
fd02c8c
@lukehoffmann
Tidying up
10eb726
@lukehoffmann
Make compiler raise an error for any invalid version string
ea18256 
Assume these compilers don't need to be hashed.
Saves dealing with empty tuples.
@lukehoffmann
Check compiler version string for compiler name
120116c
@lukehoffmann
Fix formatting
5a24c24
@lukehoffmann
Add compiler.get_version_string() method
dbc3d73 
Includes other cleanup from PR comments
@lukehoffmann
Use different version checkout for each compiler vendor with mixins
3bb726e
@lukehoffmann
Refactoring, remove unittest compiler class
286d457
@lukehoffmann
Fix some mypy errors
dae9102
@lukehoffmann
Use 'Union' type hint to fix build checks
cdcc023
@lukehoffmann
Return run_version_command to base Compiler class
0bdb734 
Provides default version command that can be overridden for other compilers.
Also fix some incorrect tests
Other tidying
@lukehoffmann
Add a missing type hint
b97ec50
@lukehoffmann
Remove inheritance from mixins and use protocol
19eab9f
@lukehoffmann
Simplify compiler inheritance
cbe1cb8 
Mixins have static methods with unique names,
overrides only happen in concrete classes
@hiker
Simplify usage of compiler-specific parsing mixins.
3076715
@hiker
Test for missing mixin.
7a50859
@hiker
Fixed test.
749fa2d
@hiker
Added more tests for invalid version numbers.
9598c09
@hiker
Added more test cases for invalid version number, improved regex to w…
5c6f99f 
…ork as expected.
@hiker
Fixed typo in test.
c1eb158
@hiker
Fixed test.
02fbb7b
@hiker
Merge remote-tracking branch 'upstream/master' into version_tuples
6826c85
@lukehoffmann lukehoffmann marked this pull request as ready for review August 14, 2024 07:50
allynt
allynt reviewed Aug 14, 2024
View reviewed changes
source/fab/tools/compiler.py Show resolved Hide resolved
source/fab/tools/compiler.py Show resolved Hide resolved
allynt
allynt approved these changes Aug 19, 2024
View reviewed changes
Copy link
Collaborator

@allynt allynt left a comment

Choose a reason for hiding this comment

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

All my comments have been addressed. So I am approving this.

@allynt allynt merged commit d0a92e8 into MetOffice:master Aug 19, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hiker hiker hiker left review comments

@allynt allynt allynt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lukehoffmann @allynt @hiker @jasonjunweilyu @MatthewHambley