Skip to content

Commit

Permalink
Merge pull request #1833 from DARMA-tasking/1832-release-1-1-1-beta-8
Browse files Browse the repository at this point in the history
1832: Create `1.1.1 beta v8` release candidate
  • Loading branch information
nlslatt authored May 27, 2022
2 parents 5a1d322 + 143b070 commit a0932b0
Show file tree
Hide file tree
Showing 255 changed files with 5,652 additions and 2,999 deletions.
10 changes: 5 additions & 5 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ UseTab: Never

AccessModifierOffset: -2
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignConsecutiveMacros: false
AlignConsecutiveAssignments: None
AlignConsecutiveDeclarations: None
AlignConsecutiveMacros: None
AlignEscapedNewlines: Left
AlignOperands: false
AlignTrailingComments: true
Expand Down Expand Up @@ -60,7 +60,7 @@ FixNamespaceComments: true
IncludeBlocks: Preserve
IndentCaseLabels: false
IndentGotoLabels: false
IndentPPDirectives: PPDIS_None
IndentPPDirectives: None
IndentWidth: 2
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
Expand All @@ -69,7 +69,7 @@ NamespaceIndentation: None
PenaltyReturnTypeOnItsOwnLine: 100
PointerAlignment: Left
ReflowComments: false
SortIncludes: false
SortIncludes: Never
SortUsingDeclarations: false
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
Expand Down
14 changes: 1 addition & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ get_directory_property(hasParent PARENT_DIRECTORY)
include(cmake/check_system_functions.cmake)

set(VIRTUAL_TRANSPORT_LIBRARY vt CACHE INTERNAL "" FORCE )
set(FCONTEXT_LIBRARY fcontext)

