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

Bring develop up to main #389

Merged
merged 18 commits into from
Feb 27, 2025
Merged

Bring develop up to main #389

merged 18 commits into from
Feb 27, 2025

Conversation

hiker
Copy link
Collaborator

@hiker hiker commented Feb 14, 2025

This PR is only to bring develop up to master. I realised that when one older PR got merged into main, we've updated the individual PRs that follow, but we never updated develop, so develop misses all the changes asked for in the code review on master.

This should bring the latest changes from main into master.

I'd guess in the future when a new PR is merged into master, we might have to:

  1. bring all follow-up PRs up to date (by merging main into branch1, branch1 into branch2, ... (which is what we have been doing)
  2. merge at least branch1 into develop again (and if there should be conflicts in further branches that were resolved in step 1, I guess we merge this all back in.

hiker and others added 18 commits November 22, 2024 00:42
@hiker
Fixed failing tests.
032ab26
@hiker
Improve support for MPI wrappers (#352)
e7ae9fe
@hiker
Merge remote-tracking branch 'origin/main' into linker-lib-flags2
d806432
@hiker
Updated documentation.
f8b3a2b
@hiker
Addressed issues raised in review.
4e7198b
@hiker
Added more info about removing lib info.
1b22d98
@MatthewHambley
Update clang binding module. (#376)
224664c
@hiker
Merge remote-tracking branch 'origin/main' into linker-lib-flags2
3a07639
@hiker
Removed remove_lib_flags function since there seems to be no real use…
ee743b8 
… case for it.
@hiker
Remove support for '-' in nvidia version numbers (which causes proble…
ca139c1 
…ms with compiler wrapper which do not support this).
@hiker
Fix regex for Cray compiler.
9218aa8
@hiker
More improvements for Cray version regex.
e01f1ce
@hiker
Cleaner handling of linking external libraries (#374)
fed4feb
@hiker
Merge branch 'main' into additional_compilers_clean
70d9466
@hiker
Removed likely a merge artefact.
e1bfe09
@hiker
Merge remote-tracking branch 'origin/linker-lib-flags2' into develop
b8966f9
@hiker
Merge remote-tracking branch 'origin/additional_compilers_clean' into…
7b49e09 
… develop
@hiker
Try to fix pytest failures on github.
ef8c337
@hiker hiker requested a review from jasonjunweilyu February 14, 2025 22:43
jasonjunweilyu
jasonjunweilyu approved these changes Feb 27, 2025
View reviewed changes
Copy link
Collaborator

@jasonjunweilyu jasonjunweilyu left a comment

Choose a reason for hiding this comment

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

Just realized that I still have this PR for review. Sorry for forgetting about it. I think the changes are ready to be in develop.

@jasonjunweilyu jasonjunweilyu merged commit 0829610 into develop Feb 27, 2025
11 checks passed
@jasonjunweilyu jasonjunweilyu deleted the bring_develop_up_to_main branch February 27, 2025 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasonjunweilyu jasonjunweilyu jasonjunweilyu 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.
3 participants
@hiker @jasonjunweilyu @MatthewHambley