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

Fix OpenMP again #1017

Merged
merged 5 commits into from
Jan 7, 2023
Merged

Fix OpenMP again #1017

merged 5 commits into from
Jan 7, 2023

Conversation

tilmantroester
Copy link
Contributor

No description provided.

@coveralls
Copy link

coveralls commented Jan 4, 2023 •
edited
Loading

Pull Request Test Coverage Report for Build 3856022942

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 97.528%
Totals Coverage Status
Change from base Build 3752001763: 0.0%
Covered Lines: 4852
Relevant Lines: 4975
💛 - Coveralls

@hsinfan1996 hsinfan1996 mentioned this pull request Jan 4, 2023
Closed
damonge
damonge reviewed Jan 5, 2023
View reviewed changes
Copy link
Collaborator

@damonge damonge left a comment

Choose a reason for hiding this comment

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

I think it looks ok, but can I check how this relates to #1018 and #1016?
Should the branch associated with #1018 be deleted?

CMakeLists.txt Show resolved Hide resolved
@hsinfan1996
Copy link
Contributor

hsinfan1996 commented Jan 6, 2023 •
edited
Loading

I think it looks ok, but can I check how this relates to #1018 and #1016? Should the branch associated with #1018 be deleted?

#1016 was meant to revert the changes made in #1000 and #1018 deal with AppleClang12. Intended changes from those two PRs are now here. The branch associated with 1018 is deleted.

@hsinfan1996 hsinfan1996 linked an issue Jan 6, 2023 that may be closed by this pull request
Fix conda-forge build for macOS arm64 #1014
Closed
damonge
damonge approved these changes Jan 6, 2023
View reviewed changes
Copy link
Collaborator

@damonge damonge left a comment

Choose a reason for hiding this comment

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

LGTM!

@tilmantroester tilmantroester merged commit 6e6c189 into master Jan 7, 2023
@hsinfan1996 hsinfan1996 deleted the fix_openmp_again branch March 18, 2023 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damonge damonge damonge 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.

Fix conda-forge build for macOS arm64
4 participants
@tilmantroester @coveralls @hsinfan1996 @damonge