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

Add fixes for building on macOS #495

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Conversation

shkodm
Copy link
Member

@shkodm shkodm commented Jan 15, 2024

Supersedes #493

  • -E in sed to be POSIX compliant
  • Remove regex in find to make it more tolerable and portable
  • find models/ produces extra slashes in results on macos ( i.e. models//multiphase/) but not on Linux. find models does not give extra slashes and behaves the same as find models/ on models

Tested on my M2 Macbook Air, all the clusters where I use TCLB, and my workstation.

@TravisMitchell FYI

I will also CI at some point, but not in this PR.

@llaniewski
Copy link
Member

Could you verify also if things that are recommended for install here:
https://github.com/CFD-GO/TCLB/blob/master/tools/install.sh#L292
are in tune with what you have?

Also, I remember other people running TCLB on mac needed some paths changed, and back then I wrote this:
https://github.com/CFD-GO/TCLB/blob/master/tools/env.sh
Is this still needed?

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f7f36f7) 35.14% compared to head (6024214) 39.63%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #495      +/-   ##
==========================================
+ Coverage   35.14%   39.63%   +4.48%     
==========================================
  Files         162      161       -1     
  Lines        6621     7178     +557     
==========================================
+ Hits         2327     2845     +518     
- Misses       4294     4333      +39     
Flag Coverage Δ
d2q9 ?
d3q27_PSM_NEBB 36.53% <ø> (?)
d3q27_pf_velocity 30.91% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shkodm
Copy link
Member Author

shkodm commented Jan 15, 2024

Also, I remember other people running TCLB on mac needed some paths changed, and back then I wrote this:
https://github.com/CFD-GO/TCLB/blob/master/tools/env.sh
Is this still needed?

I did not use it. Both in the script and in the tools/install.sh, gnu-sed and findutils are not needed, because macOS already ships those tools by default, and it is better not have random conflicts between them

Could you verify also if things that are recommended for install here:
https://github.com/CFD-GO/TCLB/blob/master/tools/install.sh#L292
are in tune with what you have?

I installed using the install.sh (and have all the packages that are installed there), but taking into the account the notice above. I don't think I did anything extra. When @TravisMitchell is going to install, he can verify.

@TravisMitchell
Copy link
Member

TravisMitchell commented Jan 15, 2024

Thanks @shkodm, it will be a couple weeks before I get the chance to test (lead time is on my mac is a bit slow) - but will let you know if anything else is needed for this.

@llaniewski llaniewski merged commit c47628a into CFD-GO:master Jan 16, 2024
53 checks passed
@shkodm shkodm deleted the hotfix/macos_build branch January 16, 2024 00:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants