Running C tests after build

.github/workflows/linux-cpu-arm64-build.yml

@@ -8,13 +8,13 @@ env:
   ort_zip: "onnxruntime-linux-aarch64-1.17.0.tgz"
   ort_url: "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-linux-aarch64-1.17.0.tgz"
 jobs:
-  job:
+  linux-cpu-arm64-build:
     runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2004-ARM-CPU" ]
     steps:
       - name: Checkout OnnxRuntime GenAI repo
-        uses: actions/checkout@v2
-
-
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
 
       - name: Download OnnxRuntime
         run: |
@@ -29,19 +29,38 @@ jobs:
         run: |
           mv ${{ env.ort_dir }} ort
 
-      - name: Git Submodule Update
-        run: |
-          git submodule update --init --recursive
-
-      - name: Build with CMake and GCC
+      - name: Download Docker Image
         run: |
           set -e -x
           python3 tools/ci_build/get_docker_image.py --dockerfile tools/ci_build/github/linux/docker/inference/aarch64/default/cpu/Dockerfile \
             --context tools/ci_build/github/linux/docker/inference/aarch64/default/cpu \
             --docker-build-args "--build-arg BUILD_UID=$( id -u )" \
             --container-registry onnxruntimebuildcache \
             --repository onnxruntimecpubuild
-          docker run --rm --volume $GITHUB_WORKSPACE:/onnxruntime_src  -w /onnxruntime_src onnxruntimecpubuild bash -c "echo $PATH && /usr/bin/cmake --preset linux_gcc_cpu_release && /usr/bin/cmake --build --preset linux_gcc_cpu_release"
+
+      - name: Doker -- Configure with CMake and GCC
+        run: |
+          docker run --rm \
+          --volume $GITHUB_WORKSPACE:/onnxruntime_src \
+          -w /onnxruntime_src onnxruntimecpubuild bash -c "/usr/bin/cmake --preset linux_gcc_cpu_release"
+
+      - name: Docker -- Build with CMake and GCC
+        run: |
+          docker run --rm \
+          --volume $GITHUB_WORKSPACE:/onnxruntime_src \
+          -w /onnxruntime_src onnxruntimecpubuild bash -c "/usr/bin/cmake --build --preset linux_gcc_cpu_release"
+
+      - name: Dokcer -- check test directory
+        run: |
+          docker run --rm \
+          --volume $GITHUB_WORKSPACE:/onnxruntime_src \
+          -w /onnxruntime_src onnxruntimecpubuild bash -c "ls -l /onnxruntime_src/build/gcc_cpu/release/test/"
+
+      - name: Docker -- Run tests
+        run: |
+          docker run --rm \
+          --volume $GITHUB_WORKSPACE:/onnxruntime_src \
+          -w /onnxruntime_src onnxruntimecpubuild bash -c "/onnxruntime_src/build/gcc_cpu/release/test/unit_tests"   
 
 
 

.github/workflows/linux-cpu-x64-build.yml

@@ -8,13 +8,16 @@ env:
   ort_zip: "onnxruntime-linux-x64-1.17.0.tgz"
   ort_url: "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-linux-x64-1.17.0.tgz"
 jobs:
-  job:
+  linux_cpu_x64:
+    strategy:
+      matrix:
+        compiler: [ gcc, clang ]
     runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2204-AMD-CPU" ]
     steps:
       - name: Checkout OnnxRuntime GenAI repo
-        uses: actions/checkout@v2
-
-
+        uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Download OnnxRuntime
         run: |
@@ -29,31 +32,28 @@ jobs:
         run: |
           mv ${{ env.ort_dir }} ort
 
-      - name: Git Submodule Update
-        run: |
-          git submodule update --init --recursive
-
       - name: Build with CMake and GCC
         run: |
           set -e -x
           rm -rf build
