From f934589b213eaae46e06b9e47a74102af36bd706 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Tue, 8 Oct 2024 15:31:06 +0100 Subject: [PATCH 01/10] make sure ORT lib location is known to cmake --- cmake_files/dependencies.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake_files/dependencies.cmake b/cmake_files/dependencies.cmake index 3a020482f..54d9c9cee 100644 --- a/cmake_files/dependencies.cmake +++ b/cmake_files/dependencies.cmake @@ -26,6 +26,10 @@ find_package(Boost COMPONENTS system filesystem REQUIRED) find_package(yaml-cpp REQUIRED) +if (onnxrt) + find_package(onnxruntime REQUIRED) +endif() + find_package(sopt REQUIRED) set(PURIFY_ONNXRT FALSE) if (onnxrt) From 1fee84ddadd9ceca49c134a811c2a230692664c7 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Tue, 8 Oct 2024 16:22:17 +0100 Subject: [PATCH 02/10] trigger CI From 4ba5904454a39de01a0c1fab29cf3d3e71761f70 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Tue, 8 Oct 2024 16:57:28 +0100 Subject: [PATCH 03/10] trigger CI From 2995a9574aabc112fa3a321e26100d40a58e00e2 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Tue, 8 Oct 2024 17:09:07 +0100 Subject: [PATCH 04/10] add debug info --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ca05774b..94606e3a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,6 +218,8 @@ jobs: # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: | export LD_LIBRARY_PATH=${{github.workspace}}/local/lib:${{github.workspace}}/local/external/lib:${LD_LIBRARY_PATH} + ls ${{github.workspace}}/local/ + ls ${{github.workspace}}/local/lib/ ctest -C ${{env.BUILD_TYPE}} --output-on-failure doc: From c9d3e6b043c4fa3574d0154a9dbf748a6d44ff53 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Tue, 8 Oct 2024 17:45:49 +0100 Subject: [PATCH 05/10] reinstate symlink --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94606e3a6..233adda15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,7 +218,10 @@ jobs: # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: | export LD_LIBRARY_PATH=${{github.workspace}}/local/lib:${{github.workspace}}/local/external/lib:${LD_LIBRARY_PATH} - ls ${{github.workspace}}/local/ + OLDSOPT=`ls ${{github.workspace}}/local/lib/libsopt*` + SOPTBASE=${OLDSOPT%.*} + NEWSOPT=${SOPTBASE%.*}.${OLDSOPT##*.} + ln -s $OLDSOPT $NEWSOPT ls ${{github.workspace}}/local/lib/ ctest -C ${{env.BUILD_TYPE}} --output-on-failure From 8d356bed86010dbd7f51330ab3b0d4e45f143324 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Tue, 8 Oct 2024 18:03:48 +0100 Subject: [PATCH 06/10] of course MacOS and Linux will do it differently --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 233adda15..50fd214fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,8 +219,10 @@ jobs: run: | export LD_LIBRARY_PATH=${{github.workspace}}/local/lib:${{github.workspace}}/local/external/lib:${LD_LIBRARY_PATH} OLDSOPT=`ls ${{github.workspace}}/local/lib/libsopt*` - SOPTBASE=${OLDSOPT%.*} - NEWSOPT=${SOPTBASE%.*}.${OLDSOPT##*.} + NEWSOPT=${OLDSOPT%.*} + if [[ $OLDSOPT == *"dylib"* ]]; then + NEWSOPT=${NEWSOPT%.*}.${OLDSOPT##*.} + fi ln -s $OLDSOPT $NEWSOPT ls ${{github.workspace}}/local/lib/ ctest -C ${{env.BUILD_TYPE}} --output-on-failure From 4a8e4f70ed46248ee853eb7d5f32b14bd879d9a4 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Tue, 8 Oct 2024 18:14:49 +0100 Subject: [PATCH 07/10] remove debug info --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50fd214fb..771883b2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -223,8 +223,7 @@ jobs: if [[ $OLDSOPT == *"dylib"* ]]; then NEWSOPT=${NEWSOPT%.*}.${OLDSOPT##*.} fi - ln -s $OLDSOPT $NEWSOPT - ls ${{github.workspace}}/local/lib/ + ln -s $OLDSOPT $NEWSOPT ctest -C ${{env.BUILD_TYPE}} --output-on-failure doc: From f803bf3a8c4dc9259c9d119c40414a2c34b9eae9 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Wed, 9 Oct 2024 11:43:14 +0100 Subject: [PATCH 08/10] version bump --- .github/workflows/ci.yml | 6 ------ cmake_files/version.cmake | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 851e53a8d..88e11665b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,12 +225,6 @@ jobs: # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: | export LD_LIBRARY_PATH=${{github.workspace}}/local/lib:${{github.workspace}}/local/external/lib:${LD_LIBRARY_PATH} - OLDSOPT=`ls ${{github.workspace}}/local/lib/libsopt*` - NEWSOPT=${OLDSOPT%.*} - if [[ $OLDSOPT == *"dylib"* ]]; then - NEWSOPT=${NEWSOPT%.*}.${OLDSOPT##*.} - fi - ln -s $OLDSOPT $NEWSOPT ctest -C ${{env.BUILD_TYPE}} --output-on-failure doc: diff --git a/cmake_files/version.cmake b/cmake_files/version.cmake index e480235dc..4eebd9be1 100644 --- a/cmake_files/version.cmake +++ b/cmake_files/version.cmake @@ -1,5 +1,5 @@ -set(${PROJECT_NAME}_VERSION 3.1.0) +set(${PROJECT_NAME}_VERSION 4.2.0) # Tries and get git hash first find_package(Git) From 5baffb77797295554118309d2e6c41251f0dc59d Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Wed, 9 Oct 2024 11:58:59 +0100 Subject: [PATCH 09/10] bump version --- data/config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/config/config.yaml b/data/config/config.yaml index a2741a1ba..c447027a8 100644 --- a/data/config/config.yaml +++ b/data/config/config.yaml @@ -1,5 +1,5 @@ ### Config file for Purify -Version: 3.1.0 +Version: 4.2.0 GeneralConfiguration: InputOutput: input: From 2a821d2d27f9c83c8626e7e16b3e0b7992ccc485 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Wed, 9 Oct 2024 12:12:56 +0100 Subject: [PATCH 10/10] more version bumps --- data/config/test_measurements_config.yaml | 2 +- data/config/test_simulation_config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/config/test_measurements_config.yaml b/data/config/test_measurements_config.yaml index c22a22f51..25e79cbad 100644 --- a/data/config/test_measurements_config.yaml +++ b/data/config/test_measurements_config.yaml @@ -1,5 +1,5 @@ ### Config file for Purify -Version: 3.1.0 +Version: 4.2.0 GeneralConfiguration: InputOutput: input: diff --git a/data/config/test_simulation_config.yaml b/data/config/test_simulation_config.yaml index b63af834e..1eab06b9b 100644 --- a/data/config/test_simulation_config.yaml +++ b/data/config/test_simulation_config.yaml @@ -1,5 +1,5 @@ ### Config file for Purify -Version: 3.1.0 +Version: 4.2.0 GeneralConfiguration: InputOutput: input: