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

1677: dont rerun cmake for git ref #1683

Merged
merged 11 commits into from
Mar 1, 2022

Conversation

nmm0
Copy link
Collaborator

@nmm0 nmm0 commented Feb 22, 2022

Fixes #1677

This PR uses add_custom_command to act as a source file generator for src/vt/configs/generated/vt_git_revision.cc. It runs a cmake script (adapted from the earlier script) when any of: .git/HEAD, .git/packed-refs or .git/refs/<named-branch-ref> are modified. If they are modified, only vt_git_revision.cc will be rebuilt, and VT will need to be relinked. This will happen automatically. This avoids re-running cmake multiple times for no reason.

This additionally works correctly if a new branch was made and other changes to git occur.

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (gcc-10, ubuntu, openmpi, no LB)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (gcc-7, ubuntu, mpich, trace runtime, LB)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (clang-3.9, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (clang-5.0, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (gcc-5, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (gcc-8, ubuntu, mpich, address sanitizer)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (gcc-9, ubuntu, mpich, zoltan)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (gcc-6, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (nvidia cuda 10.1, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (clang-9, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (clang-10, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (clang-10, alpine, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Feb 22, 2022

PR tests (nvidia cuda 11.0, ubuntu, mpich)

Build for 6803ce6

Compilation - successful

Testing - passed

Build log

@codecov
Copy link

codecov bot commented Feb 22, 2022

Codecov Report

Merging #1683 (6803ce6) into develop (fc3bc79) will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1683      +/-   ##
===========================================
+ Coverage    83.42%   83.46%   +0.03%     
===========================================
  Files          799      799              
  Lines        30934    30934              
===========================================
+ Hits         25807    25819      +12     
+ Misses        5127     5115      -12     
Impacted Files Coverage Δ
src/vt/scheduler/priority_manip.cc 50.00% <0.00%> (-4.55%) ⬇️
src/vt/pipe/pipe_manager.cc 55.55% <0.00%> (-4.45%) ⬇️
src/vt/runtime/component/diagnostic.cc 47.05% <0.00%> (-2.95%) ⬇️
src/vt/vrt/collection/balance/lb_common.cc 65.38% <0.00%> (-1.29%) ⬇️
src/vt/trace/trace_event.cc 75.00% <0.00%> (-1.20%) ⬇️
src/vt/rdma/collection/rdma_collection.cc 0.00% <0.00%> (-1.17%) ⬇️
src/vt/context/runnable_context/td.cc 53.65% <0.00%> (-1.11%) ⬇️
src/vt/utils/compress/compressor.cc 84.21% <0.00%> (-0.79%) ⬇️
src/vt/runtime/mpi_access.cc 87.50% <0.00%> (-0.74%) ⬇️
src/vt/pipe/callback/cb_union/cb_raw_base.cc 58.92% <0.00%> (-0.73%) ⬇️
... and 33 more

cmake/run-git.cmake Outdated Show resolved Hide resolved
cmake/run-git.cmake Outdated Show resolved Hide resolved
@nmm0 nmm0 force-pushed the 1677-dont-rerun-cmake-for-git-ref branch from 1dbf89a to 6803ce6 Compare February 28, 2022 23:10
Copy link
Contributor

@cz4rs cz4rs left a comment

Choose a reason for hiding this comment

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

This looks good code-wise, still requires confirmation from Phil about the intended behavior.

Copy link
Member

@PhilMiller PhilMiller left a comment

Choose a reason for hiding this comment

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

EMPIRE build seems to behave appropriately with this integrated.

@PhilMiller PhilMiller merged commit 4491675 into develop Mar 1, 2022
cz4rs pushed a commit that referenced this pull request Mar 1, 2022
…-git-ref

1677: dont rerun cmake for git ref
cz4rs pushed a commit that referenced this pull request Mar 1, 2022
…-git-ref

1677: dont rerun cmake for git ref
cz4rs pushed a commit that referenced this pull request Mar 4, 2022
…-git-ref

1677: dont rerun cmake for git ref
cz4rs pushed a commit that referenced this pull request Mar 4, 2022
…-git-ref

1677: dont rerun cmake for git ref
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.

Stop using cmake code to generate git header information about sha, etc.
3 participants