-          cmake --preset linux_gcc_cpu_release
-          cmake --build --preset linux_gcc_cpu_release
-
-      - name: Build with CMake and clang
-        run: |
-          set -e -x
-          rm -rf build
-          cmake --preset linux_clang_cpu_release
-          cmake --build --preset linux_clang_cpu_release
+          cmake --preset linux_${{ matrix.compiler }}_cpu_release
+          cmake --build --preset linux_${{ matrix.compiler }}_cpu_release
 
       - name: Verify Build Artifacts
         if: always()
+        continue-on-error: true
         run: |
-          ls -l ${{ github.workspace }}/build
+          ls -l ${{ github.workspace }}/build/${{ matrix.compiler }}_cpu/release
+
+      - if: ${{ matrix.compiler }} == 'gcc'
+        name: Run tests
+        run: |
+          set -e -x
+          ./build/${{ matrix.compiler }}_cpu/release/test/unit_tests
 
-      - name: Upload Build Artifacts
+      - if: ${{ matrix.compiler }} == 'gcc'
+        name: Upload Build Artifacts
         uses: actions/upload-artifact@v3
         with:
           name: onnxruntime-genai-linux-cpu-x64
-          path: ${{ github.workspace }}/build/**/*.a
+          path: ${{ github.workspace }}/build/**/*.a

.github/workflows/linux-gpu-x64-build.yml

@@ -10,11 +10,13 @@ env:
   ort_zip: "onnxruntime-linux-x64-gpu-1.17.0.tgz"
   ort_url: "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-linux-x64-gpu-1.17.0.tgz"
 jobs:
-  job:
+  linux-gpu-x64-build:
     runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Ubuntu2004-T4" ]
     steps:
       - name: Checkout OnnxRuntime GenAI repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Download OnnxRuntime
         run: |
@@ -29,10 +31,6 @@ jobs:
         run: |
           mv ${{ env.ort_dir }} ort
 
-      - name: Git Submodule Update
-        run: |
-          git submodule update --init --recursive
-
       - name: Download Docker Image
         run: |
           set -e -x
@@ -47,12 +45,40 @@ jobs:
           echo "Printing docker image environment variables"
           docker run --rm onnxruntimegpubuild env
 
-      - name: Build with Cmake in Docker
+      - name: Docker -- Configure with CMake and GCC
+        run: |
+          echo "Running docker image onnxruntimegpubuild"
+          docker run \
+            --gpus all \
+            --rm \
+            --volume $GITHUB_WORKSPACE:/onnxruntime_src \
+            -w /onnxruntime_src onnxruntimegpubuild bash -c "/usr/bin/cmake -DCMAKE_CUDA_ARCHITECTURES=86 --preset linux_gcc_cuda_release "
+
+      - name: Docker -- Build with CMake and GCC
+        run: |
+          echo "Running docker image onnxruntimegpubuild"
+          docker run \
+            --gpus all \
+            --rm \
+            --volume $GITHUB_WORKSPACE:/onnxruntime_src \
+            -w /onnxruntime_src onnxruntimegpubuild bash -c "/usr/bin/cmake --build --preset linux_gcc_cuda_release"
+
+      - name: Docker -- check test directory
+        run: |
+          echo "Running docker image onnxruntimegpubuild"
+          docker run \
+            --gpus all \
+            --rm \
+            --volume $GITHUB_WORKSPACE:/onnxruntime_src \
+            -w /onnxruntime_src onnxruntimegpubuild bash -c "ls -l /onnxruntime_src/build/gcc_cuda/release/test/"
+
+      - name: Docker -- Run tests
         run: |
           echo "Running docker image onnxruntimegpubuild"
           docker run \
             --gpus all \
             --rm \
             --volume $GITHUB_WORKSPACE:/onnxruntime_src \
-            -w /onnxruntime_src onnxruntimegpubuild bash -c "echo $PATH && /usr/bin/cmake -DCMAKE_CUDA_ARCHITECTURES=86 --preset linux_gcc_cuda_release && /usr/bin/cmake --build --preset linux_gcc_cuda_release"
+            -w /onnxruntime_src onnxruntimegpubuild bash -c "/onnxruntime_src/build/gcc_cuda/release/test/unit_tests"
+
 

