From ae74387cb548ecf80f90db80fb8c2545fb786253 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 15:58:42 +0100 Subject: [PATCH 01/15] add Fedora image --- .github/workflows/documentation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e93d0eb7..bff28dbc 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -19,6 +19,7 @@ env: jobs: make-documentation: runs-on: ubuntu-22.04 + container: fedora:39 steps: - name: Check out sopt uses: actions/checkout@v3 @@ -32,6 +33,7 @@ jobs: - name: Install dependencies run: | + cat /etc/os-release sudo apt update sudo apt install openmpi-bin libopenmpi-dev libyaml-cpp-dev doxygen graphviz ccache libeigen3-dev libtiff-dev From 1c7f138607faf991acf94695c26ad6b66369073c Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:16:20 +0100 Subject: [PATCH 02/15] no submodules here --- .github/workflows/documentation.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index bff28dbc..2d5d68c4 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -23,8 +23,6 @@ jobs: steps: - name: Check out sopt uses: actions/checkout@v3 - with: - submodules: recursive # Enable tmate debugging of manually-triggered workflows if the input option was provided - name: Setup tmate session From 1be74b6aff4033bdc48d449e1e26b1431a93fca7 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:21:15 +0100 Subject: [PATCH 03/15] apt-get to dnf --- .github/workflows/documentation.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 2d5d68c4..4d73fd63 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -32,22 +32,22 @@ jobs: - name: Install dependencies run: | cat /etc/os-release - sudo apt update - sudo apt install openmpi-bin libopenmpi-dev libyaml-cpp-dev doxygen graphviz ccache libeigen3-dev libtiff-dev + sudo dnf update + sudo dnf install openmpi openmpi-dev yaml-cpp doxygen graphviz ccache eigen3-dev libtiff catch2-devel - - name: Checkout Catch2 - uses: actions/checkout@v4 - with: - repository: catchorg/Catch2.git - path: Catch2 - ref: v3.4.0 + #- name: Checkout Catch2 + # uses: actions/checkout@v4 + # with: + # repository: catchorg/Catch2.git + # path: Catch2 + # ref: v3.4.0 - - name: Build Catch2 - run: | - mkdir Catch2/build - cd Catch2/build - cmake .. -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local - make -j$(nproc --ignore 1) install + #- name: Build Catch2 + # run: | + # mkdir Catch2/build + # cd Catch2/build + # cmake .. -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local + # make -j$(nproc --ignore 1) install - name: Build run: | From c03c2b029ae4a2de08d8b0db642d2b0926af0ec0 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:25:02 +0100 Subject: [PATCH 04/15] assume yes --- .github/workflows/documentation.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 4d73fd63..f4cd2cc4 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -31,9 +31,8 @@ jobs: - name: Install dependencies run: | - cat /etc/os-release sudo dnf update - sudo dnf install openmpi openmpi-dev yaml-cpp doxygen graphviz ccache eigen3-dev libtiff catch2-devel + sudo dnf -y install openmpi openmpi-dev yaml-cpp doxygen graphviz ccache eigen3-dev libtiff catch2-devel #- name: Checkout Catch2 # uses: actions/checkout@v4 From d47cd28747531c137e3f58c73ec71e6deebee111 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:27:05 +0100 Subject: [PATCH 05/15] assume yes for both, d'oh --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index f4cd2cc4..6dd8d3a6 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -31,7 +31,7 @@ jobs: - name: Install dependencies run: | - sudo dnf update + sudo dnf -y update sudo dnf -y install openmpi openmpi-dev yaml-cpp doxygen graphviz ccache eigen3-dev libtiff catch2-devel #- name: Checkout Catch2 From a84ff8c150150f0c57b9954a2eb51087cd186eff Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:29:14 +0100 Subject: [PATCH 06/15] devel typo --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 6dd8d3a6..1f0b57bc 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: | sudo dnf -y update - sudo dnf -y install openmpi openmpi-dev yaml-cpp doxygen graphviz ccache eigen3-dev libtiff catch2-devel + sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff catch2-devel #- name: Checkout Catch2 # uses: actions/checkout@v4 From efdd17be020b302b23cfe74b883b66da9331d0f6 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:32:22 +0100 Subject: [PATCH 07/15] path debug --- .github/workflows/documentation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 1f0b57bc..849820c3 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -50,7 +50,9 @@ jobs: - name: Build run: | - export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH + #export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH + pwd + echo "${{github.workspace}}" mkdir ${{github.workspace}}/build cd ${{github.workspace}}/build cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON -Donnxrt=ON From 54f666b89b49f0353323e4185b86b79be1075234 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:35:13 +0100 Subject: [PATCH 08/15] adjust path for container image --- .github/workflows/documentation.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 849820c3..8c3eaf3b 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -50,12 +50,8 @@ jobs: - name: Build run: | - #export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH - pwd - echo "${{github.workspace}}" - mkdir ${{github.workspace}}/build - cd ${{github.workspace}}/build - cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON -Donnxrt=ON + mkdir build && cd build + cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${PWD}/../local -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON -Donnxrt=ON make -j$(nproc --ignore 1) make -j$(nproc --ignore 1) install From c02c0c8a13b32ecdd005483ba90684605b5045da Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:37:29 +0100 Subject: [PATCH 09/15] install cmake --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 8c3eaf3b..76123f72 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: | sudo dnf -y update - sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff catch2-devel + sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff catch2-devel cmake #- name: Checkout Catch2 # uses: actions/checkout@v4 From 3f2950670f4263a557cab363b9223e0758d58d54 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:52:47 +0100 Subject: [PATCH 10/15] gcc missing?? --- .github/workflows/documentation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 76123f72..46ce4db7 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -32,7 +32,8 @@ jobs: - name: Install dependencies run: | sudo dnf -y update - sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff catch2-devel cmake + sudo dnf -y install cmake gcc gcc-c++ + sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff catch2-devel #- name: Checkout Catch2 # uses: actions/checkout@v4 @@ -50,6 +51,7 @@ jobs: - name: Build run: | + source /etc/profile.d/modules.sh mkdir build && cd build cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${PWD}/../local -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON -Donnxrt=ON make -j$(nproc --ignore 1) From 0a5c102b17d225f82d53ad01549fe446e7086d2b Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:54:50 +0100 Subject: [PATCH 11/15] meh --- .github/workflows/documentation.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 46ce4db7..944a520b 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -51,7 +51,6 @@ jobs: - name: Build run: | - source /etc/profile.d/modules.sh mkdir build && cd build cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${PWD}/../local -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON -Donnxrt=ON make -j$(nproc --ignore 1) From 85b36df85c5433c184143815c4737e9aaa417877 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 16:58:24 +0100 Subject: [PATCH 12/15] try tiff devel --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 944a520b..63aa8e58 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -33,7 +33,7 @@ jobs: run: | sudo dnf -y update sudo dnf -y install cmake gcc gcc-c++ - sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff catch2-devel + sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff-devel catch2-devel #- name: Checkout Catch2 # uses: actions/checkout@v4 From b285583ea292a0ac945a142427b6f82a207f8125 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 17:05:39 +0100 Subject: [PATCH 13/15] need Catch2 v3 --- .github/workflows/documentation.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 63aa8e58..e06cd958 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -33,21 +33,21 @@ jobs: run: | sudo dnf -y update sudo dnf -y install cmake gcc gcc-c++ - sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff-devel catch2-devel + sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff-devel - #- name: Checkout Catch2 - # uses: actions/checkout@v4 - # with: - # repository: catchorg/Catch2.git - # path: Catch2 - # ref: v3.4.0 + - name: Checkout Catch2 + uses: actions/checkout@v4 + with: + repository: catchorg/Catch2.git + path: Catch2 + ref: v3.4.0 - #- name: Build Catch2 - # run: | - # mkdir Catch2/build - # cd Catch2/build - # cmake .. -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local - # make -j$(nproc --ignore 1) install + - name: Build Catch2 + run: | + mkdir Catch2/build + cd Catch2/build + cmake .. -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local + make -j$(nproc --ignore 1) install - name: Build run: | From f619b340a2724ddf5ff7b6ab0628dd78a09058c9 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 17:09:46 +0100 Subject: [PATCH 14/15] no git?? --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e06cd958..c49f69eb 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -33,7 +33,7 @@ jobs: run: | sudo dnf -y update sudo dnf -y install cmake gcc gcc-c++ - sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff-devel + sudo dnf -y install openmpi openmpi-devel yaml-cpp doxygen graphviz ccache eigen3-devel libtiff-devel git - name: Checkout Catch2 uses: actions/checkout@v4 From cbad4554c1bab10ab08d52b80ff0003fa7deac99 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 26 Sep 2024 17:13:18 +0100 Subject: [PATCH 15/15] try pointing CMake at Catch2 --- .github/workflows/documentation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index c49f69eb..6430ad76 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -51,6 +51,7 @@ jobs: - name: Build run: | + export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH mkdir build && cd build cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${PWD}/../local -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON -Donnxrt=ON make -j$(nproc --ignore 1)