From f31fbb0fb69b243b1f34ad85f61c3e3e84fbbae8 Mon Sep 17 00:00:00 2001 From: Christian Gutschow Date: Thu, 11 Jul 2024 09:41:57 +0100 Subject: [PATCH] try disabling Conan in the CI --- .github/workflows/cmake.yml | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 96b13dc6e..f099b5e99 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,6 +19,7 @@ env: OMP_NUM_THREADS: 2 CONAN_PRINT_RUN_COMMANDS: 1 CONAN_CPU_COUNT: 2 + USE_CONAN: 0 jobs: build: @@ -75,15 +76,29 @@ jobs: run: | sudo apt update sudo apt install openmpi-bin libopenmpi-dev libyaml-cpp-dev ccache - pip install conan + if [[ "$USE_CONAN" = 1 ]]; then + pip install conan + else + sudo apt install libeigen3-dev libtiff-dev + git clone https://github.com/catchorg/Catch2.git -b v3.4.0 + mkdir Catch2/build + cd Catch2/build + cmake .. -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${PWD} + make -j$(nproc --ignore 1) + make -j$(nproc --ignore 1) install + cd - + fi - name: Install Dependencies on MacOS if: ${{ contains(matrix.os, 'macos') }} run: | - brew install libtiff libomp open-mpi libyaml ccache conan + brew install libtiff libomp open-mpi libyaml ccache catch2 echo "CMAKE_PREFIX_PATH=/opt/homebrew/opt/libomp" >> $GITHUB_ENV echo "/opt/homebrew/opt/ccache/libexec" >> $GITHUB_PATH #echo "/opt/homebrew/opt/libomp" >> $GITHUB_PATH + if [[ "$USE_CONAN" = 1 ]]; then + brew install conan + else #- name: Install gcc on MacOS # if: ${{ contains(matrix.os, 'macos') && contains(matrix.cxx, 'g++10') }} @@ -136,13 +151,24 @@ jobs: - name: Dependencies run: | - conan profile detect - conan install ${{github.workspace}} -of ${{github.workspace}}/build --build missing -o dompi=${{matrix.mpi}} -o openmp=${{matrix.omp}} -o onnxrt=on -s compiler.cppstd=17 + if [[ "$USE_CONAN" = 1 ]]; then + conan profile detect + conan install ${{github.workspace}} -of ${{github.workspace}}/build --build missing -o dompi=${{matrix.mpi}} -o openmp=${{matrix.omp}} -o onnxrt=on -s compiler.cppstd=17 + fi - name: Build # Build your program with the given configuration. # The Github Actions machines are dual-core so we can build faster using 2 parallel processes - run: conan build ${{github.workspace}} -of ${{github.workspace}}/build -o dompi=${{matrix.mpi}} -o openmp=${{matrix.omp}} -o onnxrt=on -s compiler.cppstd=17 + run: | + if [[ "$USE_CONAN" = 1 ]]; then + conan build ${{github.workspace}} -of ${{github.workspace}}/build -o dompi=${{matrix.mpi}} -o openmp=${{matrix.omp}} -o onnxrt=on -s compiler.cppstd=17 + else + export PATH=${{github.workspace}}/Catch2/build:$PATH + cd ${{github.workspace}}/build + make -j$(nproc --ignore 1) + make -j$(nproc --ignore 1) install + fi + - name: Test working-directory: ${{github.workspace}}/build