.github/workflows/mac-cpu-arm64-build.yml

@@ -8,7 +8,7 @@ env:
   ort_zip: "onnxruntime-osx-arm64-1.17.0.tgz"
   ort_url: "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-osx-arm64-1.17.0.tgz"
 jobs:
-  job:
+  mac-cpu-arm64-build:
     runs-on: macos-latest
     steps:
       - name: Checkout OnnxRuntime GenAI repo
@@ -37,12 +37,13 @@ jobs:
         run: |
       - name: Build with CMake
         run: |
-          cmake -G "Ninja" -B build . -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=OFF
+          cmake -G "Ninja" -B build -S . -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=OFF
           cmake --build build --config Release --parallel
         continue-on-error: true
 
       - name: Verify Build Artifacts
         if: always()
+        continue-on-error: true
         run: |
           ls -l ${{ github.workspace }}/build
 

.github/workflows/win-cpu-arm64-build.yml

@@ -16,10 +16,14 @@ env:
   ort_url: "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/$(ort_zip)"
 
 jobs:
-  job:
-    runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Win11-ARM-CPU"]
+  windows-cpu-arm64-build:
+    runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Win11-ARM-CPU" ]
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout OnnxRuntime GenAI repo
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
       - name: Setup Visual Studio 2022
         uses: microsoft/[email protected]
         with:
@@ -42,13 +46,19 @@ jobs:
 
       - name: Build with CMake
         run: |
-          cmake -G "Visual Studio 17 2022" -A arm64 . -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=OFF
-          cmake --build . --config Release --parallel
+          cmake -G "Visual Studio 17 2022" -A arm64 -S . -B build -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=OFF
+          cmake --build build --config Release --parallel
 
       - name: Verify Build Artifacts
         if: always()
+        continue-on-error: true
         run: |
           Get-ChildItem -Path $env:GITHUB_WORKSPACE\Release -Recurse
+          Get-ChildItem -Path $env:GITHUB_WORKSPACE\test\Release -Recurse
+
+      - name: Run tests
+        run: |
+          .\build\test\Release\unit_tests.exe
 
       - name: Upload Build Artifacts
         uses: actions/upload-artifact@v3

.github/workflows/win-cpu-x64-build.yml

@@ -16,13 +16,16 @@ env:
   ort_url: "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/$(ort_zip)"
 
 jobs:
-  job:
-    runs-on: ["self-hosted", "1ES.Pool=onnxruntime-genai-Win2022-CPU"]
+  windows-cpu-x64-build:
+    runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Win2022-CPU" ]
     permissions:
       security-events: write
       actions: read
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout OnnxRuntime GenAI repo
+        uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Setup Visual Studio 2022
         uses: microsoft/[email protected]
@@ -43,24 +46,26 @@ jobs:
         run: |
           Rename-Item -Path $env:ort_dir -NewName ort
 
-      - name: Git Submodule Update
-        run: |
-          git submodule update --init --recursive
-
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: 'cpp'
 
       - name: Build with CMake
         run: |
-          cmake -G "Visual Studio 17 2022" -A x64 . -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=OFF
-          cmake --build . --config Release --parallel
+          cmake -G "Visual Studio 17 2022" -A x64 -S . -B build -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=OFF
+          cmake --build build --config Release --parallel
 
       - name: Verify Build Artifacts
         if: always()
+        continue-on-error: true
+        run: |
+          Get-ChildItem -Path $env:GITHUB_WORKSPACE\build\Release -Recurse
+          Get-ChildItem -Path $env:GITHUB_WORKSPACE\build\test\Release -Recurse
+
+      - name: Run tests
         run: |
-          Get-ChildItem -Path $env:GITHUB_WORKSPACE\Release -Recurse
+          .\build\test\Release\unit_tests.exe
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

