Commit 4680da3a authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Renable mac ci tests and fix test failure on linux CPU runs by adding the correct header.

parent 54c2d0d0

.github/workflows/ci_test.yaml

+16 −3
Original line number Diff line number Diff line
@@ -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

README.md

+2 −0
Original line number Diff line number Diff line
@@ -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.

graph_framework/cpu_context.hpp

+3 −2
Original line number Diff line number Diff line
@@ -399,7 +399,8 @@ namespace gpu { 
//------------------------------------------------------------------------------

        void create_header(std::ostringstream &source_buffer) {

            source_buffer << "#include <map>"     << std::endl

                          << "#include <array>" << std::endl;

                          << "#include <array>"   << std::endl

                          << "#include <cstdint>" << std::endl;

            if (jit::complex_scalar<T>) {

                source_buffer << "#include <complex>" << std::endl;

                source_buffer << "#include <special_functions.hpp>" << std::endl;