Merge branch 'development' into tk/remove_notinstalled

Author: tkoskela

.github/workflows/ci.yml

@@ -97,7 +97,7 @@ jobs:
     - name: Install Dependencies on MacOS
       if: ${{ contains(matrix.os, 'macos') }}
       run: |
-        brew install open-mpi libomp yaml-cpp eigen cfitsio ccache
+        brew install open-mpi libomp yaml-cpp eigen cfitsio ccache onnxruntime
         echo "CMAKE_PREFIX_PATH=/opt/homebrew/opt/libomp" >> $GITHUB_ENV
         echo "/opt/homebrew/opt/ccache/libexec" >> $GITHUB_PATH
 
@@ -136,14 +136,14 @@ jobs:
         export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH
         mkdir -p ${{github.workspace}}/sopt/build
         cd ${{github.workspace}}/sopt/build
-        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Ddompi=${{matrix.mpi}} -Dopenmp=${{matrix.omp}} -Dtests=OFF -Dexamples=OFF
+        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Donnxrt=ON -Ddompi=${{matrix.mpi}} -Dopenmp=${{matrix.omp}} -Dtests=OFF -Dexamples=OFF
         make -j$(nproc --ignore 1) install
 
     - name: Pack dependencies
       run: |
         cd ${{github.workspace}}
         tar cfv dependencies.tar local
-        
+
     - uses: actions/upload-artifact@v4
       with:
         name: dependencies-${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.mpi }}-${{ matrix.omp }}
@@ -206,7 +206,7 @@ jobs:
     - name: Install Dependencies on MacOS
       if: ${{ contains(matrix.os, 'macos') }}
       run: |
-        brew install open-mpi libomp eigen ccache cfitsio boost yaml-cpp
+        brew install open-mpi libomp eigen ccache cfitsio boost yaml-cpp onnxruntime
         echo "CMAKE_PREFIX_PATH=/opt/homebrew/opt/libomp" >> $GITHUB_ENV
         echo "/opt/homebrew/opt/ccache/libexec" >> $GITHUB_PATH
 
@@ -216,7 +216,7 @@ jobs:
         export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH
         mkdir -p ${{github.workspace}}/build
         cd ${{github.workspace}}/build
-        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Ddocasa=OFF -Ddompi=${{matrix.mpi}} -Dopenmp=${{matrix.omp}} -Dtests=ON
+        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Donnxrt=ON -Ddocasa=OFF -Ddompi=${{matrix.mpi}} -Dopenmp=${{matrix.omp}} -Dtests=ON
         make -j$(nproc --ignore 1) install
 
     - name: Test
@@ -267,7 +267,7 @@ jobs:
     - name: Install Dependencies on MacOS
       if: ${{ contains(matrix.os, 'macos') }}
       run: |
-        brew install gcc libtiff eigen libyaml ccache cfitsio boost yaml-cpp
+        brew install gcc libtiff eigen libyaml ccache cfitsio boost yaml-cpp onnxruntime
         echo "CMAKE_PREFIX_PATH=/opt/homebrew/opt/libomp" >> $GITHUB_ENV
         echo "/opt/homebrew/opt/ccache/libexec" >> $GITHUB_PATH
 
@@ -276,7 +276,7 @@ jobs:
         export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH
         mkdir -p ${{github.workspace}}/build
         cd ${{github.workspace}}/build
-        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON
+        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Donnxrt=ON -Ddompi=OFF -Dopenmp=OFF -Ddocs=ON
         make -j$(nproc --ignore 1) install
 
     - name: Deploy to GH pages

cmake_files/dependencies.cmake

@@ -26,11 +26,6 @@ find_package(Boost COMPONENTS system filesystem REQUIRED)
 
 find_package(yaml-cpp REQUIRED)
 
-if (onnxrt)
-  find_package(onnxruntime REQUIRED)
-  install(DIRECTORY ${CMAKE_SOURCE_DIR}/models DESTINATION .)
-endif()
-
 find_package(sopt REQUIRED)
 set(PURIFY_ONNXRT FALSE)
 if (onnxrt)
@@ -39,6 +34,7 @@ if (onnxrt)
   else()
     message(FATAL_ERROR "SOPT built without ONNXrt support")
   endif()
+  install(DIRECTORY ${CMAKE_SOURCE_DIR}/models DESTINATION .)
 endif()
 
 find_package(Cubature QUIET)