.github/workflows/win-gpu-x64-build.yml

@@ -15,12 +15,14 @@ env:
   cuda_version: "12.2"
 
 jobs:
-  Windows-CUDA-12-Build:
+  windows-gpu-x64-build:
     runs-on: [ "self-hosted", "1ES.Pool=onnxruntime-genai-Win2022-GPU-A10" ]
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout OnnxRuntime GenAI repo
+        uses: actions/checkout@v4
         with:
-          submodules: false
+          submodules: true
+
       - uses: actions/setup-python@v5
         with:
           python-version: '3.11.x'
@@ -42,21 +44,22 @@ jobs:
         run: |
           Rename-Item -Path $env:ort_dir -NewName ort
 
-      - name: Git Submodule Update
-        run: |
-          git submodule update --init --recursive
-
       - name: Build with CMake
         run: |
-          mkdir build
-          cd build
-          cmake -G "Visual Studio 17 2022" -A x64 -T cuda=${{ env.cuda_dir }}\\v${{ env.cuda_version }} .. -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=TRUE
-          cmake --build . --config Release --parallel
+          cmake -G "Visual Studio 17 2022" -S . -B build -A x64 -T cuda=${{ env.cuda_dir }}\\v${{ env.cuda_version }} -DCMAKE_BUILD_TYPE=Release -DUSE_CUDA=TRUE
+          cmake --build build --config Release --parallel
 
       - name: Verify Build Artifacts
         if: always()
+        continue-on-error: true
+        run: |
+          Get-ChildItem -Path $env:GITHUB_WORKSPACE\build\test\Release -Recurse
+
+      - name: Prepend CUDA to PATH and Run tests
         run: |
-          Get-ChildItem -Path $env:GITHUB_WORKSPACE\build\Release -Recurse
+          $env:PATH = "${{ env.cuda_dir }}\\v${{ env.cuda_version }}\\bin;" + $env:PATH 
+          echo "Current PATH variable is: $env:PATH" 
+          .\build\test\Release\unit_tests.exe
 
       - name: Upload Build Artifacts
         uses: actions/upload-artifact@v3

test/CMakeLists.txt

@@ -6,7 +6,13 @@ file(GLOB test_srcs CONFIGURE_DEPENDS
 )
 
 # google unit test
-add_executable(unit_tests main.cpp c_api.cpp tests.cpp sampling_benchmark.cpp sampling_tests.cpp)
+add_executable(unit_tests
+  main.cpp
+  c_api_tests.cpp
+  model_tests.cpp
+  sampling_tests.cpp
+  sampling_benchmark.cpp
+)
 target_include_directories(unit_tests PRIVATE
   ${ORT_HEADER_DIR}
   ${CMAKE_SOURCE_DIR}/src
@@ -34,8 +40,15 @@ else()
   target_include_directories(unit_tests PRIVATE ${TOKENIZER_ROOT})
   target_link_libraries(unit_tests PRIVATE tokenizer)
 endif()
+file(GLOB onnxruntime_libs "${ORT_LIB_DIR}/${ONNXRUNTIME_FILES}")
+set(TEST_MODEL_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/test_models/"  "${CMAKE_SOURCE_DIR}/examples/")
+set(TEST_MODEL_DES_DIR "$<TARGET_FILE_DIR:unit_tests>/test_models/")
+add_custom_command(TARGET unit_tests POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${TEST_MODEL_SRC_DIR} ${TEST_MODEL_DES_DIR}
+  COMMAND ${CMAKE_COMMAND} -E copy ${onnxruntime_libs} $<TARGET_FILE_DIR:unit_tests>
+)
 
+add_compile_definitions(MODEL_PATH="${TEST_MODEL_DES_DIR}")
 source_group("Sources" FILES ${test_srcs})
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT unit_tests)
-#set_property(TARGET unit_tests PROPERTY TARGET_RUNTIME_LIBRARY_DIRS ${ORT_LIB_DIR})
 include(GoogleTest)