From c1fe5e6b1926b2ce98ab3b6e131f9fd3e4c54f0d Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Fri, 12 Sep 2025 13:15:59 +0000 Subject: [PATCH 1/6] Make another bot which will ensure MaCh3 can be found using find_package() --- .github/workflows/CIFindPackage.yml | 58 +++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/CIFindPackage.yml diff --git a/.github/workflows/CIFindPackage.yml b/.github/workflows/CIFindPackage.yml new file mode 100644 index 000000000..3c1382b17 --- /dev/null +++ b/.github/workflows/CIFindPackage.yml @@ -0,0 +1,58 @@ +--- +# KS: Make sure find package works on MaCh3 software +name: Find Package C + +# The events that trigger the workflow +on: + pull_request: + branches: [ develop ] + +permissions: + contents: read + packages: write + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false # KS: Prevents cancellation of remaining jobs if one fails + matrix: + include: + - name: Find Package Alma9 + container: ghcr.io/mach3-software/mach3:alma9v2.2.1 + cmakeoptions: -DMaCh3_PYTHON_ENABLED=ON -DNuFastLinear_ENABLED=ON -DCUDAProb3Linear_ENABLED=ON -DCUDAProb3_ENABLED=ON -DProb3ppLinear_ENABLED=ON + + - name: Find Package Rocky9 CUDA + container: ghcr.io/mach3-software/mach3:rocky9cudav2.2.0 + cmakeoptions: -DMaCh3_PYTHON_ENABLED=ON -DNuFastLinear_ENABLED=ON -DCUDAProb3Linear_ENABLED=ON -DCUDAProb3_ENABLED=ON -DProb3ppLinear_ENABLED=ON -DProbGPULinear_ENABLED=ON + + name: ${{ matrix.name }} + + container: + image: ${{ matrix.container }} + + steps: + - uses: actions/checkout@v5 + + - name: Get MaCh3 + run: | + cd /opt/ + git clone https://github.com/mach3-software/MaCh3.git MaCh3Core + cd MaCh3Core + git checkout ${{ github.head_ref }} + mkdir build + cd build + cmake ../ ${{ matrix.cmakeoptions }} + make -j4 install + + - name: Get MaCh3 Tutorial + run: | + cd /opt/ + git clone https://github.com/mach3-software/MaCh3Tutorial.git MaCh3Tutorial + cd MaCh3Tutorial + mkdir build + source /opt/MaCh3Core/build/bin/setup.MaCh3.sh + cd build + cmake ../ -DUse_External_MaCh3=TRUE + make -j4 install + source /opt/MaCh3Tutorial/build/bin/setup.MaCh3Tutorial.sh From daef787feddab16c01228651bb7c006e0b0bd72d Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Fri, 12 Sep 2025 13:23:42 +0000 Subject: [PATCH 2/6] thanks linter bot... --- .github/workflows/CIFindPackage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CIFindPackage.yml b/.github/workflows/CIFindPackage.yml index 3c1382b17..7a9ebd811 100644 --- a/.github/workflows/CIFindPackage.yml +++ b/.github/workflows/CIFindPackage.yml @@ -35,11 +35,13 @@ jobs: - uses: actions/checkout@v5 - name: Get MaCh3 + env: + HEAD_REF: ${{ github.head_ref || github.ref_name }} run: | cd /opt/ git clone https://github.com/mach3-software/MaCh3.git MaCh3Core cd MaCh3Core - git checkout ${{ github.head_ref }} + git checkout "$HEAD_REF" mkdir build cd build cmake ../ ${{ matrix.cmakeoptions }} From b136e7a88fce3d2a390684dd3b08ca3b4e7f1c71 Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Fri, 12 Sep 2025 13:27:20 +0000 Subject: [PATCH 3/6] try now --- .github/workflows/CIFindPackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CIFindPackage.yml b/.github/workflows/CIFindPackage.yml index 7a9ebd811..349a1442c 100644 --- a/.github/workflows/CIFindPackage.yml +++ b/.github/workflows/CIFindPackage.yml @@ -24,7 +24,7 @@ jobs: - name: Find Package Rocky9 CUDA container: ghcr.io/mach3-software/mach3:rocky9cudav2.2.0 - cmakeoptions: -DMaCh3_PYTHON_ENABLED=ON -DNuFastLinear_ENABLED=ON -DCUDAProb3Linear_ENABLED=ON -DCUDAProb3_ENABLED=ON -DProb3ppLinear_ENABLED=ON -DProbGPULinear_ENABLED=ON + cmakeoptions: -DMaCh3_PYTHON_ENABLED=ON -DNuFastLinear_ENABLED=ON -DCUDAProb3_ENABLED=ON -DProb3ppLinear_ENABLED=ON -DProbGPULinear_ENABLED=ON name: ${{ matrix.name }} From e12b60cda321b6b1cbf0dde1a9f2545a5976624f Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Fri, 12 Sep 2025 13:40:39 +0000 Subject: [PATCH 4/6] modify GPU find pakcage for now --- .github/workflows/CIFindPackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CIFindPackage.yml b/.github/workflows/CIFindPackage.yml index 349a1442c..ea7263eec 100644 --- a/.github/workflows/CIFindPackage.yml +++ b/.github/workflows/CIFindPackage.yml @@ -24,7 +24,7 @@ jobs: - name: Find Package Rocky9 CUDA container: ghcr.io/mach3-software/mach3:rocky9cudav2.2.0 - cmakeoptions: -DMaCh3_PYTHON_ENABLED=ON -DNuFastLinear_ENABLED=ON -DCUDAProb3_ENABLED=ON -DProb3ppLinear_ENABLED=ON -DProbGPULinear_ENABLED=ON + cmakeoptions: -DMaCh3_PYTHON_ENABLED=ON -DNuFastLinear_ENABLED=ON -DCUDAProb3_ENABLED=ON -DProb3ppLinear_ENABLED=ON name: ${{ matrix.name }} From d8368738cce8bc5333ae029ba8be99d4d1307ce6 Mon Sep 17 00:00:00 2001 From: Kamil <45295406+KSkwarczynski@users.noreply.github.com> Date: Fri, 12 Sep 2025 17:54:56 +0100 Subject: [PATCH 5/6] Update Dockerfile --- Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile b/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile index aed67b825..1bea569a9 100644 --- a/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile +++ b/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile @@ -9,7 +9,8 @@ LABEL compiler="Clang 19.1.1" LABEL root_version="v6.34.00" LABEL org.opencontainers.image.description="Official MaCh3 container" -RUN apt update && apt upgrade -y +# KS: Comment out becasue looks like Ubuntu dropped support for some pakcages... +#RUN apt update && apt upgrade -y RUN apt-get install -y nlohmann-json3-dev #MISC_SW From 1090c29eec72e9a3d82ba87c5cdcdc024506e2a3 Mon Sep 17 00:00:00 2001 From: Kamil <45295406+KSkwarczynski@users.noreply.github.com> Date: Fri, 12 Sep 2025 18:03:13 +0100 Subject: [PATCH 6/6] Update Dockerfile --- Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile b/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile index 1bea569a9..aed67b825 100644 --- a/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile +++ b/Doc/MaCh3DockerFiles/Ubuntu24.10/Dockerfile @@ -9,8 +9,7 @@ LABEL compiler="Clang 19.1.1" LABEL root_version="v6.34.00" LABEL org.opencontainers.image.description="Official MaCh3 container" -# KS: Comment out becasue looks like Ubuntu dropped support for some pakcages... -#RUN apt update && apt upgrade -y +RUN apt update && apt upgrade -y RUN apt-get install -y nlohmann-json3-dev #MISC_SW