diff --git a/.env b/.env index da82ce84c9..b1e6d3c01e 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ REPO=lifflander1/vt ARCH=amd64 -UBUNTU=18.04 +UBUNTU=22.04 ULIMIT_CORE=0 -COMPILER=gcc-7 +COMPILER=gcc-12 COMPILER_TYPE=gnu PROXY= CACHE= diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index dbb595636f..3e1f956475 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -16,7 +16,7 @@ jobs: ARCH: amd64 UBUNTU: 18.04 COMPILER_TYPE: gnu - COMPILER: gcc-7 + COMPILER: gcc-8 BUILD_TYPE: release ULIMIT_CORE: 0 VT_LB: 1 diff --git a/.github/workflows/macosx-clang-mpich.yml b/.github/workflows/macosx-clang-mpich.yml index 04ddf42da9..9f640a9127 100644 --- a/.github/workflows/macosx-clang-mpich.yml +++ b/.github/workflows/macosx-clang-mpich.yml @@ -1,11 +1,11 @@ -name: PR tests (clang-8, macosx, mpich) +name: PR tests (clang-14, macosx, mpich) # Trigger the workflow on push or pull request on: push: branches: - develop - - 1.* + - main pull_request: types: [opened, reopened, synchronize, converted_to_draft, ready_for_review] @@ -15,7 +15,7 @@ concurrency: jobs: build: - runs-on: macos-latest + runs-on: macos-12 if: github.event.pull_request.draft == false @@ -36,14 +36,14 @@ jobs: - uses: actions/cache@v3 with: path: ~/.ccache - key: ${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }} + key: ${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }} restore-keys: | - ${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }} + ${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }} - uses: actions/cache@v3 id: mpich-cache with: path: ~/.mpich - key: ${{ runner.os }}-macosx-clang-8-mpich-${{ hashFiles('**/.github/workflows/macosx-clang-mpich.yml', '**/ci/deps/mpich.sh') }} + key: ${{ runner.os }}-macosx-clang-14-mpich-${{ hashFiles('**/.github/workflows/macosx-clang-mpich.yml', '**/ci/deps/mpich.sh') }} - name: Install Dependencies shell: bash run: brew bundle --file=ci/Brewfile diff --git a/README.md b/README.md index e3975b37ac..1c44d1c59e 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,10 @@ [![codecov](https://codecov.io/gh/DARMA-tasking/vt/branch/develop/graph/badge.svg)](https://codecov.io/gh/DARMA-tasking/vt) [![License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://opensource.org/licenses/BSD-3-Clause) ![](https://github.com/DARMA-tasking/vt/workflows/Docker%20Image%20CI/badge.svg) -[![gcc-7, ubuntu, mpich, trace runtime, LB](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-7%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20LB)?branchName=develop&Label=(gcc-7%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20LB))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=8&branchName=develop) [![gcc-8, ubuntu, mpich, address sanitizer](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-8%2C%20ubuntu%2C%20mpich%2C%20address%20sanitizer)?branchName=develop&Label=(gcc-8%2C%20ubuntu%2C%20mpich%2C%20address%20sanitizer))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=9&branchName=develop) [![gcc-9, ubuntu, mpich, zoltan](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-9%2C%20ubuntu%2C%20mpich%2C%20zoltan)?branchName=develop&Label=(gcc-9%2C%20ubuntu%2C%20mpich%2C%20zoltan))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=10&branchName=develop) [![gcc-10, ubuntu, openmpi, no LB](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB)?branchName=develop&Label=(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=4&branchName=develop) -[![gcc-11, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-11%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(gcc-11%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=29&branchName=develop) +[![gcc-11, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-11%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(gcc-11%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20coverage))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=29&branchName=develop) [![gcc-12, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-12%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(gcc-12%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=30&branchName=develop) [![clang-9, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-9%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-9.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=22&branchName=develop) [![clang-10, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-10%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-10.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=21&branchName=develop) @@ -21,7 +20,7 @@ [![nvidia cuda 11.2, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(nvidia%20cuda%2011.2%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(nvidia%20cuda%2011.2%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=32&branchName=develop) [![gcc-10, ubuntu, openmpi, no LB, spack-package](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20spack-package%20(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB%2C%20spack-package)?branchName=develop&Label=(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB%2C%20spack-package))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=20&branchName=develop) [![icpx, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(intel%20icpx%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(icpx%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=24&branchName=develop) -![apple clang, macosx, mpich](https://github.com/DARMA-tasking/vt/workflows/PR%20tests%20(clang-8,%20macosx,%20mpich)/badge.svg?branch=develop) +![apple clang, macosx, mpich](https://github.com/DARMA-tasking/vt/workflows/PR%20tests%20(clang-14,%20macosx,%20mpich)/badge.svg?branch=develop) ![Build Documentation](https://github.com/DARMA-tasking/vt/workflows/Build%20Documentation/badge.svg?branch=develop) [![](https://github.com/DARMA-tasking/vt/wiki/build_stats/build_status_badge.svg)](https://github.com/DARMA-tasking/vt/wiki/Build-Stats) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index f43987d6a0..23f57620b3 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 396c74c6f6..4e5c7fb00d 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 78cc859b96..04c35809a7 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index f393cc8694..8919666f9a 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index d348c2e827..688afcb8a3 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 6ffc1053b2..493b9bff54 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index 6511ef65c5..b1d024e63f 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index 051dfa3769..ca8214d009 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index bce0aa68bd..f2d6d1727c 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -2,13 +2,13 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (gcc-11, ubuntu, mpich, json schema test) +name: PR tests (gcc-11, ubuntu, mpich, trace runtime, coverage) trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false @@ -30,10 +30,10 @@ variables: COMPILER: gcc-11 BUILD_TYPE: release ULIMIT_CORE: 0 - CODE_COVERAGE: 0 + CODE_COVERAGE: 1 VT_LB: 1 - VT_TRACE: 0 - VT_TRACE_RT: 0 + VT_TRACE: 1 + VT_TRACE_RT: 1 VT_TRACE_ONLY: 1 VT_MIMALLOC: 0 VT_DOCS: 0 @@ -43,7 +43,7 @@ variables: VT_POOL: 1 VT_EXTENDED_TESTS: 1 VT_TESTS_NUM_NODES: 2 - VT_UNITY_BUILD: 1 + VT_UNITY_BUILD: 0 VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 @@ -53,7 +53,7 @@ variables: VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 1 + TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-11-cache build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/" @@ -132,14 +132,14 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-noinstall' - 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' + dockerComposeCommand: 'run ubuntu-cpp-clean-noinstall' env: CODECOV_TOKEN: $(codecov_token) - task: Bash@3 @@ -170,7 +170,7 @@ stages: dockerRegistryEndpoint: 'dockerRegistryConnection1' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' + dockerComposeCommand: 'push ubuntu-cpp-clean-noinstall' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index dac939334e..9a8e980b12 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: true diff --git a/ci/azure/azure-gcc-7-ubuntu-mpich.yml b/ci/azure/azure-gcc-7-ubuntu-mpich.yml deleted file mode 100644 index a8ba7da182..0000000000 --- a/ci/azure/azure-gcc-7-ubuntu-mpich.yml +++ /dev/null @@ -1,205 +0,0 @@ -############################################################################### -############## Warning this is a generated file---do not modify ############### -############################################################################### - -name: PR tests (gcc-7, ubuntu, mpich, trace runtime, LB) - -trigger: - branches: - include: - - develop - - 1.0.0* - -pr: - drafts: false - autoCancel: true - branches: - include: - - '*' - - -resources: -- repo: self - -variables: - tag: '$(Build.BuildId)' - REPO: lifflander1/vt - ARCH: amd64 - UBUNTU: 18.04 - COMPILER_TYPE: gnu - COMPILER: gcc-7 - BUILD_TYPE: release - ULIMIT_CORE: 0 - CODE_COVERAGE: 1 - VT_LB: 1 - VT_TRACE: 1 - VT_TRACE_RT: 1 - 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: 0 - 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 - CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 - CACHE: "$(Agent.TempDirectory)/cache/" - cache_name: ubuntu-gcc-7-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-22.04' - timeoutInMinutes: 180 - steps: - - checkout: self - fetchDepth: 0 - - 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-noinstall' - - 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-noinstall' - 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-noinstall' - - 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 diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index af37277c9e..bf9be53332 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 412fdfdfe1..b6e3ef9be9 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -2,13 +2,13 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (gcc-9, ubuntu, mpich, zoltan) +name: PR tests (gcc-9, ubuntu, mpich, zoltan, json schema test) trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false @@ -53,7 +53,7 @@ variables: VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + TEST_LB_SCHEMA: 1 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-9-cache build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/" diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 3b20cedf91..655c346547 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 8221fad655..6baea0ae0a 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index bcfc857ab5..c2e7330ec9 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml index b9e412655d..eb238f08df 100644 --- a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml @@ -8,7 +8,7 @@ trigger: branches: include: - develop - - 1.0.0* + - main pr: drafts: false diff --git a/ci/docker/develop.dockerfile b/ci/docker/develop.dockerfile index ba5cc734cc..d7409bd0d4 100644 --- a/ci/docker/develop.dockerfile +++ b/ci/docker/develop.dockerfile @@ -1,11 +1,11 @@ -ARG compiler=gcc-7 +ARG compiler=gcc-12 ARG arch=amd64 -ARG ubuntu=18.04 +ARG ubuntu=22.04 FROM lifflander1/vt:${arch}-ubuntu-${ubuntu}-${compiler}-cpp # All ARGs are invalidated after FROM instruction, so it has to be redefined -ARG compiler=gcc-7 +ARG compiler=gcc-12 ARG proxy="" ENV https_proxy=${proxy} \ diff --git a/ci/docker/ubuntu-18.04-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile similarity index 99% rename from ci/docker/ubuntu-18.04-gnu-docs.dockerfile rename to ci/docker/ubuntu-gnu-docs.dockerfile index b88af792e3..e6417e8ccf 100644 --- a/ci/docker/ubuntu-18.04-gnu-docs.dockerfile +++ b/ci/docker/ubuntu-gnu-docs.dockerfile @@ -2,7 +2,7 @@ ARG arch=amd64 FROM ${arch}/ubuntu:18.04 as base ARG proxy="" -ARG compiler=gcc-7 +ARG compiler=gcc-8 ARG token ENV https_proxy=${proxy} \ diff --git a/docker-compose.yml b/docker-compose.yml index f9048ba96d..84167e384f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,13 +10,12 @@ # Variables: # ARCH={amd64, arm64v8, ...} # COMPILER_TYPE={gnu, clang, intel, nvidia} -# COMPILER={gcc-7, gcc-8, gcc-9, gcc-10, -# clang-4.0, clang-5.0, clang-6.0, clang-7, clang-8, -# clang-9, clang-10, -# icpx, +# COMPILER={gcc-8, gcc-9, gcc-10, +# clang-8, clang-9, clang-10, +# icpc, icpx, # nvcc-11, nvcc-11.2} # REPO=lifflander1/vt -# UBUNTU={18.04, 20.04} +# UBUNTU={18.04, 20.04, 22.04} # ULIMIT_CORE=0 # # DARMA/vt Configuration Variables: @@ -70,43 +69,31 @@ version: '3.5' # add it to this list. For example, for ARM64v8 on Ubuntu 20.04 with clang-9, # add `arm64v8-ubuntu-20.04-clang-9-cache`. volumes: - amd64-ubuntu-18.04-clang-4.0-cache: - amd64-ubuntu-18.04-clang-5.0-cache: - amd64-ubuntu-18.04-clang-6.0-cache: - amd64-ubuntu-18.04-clang-7-cache: amd64-ubuntu-18.04-clang-8-cache: amd64-ubuntu-18.04-clang-9-cache: amd64-ubuntu-20.04-clang-10-cache: amd64-ubuntu-22.04-clang-11-cache: - amd64-ubuntu-18.04-gcc-7-cache: amd64-ubuntu-18.04-gcc-8-cache: amd64-ubuntu-20.04-gcc-9-cache: amd64-ubuntu-20.04-gcc-10-cache: + amd64-ubuntu-22.04-gcc-12-cache: amd64-ubuntu-18.04-icpx-cache: amd64-ubuntu-18.04-icpc-cache: amd64-ubuntu-18.04-nvcc-11-cache: amd64-ubuntu-18.04-nvcc-11.2-cache: - amd64-alpine-clang-4.0-cache: - amd64-alpine-clang-5.0-cache: - amd64-alpine-clang-6.0-cache: - amd64-alpine-clang-7-cache: amd64-alpine-clang-8-cache: amd64-alpine-clang-9-cache: amd64-alpine-clang-10-cache: amd64-alpine-clang-11-cache: - amd64-alpine-gcc-7-cache: + amd64-alpine-clang-13-cache: amd64-alpine-gcc-8-cache: amd64-alpine-gcc-9-cache: amd64-alpine-gcc-10-cache: - amd64-alpine-icc-18-cache: - amd64-alpine-icc-19-cache: - amd64-alpine-icc-20-cache: + amd64-alpine-gcc-12-cache: amd64-alpine-icpx-cache: amd64-alpine-icpc-cache: amd64-alpine-nvcc-11-cache: amd64-alpine-nvcc-11.2-cache: - arm64v8-ubuntu-18.04-gcc-7-cache: - arm64v8-alpine-gcc-7-cache: # Define basic rules for ccache used across multiple services. The beauty of # docker compose with cached volumes is that similarly configured builds will @@ -158,8 +145,8 @@ x-vtopts: &vtopts services: ############################################################################## # C++ builds of VT on ubuntu/alpine platform from container baseline - # Ubuntu gcc-7 debug build: - # docker-compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp|alpine-cpp + # Ubuntu gcc-12 debug build: + # docker-compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp ubuntu-cpp: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp build: @@ -341,7 +328,7 @@ services: build: context: . target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-docs.dockerfile + dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-docs.dockerfile cache_from: - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp args: @@ -387,7 +374,7 @@ services: build: context: . target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-docs.dockerfile + dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-docs.dockerfile cache_from: - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp args: diff --git a/docs/md/building.md b/docs/md/building.md index d47c2b7048..4669cbfbee 100644 --- a/docs/md/building.md +++ b/docs/md/building.md @@ -139,13 +139,12 @@ which `docker-compose` will read. # Variables: # ARCH={amd64, arm64v8, ...} # COMPILER_TYPE={gnu, clang, intel, nvidia} -# COMPILER={gcc-7, gcc-8, gcc-9, gcc-10, -# clang-4.0, clang-5.0, clang-6.0, clang-7, clang-8, -# clang-9, clang-10, -# icc-18, icc-19, -# nvcc-10, nvcc-11, nvcc-11.2} +# COMPILER={gcc-8, gcc-9, gcc-10, +# clang-8, clang-9, clang-10, +# icpc, icpx, +# nvcc-11, nvcc-11.2} # REPO=lifflander1/vt -# UBUNTU={18.04, 20.04} +# UBUNTU={18.04, 20.04, 22.04} # ULIMIT_CORE=0 # # DARMA/vt Configuration Variables: diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 661c4bbff8..db974cb55c 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -29,7 +29,7 @@ linux = ubuntu cache_dir = "~/.local/cache/" cache_name = "[% linux %]-[% compiler %]-cache" docker_target = "[% linux %]-cpp-clean" -triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - 1.0.0*" +triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - main" warning = "###############################################################################\\n############## Warning this is a generated file---do not modify ###############\\n###############################################################################" job_name = build workflow_runs_on = "vmImage: 'ubuntu-22.04'" @@ -88,18 +88,6 @@ vt_trace = 1 vt_pool = 0 vt_tests_num_nodes = 4 -[PR-tests-gcc-7] -test_configuration = "gcc-7, ubuntu, mpich, trace runtime, LB" -compiler_type = gnu -compiler = gcc-7 -distro = 18.04 -vt_trace = 1 -vt_trace_rt = 1 -vt_unity_build = 0 -code_coverage = 1 -docker_target = "[% linux %]-cpp-clean-noinstall" -output_name = ci/azure/azure-gcc-7-ubuntu-mpich.yml - [PR-tests-gcc-8] test_configuration = "gcc-8, ubuntu, mpich, address sanitizer" compiler_type = gnu @@ -113,10 +101,11 @@ output_name = ci/azure/azure-gcc-8-ubuntu-mpich.yml lsan_options = suppressions=/vt/tests/lsan.supp [PR-tests-gcc-9] -test_configuration = "gcc-9, ubuntu, mpich, zoltan" +test_configuration = "gcc-9, ubuntu, mpich, zoltan, json schema test" compiler_type = gnu compiler = gcc-9 output_name = ci/azure/azure-gcc-9-ubuntu-mpich.yml +test_lb_schema = 1 vt_zoltan = 1 [PR-tests-gcc-10] @@ -129,11 +118,15 @@ vt_lb = 0 vt_tests_num_nodes = 4 [PR-tests-gcc-11] -test_configuration = "gcc-11, ubuntu, mpich, json schema test" +test_configuration = "gcc-11, ubuntu, mpich, trace runtime, coverage" compiler_type = gnu compiler = gcc-11 distro = 22.04 -test_lb_schema = 1 +vt_trace = 1 +vt_trace_rt = 1 +vt_unity_build = 0 +code_coverage = 1 +docker_target = "[% linux %]-cpp-clean-noinstall" output_name = ci/azure/azure-gcc-11-ubuntu-mpich.yml [PR-tests-gcc-12]