Fix C# phi-2 test (#1050)

The C# phi-2 test was skipped due to the wrong model path. This PR intends to fix it.
microsoft · Nov 21, 2024 · 6bb21e7 · 6bb21e7
1 parent 0ae77b4
commit 6bb21e7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/linux-cpu-x64-build.yml b/.github/workflows/linux-cpu-x64-build.yml
@@ -94,7 +94,7 @@ jobs:
         run: |
           export ORTGENAI_LOG_ORT_LIB=1
           cd test/csharp
-          dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/cpu/" /p:OrtLibDir="../../ort/lib/"
+          dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/cpu/" /p:OrtLibDir="../../ort/lib/" --verbosity normal
 
       - name: Run tests
         run: |

diff --git a/.github/workflows/mac-cpu-arm64-build.yml b/.github/workflows/mac-cpu-arm64-build.yml
@@ -82,7 +82,7 @@ jobs:
         run: |
           export ORTGENAI_LOG_ORT_LIB=1
           cd test/csharp
-          dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/cpu/osx-arm64"
+          dotnet test /p:Configuration=Release /p:NativeBuildOutputDir="../../build/cpu/osx-arm64" --verbosity normal
 
       - name: Run tests
         run: |

diff --git a/.github/workflows/win-cpu-x64-build.yml b/.github/workflows/win-cpu-x64-build.yml
@@ -90,7 +90,7 @@ jobs:
     - name: Build the C# API and Run the C# Tests
       run: |
         cd test\csharp
-        dotnet test /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Release" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib"
+        dotnet test /p:NativeBuildOutputDir="$env:GITHUB_WORKSPACE\$env:binaryDir\Release" /p:OrtLibDir="$env:GITHUB_WORKSPACE\ort\lib" --verbosity normal
 
     - name: Verify Build Artifacts
       if: always()

diff --git a/test/csharp/TestOnnxRuntimeGenAIAPI.cs b/test/csharp/TestOnnxRuntimeGenAIAPI.cs
@@ -5,28 +5,24 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.ML.OnnxRuntimeGenAI.Tests
 {
-    public class TestsFixture : IDisposable
+    public class OnnxRuntimeGenAITests
     {
-        private OgaHandle _handle;
-        public TestsFixture()
-        {
-            _handle = new OgaHandle();
-        }
+        private readonly ITestOutputHelper output;
 
-        public void Dispose()
+        // From https://stackoverflow.com/a/47841442
+        private static string GetThisFilePath([CallerFilePath] string path = null)
         {
-            _handle.Dispose();
+            return path;
         }
-    }
 
-    public class OnnxRuntimeGenAITests : IClassFixture<TestsFixture>
-    {
-        private readonly ITestOutputHelper output;
+        private static readonly string _phi2Path = Path.GetFullPath(Path.Combine(
+            GetThisFilePath(),"../..", "test_models", "phi-2", "int4", "cpu"));
 
         public OnnxRuntimeGenAITests(ITestOutputHelper o)
         {
@@ -37,7 +33,7 @@ private class IgnoreOnModelAbsenceFact : FactAttribute
         {
             public IgnoreOnModelAbsenceFact()
             {
-                string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+                string modelPath = _phi2Path;
                 bool exists = System.IO.Directory.Exists(modelPath);
                 if (!System.IO.Directory.Exists(modelPath))
                 {
@@ -125,7 +121,7 @@ public void TestTopKSearch()
             float temp = 0.6f;
             ulong maxLength = 20;
 
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);
@@ -167,7 +163,7 @@ public void TestTopPSearch()
             float temp = 0.6f;
             ulong maxLength = 20;
 
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);
@@ -210,7 +206,7 @@ public void TestTopKTopPSearch()
             float temp = 0.6f;
             ulong maxLength = 20;
 
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);
@@ -249,7 +245,7 @@ public void TestTopKTopPSearch()
         [IgnoreOnModelAbsenceFact(DisplayName = "TestTokenizerBatchEncodeDecode")]
         public void TestTokenizerBatchEncodeDecode()
         {
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);
@@ -278,7 +274,7 @@ public void TestTokenizerBatchEncodeDecode()
         [IgnoreOnModelAbsenceFact(DisplayName = "TestTokenizerBatchEncodeSingleDecode")]
         public void TestTokenizerBatchEncodeSingleDecode()
         {
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);
@@ -309,7 +305,7 @@ public void TestTokenizerBatchEncodeSingleDecode()
         [IgnoreOnModelAbsenceFact(DisplayName = "TestTokenizerBatchEncodeStreamDecode")]
         public void TestTokenizerBatchEncodeStreamDecode()
         {
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);
@@ -345,7 +341,7 @@ public void TestTokenizerBatchEncodeStreamDecode()
         [IgnoreOnModelAbsenceFact(DisplayName = "TestTokenizerSingleEncodeDecode")]
         public void TestTokenizerSingleEncodeDecode()
         {
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);
@@ -369,7 +365,7 @@ public void TestTokenizerSingleEncodeDecode()
         [IgnoreOnModelAbsenceFact(DisplayName = "TestPhi2")]
         public void TestPhi2()
         {
-            string modelPath = Path.Combine(Directory.GetCurrentDirectory(), "test_models", "cpu", "phi-2");
+            string modelPath = _phi2Path;
             using (var model = new Model(modelPath))
             {
                 Assert.NotNull(model);