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

#2174: Integrate vt-tv api into lb data export #2294

Merged
merged 37 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e15ded2
#2174: add initial integration of vt-tv
pierrepebay May 28, 2024
68ae672
#2174: add small vt fixes
cwschilly Jun 18, 2024
d3d2b1c
#2174: update build script
pierrepebay Jul 8, 2024
e6e58e4
#2174: remove duplicated vt-tv build
cwschilly Jul 8, 2024
e9eb54e
#2174: fix failing test; resolve more warnings
cwschilly Jul 9, 2024
5a432ca
#2174: fix vtk.sh script
cwschilly Jul 10, 2024
5274a63
#2174: add azure pipeline to build vtk and vttv
cwschilly Jul 10, 2024
df20220
#2174: update all azure workflows
cwschilly Jul 10, 2024
197eff7
#2174: fix whitespace error in vtk_dir variable
cwschilly Jul 10, 2024
9ca826c
#2174: fix default value for VTK_DIR
cwschilly Jul 10, 2024
ac40092
#2174: improve cmake and add testing for vttv when enabled
cwschilly Jul 11, 2024
9399be3
#2174: update vttv azure pipeline
cwschilly Jul 11, 2024
8bae069
#2174: remove vtk dir from cmake variables
cwschilly Jul 11, 2024
ccfa0cd
#2174: remove vtk_dir from azure configs
cwschilly Jul 11, 2024
a31ec65
#2174: run vttv pipeline in draft (temporarily)
cwschilly Jul 11, 2024
1d2e7d1
#2174: try dockerfile fix
cwschilly Jul 11, 2024
fbba728
#2174: rework vt_tv_enabled logic
cwschilly Jul 11, 2024
f9b6256
#2174: try different comparison in dockerfile
cwschilly Jul 12, 2024
1ef1b00
#2174: add new dockerfile with vtk build
cwschilly Jul 15, 2024
418cbf2
#2174: update vttv workflow
cwschilly Jul 15, 2024
56e78ba
#2174: don't remove vtk source directory after building
cwschilly Jul 15, 2024
52ae4e3
#2174: disable trace_only build on vttv pipeline
cwschilly Jul 16, 2024
785dd18
#2174: only run vttv pipeline when PR is ready for review
cwschilly Jul 18, 2024
0578600
#2174: add vt-tv params to yaml options
cwschilly Jul 18, 2024
5a738a6
#2174: small bug fixes
cwschilly Jul 23, 2024
41c472f
#2174: update clang-16 workflow with vttv option
cwschilly Aug 1, 2024
5b7fae9
#2174: small improvements
cwschilly Aug 1, 2024
ad76c21
#2174: restore original operator+ function signature
cwschilly Aug 2, 2024
7bc6d6f
#2174: add lib/vt-tv to .gitignore
cwschilly Aug 2, 2024
ac7dec5
#2174: restore cmakelists to original order
cwschilly Aug 2, 2024
659348e
#2174: remove CMAKE_POSITION_INDEPENDENT_CODE and create gatherTVGlob…
cwschilly Aug 6, 2024
6e8abcf
#2174: load local packages after bundled libraries
cwschilly Aug 9, 2024
e72cb28
#2174: remove unneeded output field from vttv config
cwschilly Aug 15, 2024
94782d1
#2174: update azure pipelines after rebase
cwschilly Aug 27, 2024
ef4b213
#2174: delete vtk source directory after building; do not install vtk
cwschilly Sep 10, 2024
7d63592
#2174: use vtk install dir instead of build dir
cwschilly Sep 11, 2024
25361b6
#2174: target 1.5.0 tag for vt-tv build
cwschilly Sep 17, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ lib/*-build
lib/checkpoint
lib/googletest
lib/kokkos
lib/vt-tv
.emacs.desktop
.clangd/
.vscode/
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ include(cmake/configure_options.cmake)
include(cmake/check_compiler.cmake)
include(cmake/nvcc_no_deprecated_gpu_targets.cmake)
include(cmake/load_bundled_libraries.cmake)

include(cmake/load_local_packages.cmake)

# Primary VT build
add_subdirectory(src)
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-10-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-12-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-13-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-14-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 1
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-16-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: EXT_LIB
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-clang-alpine-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: false
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-gcc-10-ubuntu-openmpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-gcc-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-gcc-12-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 1
VT_KOKKOS_ENABLED: 1
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
216 changes: 216 additions & 0 deletions ci/azure/azure-gcc-12-ubuntu-vttv.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
###############################################################################
############## Warning this is a generated file---do not modify ###############
###############################################################################

name: PR tests (gcc-12, ubuntu, vttv)

trigger:
branches:
include:
- develop
- main

pr:
drafts: false
autoCancel: true
branches:
include:
- '*'


resources:
- repo: self

variables:
tag: '$(Build.BuildId)'
REPO: lifflander1/vt
ARCH: amd64
UBUNTU: 22.04
COMPILER_TYPE: gnu
COMPILER: gcc-12
HOST_COMPILER: gcc-12
BUILD_TYPE: release
ULIMIT_CORE: 0
VT_CODE_COVERAGE: 0
VT_LB: 1
VT_TRACE: 0
VT_TRACE_RT: 0
VT_TRACE_ONLY: 0
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_EXTERNAL_FMT: 0
VT_UNITY_BUILD: 1
VT_PRODUCTION_BUILD: 0
VT_FCONTEXT: 0
VT_ZOLTAN: 0
VT_CI_BUILD: 1
VT_DIAGNOSTICS: 1
VT_NO_COLOR: 1
VT_BUILD_SHARED_LIBS: 0
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 1
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
CACHE: "$(Agent.TempDirectory)/cache/"
cache_name: ubuntu-gcc-12-cache
volume_name: ubuntu-cpp
build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(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-22.04'
timeoutInMinutes: 180
steps:
- checkout: self
fetchDepth: 0
- task: Bash@3
displayName: Build timestamp for caching
continueOnError: true
condition: eq(variables['RUN_FULL_CI'], '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: and(eq(variables['RUN_FULL_CI'], 'true'), 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: and(eq(variables['RUN_FULL_CI'], 'true'), in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
inputs:
securityNamespace: cache
key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS)
path: '$(build_root)$(volume_name)/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@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-vtk'
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: 'run ubuntu-cpp-vtk'
env:
CODECOV_TOKEN: $(codecov_token)
- task: Bash@3
displayName: Put compilation's and tests' logs in PR comment
continueOnError: true
condition: and(eq(variables['RUN_FULL_CI'], 'true'), and(succeededOrFailed(), eq(variables['Build.Reason'], 'PullRequest')))
inputs:
targetType: 'inline'
script: |
./scripts/report_logs_in_comment.sh \
"$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \
"$(build_root)$(volume_name)/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@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: 'push ubuntu-cpp-vtk'
- task: Bash@3
displayName: Create artifacts
continueOnError: true
condition: and(eq(variables['RUN_FULL_CI'], 'true'), in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues'))
inputs:
targetType: 'inline'
script: |
zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log
zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log
- task: PublishPipelineArtifact@1
displayName: Upload CMake test output artifact
continueOnError: true
condition: and(eq(variables['RUN_FULL_CI'], 'true'), 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: and(eq(variables['RUN_FULL_CI'], 'true'), 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
1 change: 1 addition & 0 deletions ci/azure/azure-gcc-8-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-gcc-9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 1
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 1
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 0
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
1 change: 1 addition & 0 deletions ci/azure/azure-nvidia-12-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ variables:
VT_INCLUSION: TPL
VT_DEBUG_VERBOSE: 1
VT_KOKKOS_ENABLED: 0
VT_TV_ENABLED: 0
CMAKE_CXX_STANDARD: 17
VT_CI_TEST_LB_SCHEMA: 0
RUN_FULL_CI: true
Expand Down
Loading