Disable experimental ONNX support to make release package smaller.

dje-dev · Jul 5, 2021 · 2c326f6 · 2c326f6
1 parent 13519cc
commit 2c326f6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/src/Ceres.Base/Ceres.Base.csproj b/src/Ceres.Base/Ceres.Base.csproj
@@ -35,7 +35,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.EventSource" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.7.1" />
 
 
     <PackageReference Include="protobuf-net" Version="3.0.29" />

diff --git a/src/Ceres.Chess/Ceres.Chess.csproj b/src/Ceres.Chess/Ceres.Chess.csproj
@@ -16,6 +16,13 @@
     <OutputPath>..\..\artifacts\release</OutputPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="LC0\LC0NetInference\NetExecutorONNXRuntime.cs" />
+    <Compile Remove="LC0\LC0NetInference\ONNXRuntimeExecutor.cs" />
+    <Compile Remove="LC0\LC0NetInference\ONNXRuntimeExecutorResultBatch.cs" />
+    <Compile Remove="NNEvaluators\Base\NNEvaluatorEngineONNX.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="NNBackends\CUDA\Kernels\CU\ceres_kernels.cu" />
     <EmbeddedResource Include="NNBackends\CUDA\Kernels\CU\common_kernels.cu" />
@@ -35,6 +42,13 @@
     <Folder Include="TBBackends\Fathom\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="LC0\LC0NetInference\NetExecutorONNXRuntime.cs" />
+    <None Include="LC0\LC0NetInference\ONNXRuntimeExecutor.cs" />
+    <None Include="LC0\LC0NetInference\ONNXRuntimeExecutorResultBatch.cs" />
+    <None Include="NNEvaluators\Base\NNEvaluatorEngineONNX.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.13.0" />
     <PackageReference Include="Google.Protobuf.Tools" Version="3.13.0" />

diff --git a/src/Ceres.Chess/NNEvaluators/NNEvaluatorFactory.cs b/src/Ceres.Chess/NNEvaluators/NNEvaluatorFactory.cs
@@ -22,7 +22,6 @@ You should have received a copy of the GNU General Public License
 using Ceres.Chess.NNFiles;
 using System.Collections.Generic;
 using Chess.Ceres.NNEvaluators.TensorRT;
-using Ceres.Chess.LC0NetInference;
 using Ceres.Chess.UserSettings;
 using Ceres.Chess.NNEvaluators.CUDA;
 using Ceres.Chess.LC0.NNFiles;
@@ -184,13 +183,16 @@ static NNEvaluator Singleton(NNEvaluatorNetDef netDef, NNEvaluatorDeviceDef devi
 
         case NNEvaluatorType.ONNX:
           {
+            throw new NotImplementedException();
+#if NOT
             // TODO: fill these in properly
             string fn = @$"d:\weights\lczero.org\{netDef.NetworkID}.onnx";
             bool isWDL = true;
             bool hasMLH =  false; // TODO: fix. Eventually put in netDef
             ret = new NNEvaluatorEngineONNX(netDef.NetworkID, fn, deviceDef.DeviceIndex,
                                             ONNXRuntimeExecutor.NetTypeEnum.LC0, 1024, netDef.Precision, isWDL, hasMLH);
             break;
+#endif
           }
 
         case NNEvaluatorType.Custom1:

diff --git a/src/Ceres/APIExamples/TournamentTest.cs b/src/Ceres/APIExamples/TournamentTest.cs
@@ -36,7 +36,6 @@ You should have received a copy of the GNU General Public License
 using Ceres.Base.Math;
 using Ceres.Base.Misc;
 using Ceres.Base.DataType;
-using Microsoft.ML.OnnxRuntime;
 using Ceres.Base.OperatingSystem;
 
 #endregion