Skip to content

Commit 5882815

Browse files
JacobDomagalacwschilly
authored andcommitted
#2216: Build external fmt for CUDA pipeline
1 parent a5adc8a commit 5882815

21 files changed

+28
-0
lines changed

ci/azure/azure-clang-10-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 4
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-clang-11-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 1

ci/azure/azure-clang-12-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-clang-13-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-clang-14-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-clang-9-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-clang-alpine-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 1
4950
VT_FCONTEXT: 0

ci/azure/azure-gcc-10-ubuntu-openmpi.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 4
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-gcc-11-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 0
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-gcc-12-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-gcc-8-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 0
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 0
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-gcc-9-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 1
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 1
4545
VT_EXTENDED_TESTS: 0
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 0
4545
VT_EXTENDED_TESTS: 0
4646
VT_TESTS_NUM_NODES: 2
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 0
4545
VT_EXTENDED_TESTS: 0
4646
VT_TESTS_NUM_NODES: 4
47+
VT_EXTERNAL_FMT: 1
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/azure/azure-nvidia-12-ubuntu-mpich.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
VT_POOL: 0
4545
VT_EXTENDED_TESTS: 0
4646
VT_TESTS_NUM_NODES: 4
47+
VT_EXTERNAL_FMT: 0
4748
VT_UNITY_BUILD: 1
4849
VT_PRODUCTION_BUILD: 0
4950
VT_FCONTEXT: 0

ci/build_cpp.sh

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
126126
-Dvt_ci_build="${VT_CI_BUILD:-0}" \
127127
-Dvt_debug_verbose="${VT_DEBUG_VERBOSE:-0}" \
128128
-Dvt_tests_num_nodes="${VT_TESTS_NUM_NODES:-}" \
129+
-Dvt_external_fmt="${VT_EXTERNAL_FMT:-0}" \
129130
-Dvt_no_color_enabled="${VT_NO_COLOR_ENABLED:-0}" \
130131
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
131132
-DBUILD_SHARED_LIBS="${BUILD_SHARED_LIBS:-0}" \

ci/docker/ubuntu-nvidia-cpp.dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ ENV LESSCHARSET=utf-8
5151
COPY ./ci/deps/mpich.sh mpich.sh
5252
RUN ./mpich.sh 3.3.2 -j4
5353

54+
ARG external_fmt
55+
COPY ./ci/deps/fmt.sh fmt.sh
56+
RUN if test ${external_fmt} -eq 1; then \
57+
./fmt.sh 7.1.3 -j4; \
58+
fi
59+
5460
RUN mkdir -p /nvcc_wrapper/build && \
5561
wget https://raw.githubusercontent.com/kokkos/kokkos/master/bin/nvcc_wrapper -P /nvcc_wrapper/build && \
5662
chmod +x /nvcc_wrapper/build/nvcc_wrapper

docker-compose.yml

+2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ x-vtopts: &vtopts
112112
VT_CI_BUILD: ${VT_CI_BUILD:-0}
113113
VT_DEBUG_VERBOSE: ${VT_DEBUG_VERBOSE:-0}
114114
VT_TESTS_NUM_NODES: ${VT_TESTS_NUM_NODES:-}
115+
VT_EXTERNAL_FMT: ${VT_EXTERNAL_FMT:-0}
115116
VT_NO_COLOR_ENABLED: ${VT_NO_COLOR:-0}
116117
BUILD_SHARED_LIBS: ${VT_BUILD_SHARED_LIBS:-0}
117118
VT_INCLUSION_TYPE: ${VT_INCLUSION:-TPL}
@@ -138,6 +139,7 @@ services:
138139
ubuntu: ${UBUNTU}
139140
ubsan_enabled: ${VT_UBSAN:-0}
140141
zoltan_enabled: ${VT_ZOLTAN:-0}
142+
external_fmt: ${VT_EXTERNAL_FMT:-0}
141143
cache_from:
142144
- ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp
143145
ulimits: &ulimits

scripts/workflow-azure-template.yml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ variables:
3232
VT_POOL: [% vt_pool %]
3333
VT_EXTENDED_TESTS: [% vt_extended_tests %]
3434
VT_TESTS_NUM_NODES: [% vt_tests_num_nodes %]
35+
VT_EXTERNAL_FMT: [% vt_external_fmt %]
3536
VT_UNITY_BUILD: [% vt_unity_build %]
3637
VT_PRODUCTION_BUILD: [% vt_production_build %]
3738
VT_FCONTEXT: [% vt_fcontext %]

scripts/workflows-azure.ini

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ vt_fcontext = 0
1717
vt_zoltan = 0
1818
vt_ci_build = 1
1919
vt_tests_num_nodes = 2
20+
vt_external_fmt = 0
2021
test_lb_schema = 0
2122
ulimit_core = 0
2223
vt_code_coverage = 0
@@ -93,6 +94,7 @@ vt_diagnostics = 0
9394
vt_trace = 1
9495
vt_pool = 0
9596
vt_tests_num_nodes = 4
97+
vt_external_fmt = 1
9698

9799
[PR-tests-gcc-8]
98100
test_configuration = "gcc-8, ubuntu, mpich, address sanitizer"

0 commit comments

Comments
 (0)