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

1679: Create 1.1.1 beta v7 release candidate #1682

Merged
merged 56 commits into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
db22225
#1636 add API for temporarily enabling/disabling debug prints
Jan 14, 2022
e6d3e56
#1636 document new functionality
Jan 18, 2022
9896d94
#1636 use theConfig instead of preConfigRef
Jan 19, 2022
5db473c
#1636 revert preConfigRef changes
Jan 19, 2022
fd710cb
#1636 change preprocessor directives indenting setting
Jan 24, 2022
75f6630
#1636 abort if vt is not yet initialized
Jan 24, 2022
c7379fd
#1636 add missing include
Feb 1, 2022
b1e3867
Merge pull request #1658 from DARMA-tasking/1636-api-temporarily-enab…
lifflander Feb 1, 2022
3575997
#1445: active: schedule messages on self-send
JacobDomagala Jul 1, 2021
a4ececd
#1445: active: Add LB stats instrumentation for self-send runnable ob…
JacobDomagala Jan 18, 2022
c20e83c
Merge pull request #1494 from DARMA-tasking/1445-schedule-msg-on-self…
lifflander Feb 8, 2022
0ba7993
#1667 remove features_enableif.h
Feb 3, 2022
f8f74d1
#1667 clean up configs/types
Feb 7, 2022
26650ed
#1667 clean up configs/debug
Feb 7, 2022
e4e188e
#1667 clean up configs/error
Feb 8, 2022
67a9e57
#1667 fix trace cmake
Feb 8, 2022
ffc9800
#1667 move preConfigRef() forward decleration back to debug_colorize.h
Feb 9, 2022
07f5d90
#1667 extract prettyPrintStack() to *.cc file
Feb 9, 2022
8d7ce4a
#1667 Move prettyPrintStack to stack_out
Feb 9, 2022
c7e7832
Merge pull request #1670 from DARMA-tasking/1667-config-includes-refa…
PhilMiller Feb 15, 2022
b9c9314
#1673: termination: use ds by default for rooted epochs
nlslatt Feb 15, 2022
0e178e1
#1673: collection: use non-ds epoch for construction
nlslatt Feb 15, 2022
6e4b47a
Merge pull request #1678 from DARMA-tasking/1673-use-ds-for-rooted-ep…
nlslatt Feb 16, 2022
49fb6da
#1685: trace: fix handler type for objgroup messages
lifflander Feb 23, 2022
66fc586
#1680: lb: only add to migration if its actually a migration
lifflander Feb 17, 2022
a6156df
#1677: cmake: Move git configuration detection into a standalone cmak…
nmm0 Feb 22, 2022
3f1ed14
#1685: runnable: require the handler type everywhere
lifflander Feb 23, 2022
dd385b7
Merge pull request #1681 from DARMA-tasking/1680-fix-migration-count
lifflander Feb 21, 2022
82e299b
#1677: cmake: run generator for git configurator as a custom command …
nmm0 Feb 22, 2022
6d014db
Merge pull request #1688 from DARMA-tasking/1685-fix-tracing-issue
lifflander Feb 24, 2022
eef0906
#1677: cmake: watch for changes in git refspec files
nmm0 Feb 22, 2022
2e6d4c2
#1677: cmake: set a secondary variable for refspec files so it can be…
nmm0 Feb 22, 2022
93ad318
#1677: cmake: clean up old git revision scripts
nmm0 Feb 22, 2022
2e9f85f
#1677: cmake: only depend on packed refs file if it exists
nmm0 Feb 22, 2022
046bf6d
#1677: cmake: don't silence git command errors
nmm0 Feb 22, 2022
8903884
#1677: cmake: use the parent directory of the .git folder to locate t…
nmm0 Feb 22, 2022
6daf3ff
#1677: cmake: set dependency on entire .git folder
nmm0 Feb 22, 2022
40ea610
#1677: cmake: get git folder using git rev-parse and similarly for th…
nmm0 Feb 23, 2022
b5c084a
#1550 allow users to pass AppConfig to vt during init
Feb 14, 2022
068808e
#1550 fix parameter type
Feb 15, 2022
ab6d241
#1550 fix runtime init
Feb 15, 2022
489ddff
#1550 print predefined options overwritten by CLI arguments
Feb 16, 2022
f90ddfe
#1550 clean up ArgConfig struct
Feb 16, 2022
dc177bd
#1677: cmake: fix newline EOF
nmm0 Feb 24, 2022
f628a7d
#1550 move comment to suitable place
Feb 16, 2022
6443e93
Merge pull request #1683 from DARMA-tasking/1677-dont-rerun-cmake-for…
PhilMiller Mar 1, 2022
0dd4a65
#1550 fix gcc10 unit tests failures
Feb 17, 2022
c3c25d7
#1550 fix typo in comment
Feb 17, 2022
808a149
#1550 add documentation
Feb 22, 2022
5464427
#1550 document command line arguments processing precedence
Feb 23, 2022
1408cc0
#1550 document and test order of parsing arguments passed from cli, f…
Feb 23, 2022
0b74ed1
#1692: make build script not error out when running cmake if .git fol…
nmm0 Mar 3, 2022
a2eb852
Merge pull request #1674 from DARMA-tasking/1550-allow-passing-appcon…
nlslatt Mar 2, 2022
ae489a2
#1692: remove vt_git_revision.h from root directory because it's not …
nmm0 Mar 3, 2022
2ff27b9
#1692: cmake: make version consistent and only modified in one place …
nmm0 Mar 3, 2022
8bfefd2
Merge pull request #1693 from DARMA-tasking/1692-dont-error-with-no-git
lifflander Mar 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ FixNamespaceComments: true
IncludeBlocks: Preserve
IndentCaseLabels: false
IndentGotoLabels: false
IndentPPDirectives: BeforeHash
IndentPPDirectives: PPDIS_None
IndentWidth: 2
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
Expand Down
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
project(vt VERSION 1.1.0)

