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

Changes needed to run GEOS on M1 #274

Merged
merged 5 commits into from
Jun 15, 2022
Merged

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Jun 7, 2022

This is a tracking branch for M1 support of GEOS.

Current testing (with generous help from @iains), see:

GEOS-ESM/GEOSgcm#417

has shown that GEOS seems to not be happy with -march=native and whatever other flags we do for Aggressive. So, for now, we just make our Aggressive build match that of Release. Testing shows the Release flags seem to be pretty darn good so it's not like we are missing much.

@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Jun 7, 2022
@mathomp4 mathomp4 self-assigned this Jun 7, 2022
@mathomp4 mathomp4 requested a review from a team as a code owner June 7, 2022 16:28
# might need to be revisited for M1 Max/Ultra and M2+.
# Also, fail if a Linux Arm64
if (APPLE)
elseif (${proc_description} MATCHES "Apple M1")

Choose a reason for hiding this comment

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

I would add that this might be better as a regex. Apple just releases the M2, so hardcoding M1 may cause an issue.

Copy link
Member Author

Choose a reason for hiding this comment

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

@kgerheiser Hmm. I suppose. Maybe

elseif (${proc_description} MATCHES "Apple M")

would work? Then we are good until they release an...I dunno "X1" chip or whatever.

Of course, I don't have access to an M1 Max or Ultra yet, so I'm not sure what they report. I tried to read the CMake code to see how CMake generates this string but I got lost in the C++!

@mathomp4 mathomp4 merged commit c5fa3e6 into develop Jun 15, 2022
@mathomp4 mathomp4 deleted the feature/mathomp4/fixes-for-m1 branch June 15, 2022 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants