diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 433dc6a8e91bd8f2a9d281e0725fa987209f5179..645b21a5ef79c583e5d2bab99b7345bde0e82abd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,72 @@ gcc_9_python: script: - python3 setup.py install +gcc_9: + stage: build + + tags: + - gpu + + cache: + key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-gcc9-hybrid" + paths: + - build_gcc9 + + artifacts: + paths: + - build_gcc9 + + before_script: + - export DEBIAN_FRONTEND=noninteractive + - apt-get update + - apt-get install -y libboost-serialization-dev + - cd /tmp + - apt-get install unzip + - wget https://github.com/NVIDIA/cuda-samples/archive/10.1.2.zip + - unzip 10.1.2.zip + - export NVCUDASAMPLES_ROOT=$(pwd)/cuda-samples-10.1.2 + + script: + - cd $CI_PROJECT_DIR + - mkdir -p build_gcc9 + - cd build_gcc9 + - cmake .. -DBUILD_VF_CPU=ON -DBUILD_VF_GPU=ON + - make -j4 + +clang_10: + stage: build + + tags: + - gpu + + cache: + key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-clang10-hybrid" + paths: + - build_clang10 + + artifacts: + paths: + - build_clang10 + + before_script: + - export DEBIAN_FRONTEND=noninteractive + - apt-get update + - export CC=clang + - export CXX=clang++ + - $CXX --version + - apt-get install -y libboost-serialization-dev + - cd /tmp + - apt-get install unzip + - wget https://github.com/NVIDIA/cuda-samples/archive/10.1.2.zip + - unzip 10.1.2.zip + - export NVCUDASAMPLES_ROOT=$(pwd)/cuda-samples-10.1.2 + + script: + - cd $CI_PROJECT_DIR + - mkdir -p build_gcc9 + - cd build_gcc9 + - cmake .. -DBUILD_VF_CPU=ON -DBUILD_VF_GPU=ON + - make -j4 msvc_16: stage: build @@ -288,7 +354,6 @@ clang-tidy: artifacts: paths: - - clang-tidy-results.txt - build_clang_tidy/clang-tidy-results.txt ############################################################################### diff --git a/utilities/filterCompileCommands.py b/utilities/filterCompileCommands.py index 3e8d1c1a766717acc28b15bc627b888da2f7e201..999f5809b4e29f139a93d854f68171ac97b56b70 100644 --- a/utilities/filterCompileCommands.py +++ b/utilities/filterCompileCommands.py @@ -3,8 +3,10 @@ import json import sys -def compileCommandSelector(x): - return not (("3rdParty" in x["file"])) + +def compile_command_selector(x): + return not ("3rdParty" in x["file"]) + if __name__ == "__main__": if len(sys.argv) != 2: @@ -20,7 +22,7 @@ if __name__ == "__main__": print("compile commands read: {}".format(len(cc))) - cc_filtered = list(filter(compileCommandSelector, cc)) + cc_filtered = list(filter(compile_command_selector, cc)) print("compile commands filtered: {}".format(len(cc_filtered)))