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

Fixes from M1 work #1439

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Fixes from M1 work #1439

merged 1 commit into from
Mar 17, 2022

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Mar 17, 2022 •
edited
Loading

Description

This PR brings over the M1 Mac changes found in concert with @natalie-perlin. These include removing a (currently not supported by M1 GNU) REAL128 variable as well as a CMake change for building when Baselibs is not found.

Related Issue

Motivation and Context

It should let MAPL build on an M1. If nothing else, it doesn't break building on other chips.

How Has This Been Tested?

I've built and ran with the GEOSgcm and zero-diff.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Trivial change (affects only documentation or cleanup)

Checklist:

  • I have tested this change with a run of GEOSgcm (if non-trivial)
  • I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
  • I have updated the CHANGELOG.md accordingly following the style of Keep a Changelog

@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Mar 17, 2022
@mathomp4 mathomp4 self-assigned this Mar 17, 2022
@mathomp4 mathomp4 marked this pull request as ready for review March 17, 2022 17:44
@mathomp4 mathomp4 requested review from a team as code owners March 17, 2022 17:44
@mathomp4
Copy link
Member Author

No reason adas should fail. I'll re-run.

@mathomp4 mathomp4 merged commit 95b0906 into develop Mar 17, 2022
@mathomp4 mathomp4 deleted the feature/mathomp4/m1-fixes-for-develop branch March 17, 2022 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tclune tclune tclune approved these changes

Assignees

@mathomp4 mathomp4

Labels
0 Diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mathomp4 @tclune