From 4680da3a315a62fc97c4d3bc637bf3be79c245dc Mon Sep 17 00:00:00 2001 From: cianciosa Date: Sat, 8 Nov 2025 19:45:13 -0500 Subject: [PATCH] Renable mac ci tests and fix test failure on linux CPU runs by adding the correct header. --- .github/workflows/ci_test.yaml | 19 ++++++++++++++++--- README.md | 2 ++ graph_framework/cpu_context.hpp | 5 +++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_test.yaml b/.github/workflows/ci_test.yaml index 0d0fb69..008a78c 100644 --- a/.github/workflows/ci_test.yaml +++ b/.github/workflows/ci_test.yaml @@ -5,8 +5,9 @@ on: jobs: ci_test: strategy: + fail-fast: false matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{matrix.os}} steps: - name: CPU Info Mac @@ -49,14 +50,26 @@ jobs: shell: bash working-directory: ${{runner.workspace}}/graph_framework/build run: cmake ${{runner.workspace}}/graph_framework - - name: Build + - name: Build Mac + if: ${{matrix.os == 'macos-latest'}} shell: bash working-directory: ${{runner.workspace}}/graph_framework/build run: make -j3 VERBOSE=1 - - name: Test + - name: Build Linux + if: ${{matrix.os == 'ubuntu-latest'}} + shell: bash + working-directory: ${{runner.workspace}}/graph_framework/build + run: make -j2 VERBOSE=1 + - name: Test Mac + if: ${{matrix.os == 'macos-latest'}} shell: bash working-directory: ${{runner.workspace}}/graph_framework/build run: make test ARGS=-j3 + - name: Test Linux + if: ${{matrix.os == 'ubuntu-latest'}} + shell: bash + working-directory: ${{runner.workspace}}/graph_framework/build + run: make test ARGS=-j2 - name: Show Log if: failure() shell: bash diff --git a/README.md b/README.md index fb7d556..055dcd9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ differentiation. It is designed to allow domain scientists to create cross platform GPU accelerated code and embed those codes in existing legacy tools. +[![Continuous Integration Test](https://github.com/ORNL-Fusion/graph_framework/actions/workflows/ci_test.yaml/badge.svg?branch=main)](https://github.com/ORNL-Fusion/graph_framework/actions/workflows/ci_test.yaml) + ## Documentation [graph_framework-docs](https://ornl-fusion.github.io/graph_framework-docs) Documentation for the graph_framework. diff --git a/graph_framework/cpu_context.hpp b/graph_framework/cpu_context.hpp index fc210b4..76fb313 100644 --- a/graph_framework/cpu_context.hpp +++ b/graph_framework/cpu_context.hpp @@ -398,8 +398,9 @@ namespace gpu { /// @param[in,out] source_buffer Source buffer stream. //------------------------------------------------------------------------------ void create_header(std::ostringstream &source_buffer) { - source_buffer << "#include " << std::endl - << "#include " << std::endl; + source_buffer << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl; if (jit::complex_scalar) { source_buffer << "#include " << std::endl; source_buffer << "#include " << std::endl; -- GitLab