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

Build the samples on the CI services #649

Merged
merged 5 commits into from
Jun 17, 2019

Conversation

bryanwweber
Copy link
Member

@bryanwweber bryanwweber commented Jun 12, 2019

zerodim.h used to have Func1.h included indirectly, so make it explicit.
For samples, make sure that OpenMP and Accelerate are not exclusive
options on macOS
Apple's clang on macOS requires the libomp to link. Apple symlinks gcc
to clang, so it can't be detected as clang by executable name
@bryanwweber bryanwweber force-pushed the build_samples_on_ci branch 2 times, most recently from f973ebb to 7985ff6 Compare June 12, 2019 23:54
@bryanwweber
Copy link
Member Author

I guess this supersedes #647. Whoops!

@bryanwweber bryanwweber mentioned this pull request Jun 13, 2019
Copy link
Member

@speth speth left a comment

Choose a reason for hiding this comment

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

Looks good. Feel free to merge after making the one suggested change.

@@ -51,7 +51,7 @@ void run()
// thread in cases where the workload is biased, e.g. calculations for low
// T0 take longer than calculations for high T0.
#pragma omp parallel for schedule(static, 1)
for (size_t i = 0; i < nPoints; i++) {
for (int i = 0; i < nPoints; i++) {
Copy link
Member

Choose a reason for hiding this comment

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

Needing to change this to a signed type is unfortunate. In this case, nPoints should also be changed to an int, as well other variables which are compared to nPoints (i.e. the loop index in the preceding loop) to avoid compiler warnings about "comparison between signed and unsigned integer expressions".

Requires libomp on macOS from homebrew. OpenMP with Visual C/C++ requires
the loop index to be a signed type (from OpenMP < 3.0).
@codecov
Copy link

codecov bot commented Jun 15, 2019

Codecov Report

Merging #649 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #649      +/-   ##
=========================================
+ Coverage   68.49%   68.5%   +<.01%     
=========================================
  Files         368     368              
  Lines       40027   40027              
=========================================
+ Hits        27418   27419       +1     
+ Misses      12609   12608       -1
Impacted Files Coverage Δ
src/transport/GasTransport.cpp 90.98% <0%> (+0.2%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a5c270...fb14816. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jun 15, 2019

Codecov Report

Merging #649 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #649      +/-   ##
=========================================
+ Coverage   68.49%   68.5%   +<.01%     
=========================================
  Files         368     368              
  Lines       40027   40027              
=========================================
+ Hits        27418   27419       +1     
+ Misses      12609   12608       -1
Impacted Files Coverage Δ
src/transport/GasTransport.cpp 90.98% <0%> (+0.2%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a5c270...fb14816. Read the comment docs.

@bryanwweber bryanwweber merged commit 444ef91 into Cantera:master Jun 17, 2019
@bryanwweber bryanwweber deleted the build_samples_on_ci branch June 17, 2019 14:29
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.

2 participants