file(READ "VERSION" _vt_version_str)
string(STRIP "${_vt_version_str}" _vt_version_str)
project(vt VERSION ${_vt_version_str})

# To generate output file with compilation errors and warnings
# CMake generator needs to be known
Expand Down Expand Up @@ -64,8 +67,6 @@ include(cmake/link_vt.cmake)
# Load packages that are required for core VT build
include(cmake/load_packages.cmake)

include(cmake/build_git_info.cmake)

include(cmake/check_compiler.cmake)

option(vt_gold_linker_enabled "Build VT using the `gold' linker" ON)
Expand Down
166 changes: 0 additions & 166 deletions cmake-modules/GetGitRevisionDescription.cmake

This file was deleted.

41 changes: 0 additions & 41 deletions cmake-modules/GetGitRevisionDescription.cmake.in

This file was deleted.

74 changes: 43 additions & 31 deletions cmake/build_git_info.cmake
Original file line number Diff line number Diff line change
@@ -1,34 +1,46 @@
find_package(Git REQUIRED)

include(GetGitRevisionDescription)
set(GIT_DIR)
set(HEAD_FILE)
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
WORKING_DIRECTORY
"${PROJECT_BASE_DIR}"
RESULT_VARIABLE
res
OUTPUT_VARIABLE
REL_GIT_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (NOT res EQUAL 0)
message(STATUS "git invocation failed, git info cannot be obtained")
else()
get_filename_component(GIT_DIR ${REL_GIT_DIR} ABSOLUTE BASE_DIR ${PROJECT_BASE_DIR})
message(STATUS "Git DIR: ${GIT_DIR}")
if (NOT GIT_DIR)
message(STATUS "no git directory present")
else()
if(NOT EXISTS "${GIT_DIR}/HEAD")
message(STATUS "no such file: \"${GIT_DIR}/HEAD\"")
else()
set(HEAD_FILE "${GIT_DIR}/HEAD")
message(STATUS "Git HEAD file: \"${HEAD_FILE}\"")
endif()
endif()
endif()

get_git_head_revision(GIT_REFSPEC GIT_SHA1)
set(VT_GIT_CONFIG_FILE "${PROJECT_BIN_DIR}/src/vt/configs/generated/vt_git_revision.cc")
add_custom_command(
OUTPUT ${VT_GIT_CONFIG_FILE}
COMMAND ${CMAKE_COMMAND}
-DIN_FILE=${PROJECT_BASE_DIR}/vt_git_revision.cc.in
-DOUT_FILE=${VT_GIT_CONFIG_FILE}
-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
-DGIT_DIR=${GIT_DIR}
-DHEAD_FILE=${HEAD_FILE}
-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}
-P ${CMAKE_CURRENT_LIST_DIR}/run-git.cmake
DEPENDS ${GIT_DIR}
)

# set some variables related to GIT state information
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
git_describe(GIT_EXACT_TAG --tags --abbrev=0 --all)
git_describe(GIT_DESCRIPTION --abbrev=10 --always --tags --long --all)
git_local_changes(GIT_CLEAN_STATUS)

message(STATUS "REF:${GIT_REFSPEC}")
message(STATUS "REF:${GIT_SHA1}")
message(STATUS "REF:${GIT_DESCRIPTION}")
message(STATUS "REF:${GIT_CLEAN_STATUS}")
message(STATUS "REF:${GIT_EXACT_TAG}")

configure_file(
${PROJECT_BASE_DIR}/vt_git_revision.cc.in
${PROJECT_BIN_DIR}/src/vt/configs/generated/vt_git_revision.cc
@ONLY
)

# install(
# FILES "${PROJECT_BINARY_DIR}/${cur_build_type}/cmake_config.h"
# DESTINATION include
# CONFIGURATIONS ${cur_build_type}
# )

# configure_file(
# "${PROJECT_SOURCE_DIR}/vt_git_revision.cc.in"
# "${CMAKE_CURRENT_BINARY_DIR}/vt_git_revision.cc"
# @ONLY
# )
target_sources(${VIRTUAL_TRANSPORT_LIBRARY} PRIVATE ${VT_GIT_CONFIG_FILE})
6 changes: 3 additions & 3 deletions cmake/load_doxygen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ if (${vt_doxygen_enabled})
set(doxygen_out ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)

set(DOXYGEN_PROJECT_NAME "vt")
set(VERSION_MAJOR "1")
set(VERSION_MINOR "0")
set(VERSION_PATCH "0")
set(VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
set(VERSION_MINOR "${PROJECT_VERSION_MINOR}")
set(VERSION_PATCH "${PROJECT_VERSION_PATCH}")
set(DOXYGEN_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/")
set(DOXYGEN_CHECKPOINT_SHARED_DOCS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/checkpoint/docs/shared")
set(DOXYGEN_CHECKPOINT_EXAMPLE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/checkpoint/examples")
Expand Down
Loading