# Set the local module path so custom cmake scripts can be located automatically
set(
Expand All @@ -38,18 +37,7 @@ endif()

set(CMAKE_CXX_EXTENSIONS OFF)

if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_compile_options(-fdiagnostics-color=always)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_compile_options(-fcolor-diagnostics)
endif()

# Code coverage option of VT
option(CODE_COVERAGE "Enable coverage reporting" OFF)
# OPTION(CODE_COVERAGE_ENABLED FALSE)
# if(CODE_COVERAGE_ENABLED)
# include(cmake/code_coverage.cmake)
# endif(CODE_COVERAGE_ENABLED)

set(MPI_EXTRA_FLAGS "" CACHE STRING "Flags to pass to mpirun/mpiexec")
string(REPLACE " " ";" MPI_EXTRA_FLAGS_LIST "${MPI_EXTRA_FLAGS}")
Expand Down Expand Up @@ -111,7 +99,7 @@ add_subdirectory(src)
option(VT_BUILD_TESTS "Build VT tests" ON)

if (VT_BUILD_TESTS
AND CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
AND "${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
# CTest implies enable_testing() and defines the BUILD_TESTING option.
# The default of BUILD_TESTING is ON.
# Testing is only enabled if the actual project being built is VT.
Expand Down
207 changes: 207 additions & 0 deletions ci/azure/azure-clang-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
###############################################################################
############## Warning this is a generated file---do not modify ###############
###############################################################################

name: PR tests (clang-11, ubuntu, mpich)

trigger:
branches:
include:
- develop
- 1.0.0*

pr:
branches:
include:
- '*'


resources:
- repo: self

variables:
tag: '$(Build.BuildId)'
REPO: lifflander1/vt
ARCH: amd64
UBUNTU: 22.04
COMPILER_TYPE: clang
COMPILER: clang-11
BUILD_TYPE: release
ULIMIT_CORE: 0
CODE_COVERAGE: 0
VT_LB: 1
VT_TRACE: 0
VT_TRACE_RT: 0
VT_TRACE_ONLY: 1
VT_MIMALLOC: 0
VT_DOCS: 0
VT_ASAN: 0
VT_UBSAN: 0
VT_WERROR: 1
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_TESTS_NUM_NODES: 2
VT_UNITY_BUILD: 1
VT_PRODUCTION_BUILD: 0
VT_FCONTEXT: 0
VT_USE_OPENMP: 0
VT_USE_STD_THREAD: 0
VT_ZOLTAN: 0
VT_CI_BUILD: 1
VT_DIAGNOSTICS: 1
VT_NO_COLOR: 1
VT_BUILD_SHARED_LIBS: 0
VT_INCLUSION: TPL
CACHE: "$(Agent.TempDirectory)/cache/"
cache_name: ubuntu-clang-11-cache
build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
TS: 0
TS_YEAR: 0
TS_MONTH: 0
TS_DAY: 0



stages:
- stage: Build
displayName: Build image
jobs:
- job: Build
displayName: Build
pool:
vmImage: 'ubuntu-18.04'
timeoutInMinutes: 180
steps:
- task: Bash@3
displayName: Job setup
inputs:
targetType: 'inline'
script: |
echo setup
- task: Bash@3
displayName: Build timestamp for caching
continueOnError: true
inputs:
targetType: 'inline'
script: |
echo 'string(TIMESTAMP current_date "%H;%M;%S" UTC)' > script
echo 'execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${current_date}")' >> script
val=$(cmake -P script)
echo "##vso[task.setvariable variable=TS]$val"
echo 'string(TIMESTAMP current_date "%Y" UTC)' > script
echo 'execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${current_date}")' >> script
val=$(cmake -P script)
echo "##vso[task.setvariable variable=TS_YEAR]$val"
echo 'string(TIMESTAMP current_date "%m" UTC)' > script
echo 'execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${current_date}")' >> script
val=$(cmake -P script)
echo "##vso[task.setvariable variable=TS_MONTH]$val"
echo 'string(TIMESTAMP current_date "%d" UTC)' > script
echo 'execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${current_date}")' >> script
val=$(cmake -P script)
echo "##vso[task.setvariable variable=TS_DAY]$val"
- task: Bash@3
displayName: Output timestamp for caching
continueOnError: true
condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')
inputs:
targetType: 'inline'
script: 'echo "my pipeline variable is $(TS) $(TS_YEAR) $(TS_MONTH) $(TS_DAY)"'
- task: Cache@2
displayName: Update cache
continueOnError: true
condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')
inputs:
securityNamespace: cache
key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS)
path: '$(build_root)/ccache'
restoreKeys: |
$(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY)
$(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH)
$(Agent.OS) | "$(cache_name)" | $(TS_YEAR)
$(Agent.OS) | "$(cache_name)"
- task: Bash@3
displayName: Check for changes in containers
condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')
inputs:
targetType: 'inline'
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
displayName: Pull container
inputs:
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
- task: DockerCompose@0
displayName: Build container
inputs:
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: 'run ubuntu-cpp-clean'
env:
CODECOV_TOKEN: $(codecov_token)
- task: Bash@3
displayName: Put compilation's and tests' logs in PR comment
continueOnError: true
condition: and(succeededOrFailed(), eq(variables['Build.Reason'], 'PullRequest'))
inputs:
targetType: 'inline'
script: |
./scripts/report_logs_in_comment.sh \
"$(build_root)/vt/compilation_errors_warnings.out" \
"$(build_root)/vt/cmake-output.log" \
"$(Build.BuildNumber)" \
"$(System.PullRequest.PullRequestNumber)" \
"$(Build.Repository.Name)" \
"$GITHUB_PAT" \
"$(Build.BuildId)" \
"$(System.JobId)" \
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: 'push ubuntu-cpp-clean'
- task: Bash@3
displayName: Create artifacts
continueOnError: true
condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')
inputs:
targetType: 'inline'
script: |
zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log
zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log
- task: PublishPipelineArtifact@1
displayName: Upload CMake test output artifact
continueOnError: true
condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')
inputs:
targetPath: '$(Agent.TempDirectory)/LastTest.log.gz'
artifact: 'CMakeLastTestLog'
publishLocation: 'pipeline'
- task: PublishPipelineArtifact@1
displayName: Upload CMake full output artifact
continueOnError: true
condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')
inputs:
targetPath: '$(Agent.TempDirectory)/cmake-output.log.gz'
artifact: 'CMakeOutputLog'
publishLocation: 'pipeline'
- task: Bash@3
displayName: Finish pipeline
condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues')
inputs:
targetType: 'inline'
script: |
echo Done
Loading

0 comments on commit a0932b0

Please sign in to comment.