From 685c0d97b43550e59d5ee82a2afd9dffeb2d7498 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 16 Jul 2024 21:32:23 +0200 Subject: [PATCH 1/6] do it --- .gitlab-ci.yml | 232 ++++++++++++++++++++++++------------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64e12d877a2..c61b5f60bed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,122 +55,122 @@ clang_tidy: # Generate an html report - codereport clang-tidy/clang-tidy.json clang-tidy/html -# build_exatrkx_cpu: -# stage: build -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - large - -# cache: -# key: ccache-exatrkx-cpu-$CI_COMMIT_REF_SLUG -# paths: -# - ${CI_PROJECT_DIR}/ccache - -# script: -# - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH -# - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH -# - echo $PATH -# - git clone $CLONE_URL src -# - cd src -# - git checkout $HEAD_SHA -# - cd .. -# - mkdir build -# # Here we only do a minimal build without examples to save ressources -# - > -# cmake -B build -S src -# -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -# -GNinja -# -DCMAKE_BUILD_TYPE=Release -# -DCMAKE_CXX_FLAGS=-w -# -DACTS_BUILD_PLUGIN_EXATRKX=ON -# -DACTS_BUILD_EXAMPLES_EXATRKX=OFF -# -DACTS_BUILD_UNITTESTS=OFF -# -DACTS_EXATRKX_ENABLE_TORCH=ON -# -DACTS_EXATRKX_ENABLE_ONNX=OFF -# -DACTS_EXATRKX_ENABLE_CUDA=OFF -# -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF -# -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON - -# - ccache -z -# - cmake --build build -- -j2 -# - ccache -s - -# build_exatrkx: -# stage: build -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - large -# -# cache: -# key: ccache-exatrkx-$CI_COMMIT_REF_SLUG -# paths: -# - ${CI_PROJECT_DIR}/ccache -# -# artifacts: -# paths: -# - build/ -# exclude: -# - build/**/*.o -# - build/bin/ActsIntegrationTest* -# expire_in: 6 hours -# -# script: -# - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH -# - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH -# - echo $PATH -# - git clone $CLONE_URL src -# - cd src -# - git checkout $HEAD_SHA -# - cd .. -# - mkdir build -# - > -# cmake -B build -S src -# -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -# -GNinja -# -DCMAKE_BUILD_TYPE=Release -# -DCMAKE_CXX_FLAGS=-w -# -DCMAKE_CUDA_FLAGS=-w -# -DCMAKE_CUDA_ARCHITECTURES="75;86" -# -DACTS_BUILD_PLUGIN_EXATRKX=ON -# -DACTS_BUILD_EXAMPLES_EXATRKX=ON -# -DACTS_BUILD_UNITTESTS=ON -# -DACTS_EXATRKX_ENABLE_TORCH=ON -# -DACTS_EXATRKX_ENABLE_ONNX=ON -# -DACTS_EXATRKX_ENABLE_CUDA=ON -# -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON -# -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON -# -# - ccache -z -# - cmake --build build -- -j2 -# - ccache -s - -# test_exatrkx_unittests: -# stage: test -# needs: -# - build_exatrkx -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - docker-gpu-nvidia -# script: -# - ctest --test-dir build -R ExaTrkX -# -# test_exatrkx_python: -# stage: test -# needs: -# - build_exatrkx -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - docker-gpu-nvidia -# script: -# - apt-get update -y -# - apt-get install -y python3 libxxhash0 -# - source build/this_acts_withdeps.sh -# - git clone $CLONE_URL src -# - cd src -# - git checkout $HEAD_SHA -# - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt -# - nvidia-smi -# - pytest -rFsv -k test_exatrkx +build_exatrkx_cpu: + stage: build + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - large + + cache: + key: ccache-exatrkx-cpu-$CI_COMMIT_REF_SLUG + paths: + - ${CI_PROJECT_DIR}/ccache + + script: + - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH + - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - echo $PATH + - git clone $CLONE_URL src + - cd src + - git checkout $HEAD_SHA + - cd .. + - mkdir build + # Here we only do a minimal build without examples to save ressources + - > + cmake -B build -S src + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -GNinja + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CXX_FLAGS=-w + -DACTS_BUILD_PLUGIN_EXATRKX=ON + -DACTS_BUILD_EXAMPLES_EXATRKX=OFF + -DACTS_BUILD_UNITTESTS=OFF + -DACTS_EXATRKX_ENABLE_TORCH=ON + -DACTS_EXATRKX_ENABLE_ONNX=OFF + -DACTS_EXATRKX_ENABLE_CUDA=OFF + -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF + -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON + + - ccache -z + - cmake --build build -- -j2 + - ccache -s + +build_exatrkx: + stage: build + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - large + + cache: + key: ccache-exatrkx-$CI_COMMIT_REF_SLUG + paths: + - ${CI_PROJECT_DIR}/ccache + + artifacts: + paths: + - build/ + exclude: + - build/**/*.o + - build/bin/ActsIntegrationTest* + expire_in: 6 hours + + script: + - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH + - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - echo $PATH + - git clone $CLONE_URL src + - cd src + - git checkout $HEAD_SHA + - cd .. + - mkdir build + - > + cmake -B build -S src + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -GNinja + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CXX_FLAGS=-w + -DCMAKE_CUDA_FLAGS=-w + -DCMAKE_CUDA_ARCHITECTURES="75;86" + -DACTS_BUILD_PLUGIN_EXATRKX=ON + -DACTS_BUILD_EXAMPLES_EXATRKX=ON + -DACTS_BUILD_UNITTESTS=ON + -DACTS_EXATRKX_ENABLE_TORCH=ON + -DACTS_EXATRKX_ENABLE_ONNX=OFF + -DACTS_EXATRKX_ENABLE_CUDA=ON + -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON + -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON + + - ccache -z + - cmake --build build -- -j2 + - ccache -s + +test_exatrkx_unittests: + stage: test + needs: + - build_exatrkx + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - docker-gpu-nvidia + script: + - ctest --test-dir build -R ExaTrkX + +test_exatrkx_python: + stage: test + needs: + - build_exatrkx + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - docker-gpu-nvidia + script: + - apt-get update -y + - apt-get install -y python3 libxxhash0 + - source build/this_acts_withdeps.sh + - git clone $CLONE_URL src + - cd src + - git checkout $HEAD_SHA + - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt + - nvidia-smi + - pytest -rFsv -k torch # For now only test torch pipeline build_linux_ubuntu: stage: build From 320da57e631449c0e557f474450a512b0398f51a Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 16 Jul 2024 21:43:23 +0200 Subject: [PATCH 2/6] udpate --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c61b5f60bed..06ba5927057 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,7 @@ build_exatrkx_cpu: script: - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - export TORCH_CUDA_ARCH_LIST="8.0 8.6 8.9 9.0" - echo $PATH - git clone $CLONE_URL src - cd src @@ -117,6 +118,7 @@ build_exatrkx: script: - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - export TORCH_CUDA_ARCH_LIST="8.0 8.6 8.9 9.0" - echo $PATH - git clone $CLONE_URL src - cd src From e86e88d493999eae97a69cd5585de5fd4e140422 Mon Sep 17 00:00:00 2001 From: Benjamin Huth <37871400+benjaminhuth@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:48:26 +0200 Subject: [PATCH 3/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06ba5927057..71a088feb92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,6 +172,7 @@ test_exatrkx_python: - git checkout $HEAD_SHA - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt - nvidia-smi + - pytest -rFsv -k torch --collect-only - pytest -rFsv -k torch # For now only test torch pipeline build_linux_ubuntu: From 3658eda2f2d088a75a7f31f818820e9692da98bd Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Wed, 24 Jul 2024 08:18:32 +0200 Subject: [PATCH 4/6] only builds and unittests --- .gitlab-ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71a088feb92..3632891694b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,24 +156,24 @@ test_exatrkx_unittests: script: - ctest --test-dir build -R ExaTrkX -test_exatrkx_python: - stage: test - needs: - - build_exatrkx - image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 - tags: - - docker-gpu-nvidia - script: - - apt-get update -y - - apt-get install -y python3 libxxhash0 - - source build/this_acts_withdeps.sh - - git clone $CLONE_URL src - - cd src - - git checkout $HEAD_SHA - - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt - - nvidia-smi - - pytest -rFsv -k torch --collect-only - - pytest -rFsv -k torch # For now only test torch pipeline +# test_exatrkx_python: +# stage: test +# needs: +# - build_exatrkx +# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 +# tags: +# - docker-gpu-nvidia +# script: +# - apt-get update -y +# - apt-get install -y python3 libxxhash0 +# - source build/this_acts_withdeps.sh +# - git clone $CLONE_URL src +# - cd src +# - git checkout $HEAD_SHA +# - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt +# - nvidia-smi +# - pytest -rFsv -k torch --collect-only +# - pytest -rFsv -k torch # For now only test torch pipeline build_linux_ubuntu: stage: build From e21cbd54ed7ea10790df96c0525de0797af840da Mon Sep 17 00:00:00 2001 From: Benjamin Huth <37871400+benjaminhuth@users.noreply.github.com> Date: Wed, 24 Jul 2024 13:29:59 +0200 Subject: [PATCH 5/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3632891694b..6e28ba3bba4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,16 +146,16 @@ build_exatrkx: - cmake --build build -- -j2 - ccache -s -test_exatrkx_unittests: - stage: test - needs: - - build_exatrkx - image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 - tags: - - docker-gpu-nvidia - script: - - ctest --test-dir build -R ExaTrkX - +# test_exatrkx_unittests: +# stage: test +# needs: +# - build_exatrkx +# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 +# tags: +# - docker-gpu-nvidia +# script: +# - ctest --test-dir build -R ExaTrkX +# # test_exatrkx_python: # stage: test # needs: @@ -172,8 +172,7 @@ test_exatrkx_unittests: # - git checkout $HEAD_SHA # - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt # - nvidia-smi -# - pytest -rFsv -k torch --collect-only -# - pytest -rFsv -k torch # For now only test torch pipeline +# - pytest -rFsv -k test_exatrkx build_linux_ubuntu: stage: build From 9409b9142a5e561a9ff3a759bd26a21c92e7c252 Mon Sep 17 00:00:00 2001 From: Benjamin Huth <37871400+benjaminhuth@users.noreply.github.com> Date: Wed, 24 Jul 2024 13:31:13 +0200 Subject: [PATCH 6/6] Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e28ba3bba4..9d08f0b1fad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,14 +147,14 @@ build_exatrkx: - ccache -s # test_exatrkx_unittests: -# stage: test -# needs: -# - build_exatrkx -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - docker-gpu-nvidia -# script: -# - ctest --test-dir build -R ExaTrkX +# stage: test +# needs: +# - build_exatrkx +# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 +# tags: +# - docker-gpu-nvidia +# script: +# - ctest --test-dir build -R ExaTrkX # # test_exatrkx_python: # stage: test