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.

Sign up for GitHub

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

Fix CPP checks for CI #147

Merged
18 commits merged into from
Jul 25, 2022
Merged

Fix CPP checks for CI #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b93c745
Intentionally making changes that should cause ci failures
dagardner-nv Jul 15, 2022
2899eb3
WIP
dagardner-nv Jul 15, 2022
0690d2b
WIP
dagardner-nv Jul 15, 2022
ceafc2f
Add clang to env for checks
dagardner-nv Jul 15, 2022
be9a763
Fix location of clang-tidy ci script
dagardner-nv Jul 15, 2022
bfb2f37
Revert "Fix location of clang-tidy ci script"
dagardner-nv Jul 15, 2022
51f220f
Add clang-tools
dagardner-nv Jul 15, 2022
5d18a55
Disable iwyu for now
dagardner-nv Jul 15, 2022
49720c7
Revert "Intentionally making changes that should cause ci failures"
dagardner-nv Jul 15, 2022
2045a1c
Add iwyu
dagardner-nv Jul 15, 2022
5997123
Enable iwyu
dagardner-nv Jul 15, 2022
75c77f3
Revert "Revert "Intentionally making changes that should cause ci fai…
dagardner-nv Jul 15, 2022
34c6b4d
Revert "Add iwyu" Thew versions on conda-forge only support clang 14 …
dagardner-nv Jul 18, 2022
429acc8
Add build of iwyu to check stage, add clang deps needed to build iwyu
dagardner-nv Jul 18, 2022
5fe4578
Fix install target
dagardner-nv Jul 18, 2022
076d3ff
Revert "Revert "Revert "Intentionally making changes that should caus…
dagardner-nv Jul 18, 2022
dc8704c
Sometimes our workspace isn't clean
dagardner-nv Jul 18, 2022
d1ec820
Apply recomended improvements
dagardner-nv Jul 20, 2022
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
4 changes: 4 additions & 0 deletions ci/conda/environments/clang_env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,9 @@ channels:
- conda-forge
dependencies:
- clang=12
- clang-tools=12
- clangdev=12
- clangxx=12
- libclang=12
- libclang-cpp=12
- llvmdev=12
1 change: 1 addition & 0 deletions ci/conda/environments/dev_env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ dependencies:
- numactl-libs-cos7-x86_64
- numpy=1.21.2
- nvcc_linux-64=11.4
- pip
- pkg-config=0.29
- pybind11-stubgen=0.10
- python=3.8
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export PY_CFG="${PY_ROOT}/setup.cfg"
export PY_DIRS="${PY_ROOT} ci/scripts"

# Determine the commits to compare against. If running in CI, these will be set. Otherwise, diff with main
export BASE_SHA=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-${BASE_SHA:-main}}
export COMMIT_SHA=${CI_COMMIT_SHA:-${COMMIT_SHA:-HEAD}}
export BASE_SHA=${CHANGE_TARGET:-${BASE_SHA:-main}}
export COMMIT_SHA=${GIT_COMMIT:-${COMMIT_SHA:-HEAD}}

export CPP_FILE_REGEX='^(\.\/)?(src|include|tests|benchmarks|python)\/.*\.(cc|cpp|h|hpp)$'
export PYTHON_FILE_REGEX='^(\.\/)?(?!\.|build).*\.(py|pyx|pxd)$'
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/cpp_checks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CLANG_TIDY_RETVAL=0
CLANG_FORMAT_RETVAL=0
IWYU_RETVAL=0

# Get the list of modified files inside the trtlab/srf folder
# Get the list of modified files inside the srf repo
get_modified_files ${CPP_FILE_REGEX} SRF_MODIFIED_FILES

# If there are any files, then run clang tidy
Expand Down
22 changes: 21 additions & 1 deletion ci/scripts/jenkins/checks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,38 @@
set -e

source ${WORKSPACE}/ci/scripts/jenkins/common.sh
export IWYU_DIR="${WORKSPACE_TMP}/iwyu"

rm -rf ${SRF_ROOT}/.cache/ ${SRF_ROOT}/build/
rm -rf ${SRF_ROOT}/.cache/ ${SRF_ROOT}/build/ ${IWYU_DIR}

fetch_base_branch

gpuci_logger "Creating conda env"
mamba env create -n srf -q --file ${CONDA_ENV_YML}

gpuci_logger "Installing Clang"
mamba env update -q -n srf --file ${SRF_ROOT}/ci/conda/environments/clang_env.yml

conda deactivate
conda activate srf

show_conda_info

gpuci_logger "Installing IWYU"
git clone https://github.com/include-what-you-use/include-what-you-use.git ${IWYU_DIR}
pushd ${IWYU_DIR}
git checkout clang_12
cmake -G Ninja \
-DCMAKE_PREFIX_PATH=$(llvm-config --cmakedir) \
-DCMAKE_C_COMPILER=$(which clang) \
-DCMAKE_CXX_COMPILER=$(which clang++) \
-DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
.

cmake --build . --parallel ${PARALLEL_LEVEL} --target install

popd

gpuci_logger "Configuring CMake"
cmake -B build -G Ninja ${CMAKE_BUILD_ALL_FEATURES} .

Expand Down