Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions .github/workflows/run-clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
- name: Run clang-format
run: |
{
echo 'CLANG_FORMAT_DIFF<<EOF'
git clang-format-16 --diff origin/${{ github.base_ref }} || true
echo EOF
} >> "$GITHUB_ENV"
git clang-format-16 --diff origin/${{ github.base_ref }} > clang-format.diff || true
- uses: actions/github-script@v7
with:
script: |
Expand All @@ -40,8 +36,15 @@ jobs:
}
}

const { CLANG_FORMAT_DIFF } = process.env
const commentBody = '`clang-format` output for this changeset:\n```diff\n' + CLANG_FORMAT_DIFF + '\n```'
const fs = require("fs")
var output = fs.readFileSync("clang-format.diff", "utf8")
// make sure not to exceed maximum length of the comment
output = (output.length > 65000) ?
output.substring(0, 65000) + '\n(...)' : output
const commentBody =
'`clang-format` output for this changeset:\n```diff\n' +
output + '\n```'

if (commentId === -1) {
await github.rest.issues.createComment({
owner: context.repo.owner,
Expand Down
4 changes: 2 additions & 2 deletions ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
############## Warning this is a generated file---do not modify ###############
###############################################################################

name: PR tests (nvidia cuda 11.2, gcc-9, ubuntu, mpich)
name: PR tests (nvidia cuda 11.4, gcc-9, ubuntu, mpich)

trigger:
branches:
Expand All @@ -27,7 +27,7 @@ variables:
ARCH: amd64
UBUNTU: 20.04
COMPILER_TYPE: nvidia
COMPILER: 11.2.2
COMPILER: 11.4.3
HOST_COMPILER: gcc-9
BUILD_TYPE: release
ULIMIT_CORE: 0
Expand Down
2 changes: 1 addition & 1 deletion ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ then
{ echo "vt-tv already in lib... not downloading"; } 2>/dev/null
else
cd "${source_dir}/lib"
vt_tv_rev="1.5.0"
vt_tv_rev="master"
git clone -b "${vt_tv_rev}" --depth 1 https://github.com/DARMA-tasking/vt-tv.git
cd -
fi
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/ubuntu-nvidia-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ COPY ./ci/deps/fmt.sh fmt.sh

RUN if test ${external_fmt} -eq 1; then \
chmod +x ./fmt.sh && \
./fmt.sh 7.1.3 -j4; \
./fmt.sh 11.1.3 -j4; \
fi

RUN mkdir -p /nvcc_wrapper/build && \
Expand Down
7 changes: 5 additions & 2 deletions cmake/trace_only_functions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function(create_trace_only_target)

install(
TARGETS ${VT_TRACE_LIB}
EXPORT ${VT_TRACE_TARGETS}
EXPORT ${VT_TRACE_LIB}
CONFIGURATIONS ${build_type_list}
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
Expand All @@ -149,15 +149,18 @@ function(create_trace_only_target)
)

install(
EXPORT ${VT_TRACE_TARGETS}
EXPORT ${VT_TRACE_LIB}
DESTINATION cmake
NAMESPACE vt::
FILE "vt-traceTargets.cmake"
CONFIGURATIONS ${build_type_list}
)

install(TARGETS ${FMT_LIBRARY} EXPORT ${VT_TRACE_LIB})

export(
TARGETS ${VT_TRACE_LIB}
${FMT_LIBRARY}
FILE "vt-traceTargets.cmake"
NAMESPACE vt::
)
Expand Down
5 changes: 5 additions & 0 deletions lib/.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# .clang-format-ignore is available for clang-format > 18. Use this instead as
# we use clang-format 16 in CI.

DisableFormat: true
SortIncludes: Never
Loading
Loading