mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-10-27 00:21:06 -04:00
refactor(desktop): stop shipping the unused GPU evaluator
The GPU hooks in MainForm were commented out, so ILGPU only powered a status-bar label that reported a GPU device the nesting never used. Removing the reference drops OpenNest.Gpu and ILGPU from the desktop output. The GPU kernel tests reference OpenNest.Gpu directly; Training still uses it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
90a6d9e4d2
commit
7600d75f41
4 files changed
+3
-34
No files matched your search
@@ -15,6 +15,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\OpenNest\OpenNest.csproj" />
|
||||
<ProjectReference Include="..\OpenNest.Gpu\OpenNest.Gpu.csproj" />
|
||||
<Content Include="Fixtures\absolute-coordinate-parts.nest" CopyToOutputDirectory="PreserveNewest" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Generated
+1
-10
@@ -168,7 +168,6 @@ namespace OpenNest.Forms
|
||||
plateSizeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||
plateQtyStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||
plateUtilStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||
gpuStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||
selectionStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
|
||||
toolStrip1 = new System.Windows.Forms.ToolStrip();
|
||||
btnNew = new System.Windows.Forms.ToolStripButton();
|
||||
@@ -1071,7 +1070,7 @@ namespace OpenNest.Forms
|
||||
//
|
||||
// statusStrip1
|
||||
//
|
||||
statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { statusLabel1, locationStatusLabel, selectionStatusLabel, spacerLabel, plateIndexStatusLabel, plateSizeStatusLabel, plateQtyStatusLabel, plateUtilStatusLabel, gpuStatusLabel });
|
||||
statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { statusLabel1, locationStatusLabel, selectionStatusLabel, spacerLabel, plateIndexStatusLabel, plateSizeStatusLabel, plateQtyStatusLabel, plateUtilStatusLabel });
|
||||
statusStrip1.Location = new System.Drawing.Point(0, 630);
|
||||
statusStrip1.Name = "statusStrip1";
|
||||
statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
|
||||
@@ -1139,13 +1138,6 @@ namespace OpenNest.Forms
|
||||
plateUtilStatusLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
|
||||
plateUtilStatusLabel.Size = new System.Drawing.Size(75, 19);
|
||||
plateUtilStatusLabel.Text = "Util : 0.0%";
|
||||
//
|
||||
// gpuStatusLabel
|
||||
//
|
||||
gpuStatusLabel.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left;
|
||||
gpuStatusLabel.Name = "gpuStatusLabel";
|
||||
gpuStatusLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
|
||||
gpuStatusLabel.Size = new System.Drawing.Size(14, 19);
|
||||
//
|
||||
// toolStrip1
|
||||
//
|
||||
@@ -1430,7 +1422,6 @@ namespace OpenNest.Forms
|
||||
private System.Windows.Forms.ToolStripMenuItem mnuPlateExpandSpacing;
|
||||
private System.Windows.Forms.ToolStripButton btnSaveAs;
|
||||
private System.Windows.Forms.ToolStripMenuItem centerPartsToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripStatusLabel gpuStatusLabel;
|
||||
private System.Windows.Forms.ToolStripStatusLabel selectionStatusLabel;
|
||||
private System.Windows.Forms.ToolStripLabel engineLabel;
|
||||
private System.Windows.Forms.ToolStripComboBox engineComboBox;
|
||||
|
||||
@@ -19,7 +19,6 @@ using OpenNest.Engine.Jobs;
|
||||
using OpenNest.Engine.Jobs.Adapters;
|
||||
using OpenNest.Engine.Jobs.Placement;
|
||||
using OpenNest.Geometry;
|
||||
using OpenNest.Gpu;
|
||||
using OpenNest.IO;
|
||||
using OpenNest.Properties;
|
||||
|
||||
@@ -136,13 +135,6 @@ namespace OpenNest.Forms
|
||||
LoadPosts();
|
||||
EnableCheck();
|
||||
UpdateStatus();
|
||||
UpdateGpuStatus();
|
||||
|
||||
//if (GpuEvaluatorFactory.GpuAvailable)
|
||||
// BestFitCache.CreateEvaluator = (drawing, spacing) => GpuEvaluatorFactory.Create(drawing, spacing);
|
||||
|
||||
//if (GpuEvaluatorFactory.GpuAvailable)
|
||||
// BestFitCache.CreateSlideComputer = () => GpuEvaluatorFactory.CreateSlideComputer();
|
||||
|
||||
// Jobs-side plug-in discovery: INestingEngine implementations are registered per
|
||||
// assembly/type with per-DLL isolation. Existing plug-ins must implement the jobs
|
||||
@@ -197,7 +189,7 @@ namespace OpenNest.Forms
|
||||
if (result == DialogResult.Yes)
|
||||
updater.ApplyAndRestart();
|
||||
};
|
||||
statusStrip1.Items.Insert(statusStrip1.Items.IndexOf(gpuStatusLabel), updateStatusLabel);
|
||||
statusStrip1.Items.Add(updateStatusLabel);
|
||||
|
||||
updater = new global::OpenNest.UpdaterService();
|
||||
updater.UpdateReady += version =>
|
||||
@@ -523,20 +515,6 @@ namespace OpenNest.Forms
|
||||
UpdateSelectionStatus();
|
||||
}
|
||||
|
||||
private void UpdateGpuStatus()
|
||||
{
|
||||
if (GpuEvaluatorFactory.GpuAvailable)
|
||||
{
|
||||
gpuStatusLabel.Text = $"GPU : {GpuEvaluatorFactory.DeviceName}";
|
||||
gpuStatusLabel.ForeColor = Color.DarkGreen;
|
||||
}
|
||||
else
|
||||
{
|
||||
gpuStatusLabel.Text = "GPU : None (CPU)";
|
||||
gpuStatusLabel.ForeColor = Color.Gray;
|
||||
}
|
||||
}
|
||||
|
||||
private void EngineComboBox_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (engineComboBox.SelectedItem is string name)
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
<ProjectReference Include="..\OpenNest.Core\OpenNest.Core.csproj" />
|
||||
<ProjectReference Include="..\OpenNest.Data\OpenNest.Data.csproj" />
|
||||
<ProjectReference Include="..\OpenNest.Engine\OpenNest.Engine.csproj" />
|
||||
<ProjectReference Include="..\OpenNest.Gpu\OpenNest.Gpu.csproj" />
|
||||
<ProjectReference Include="..\OpenNest.IO\OpenNest.IO.csproj" />
|
||||
<ProjectReference Include="..\OpenNest.Reporting\OpenNest.Reporting.csproj" />
|
||||
<ProjectReference Include="..\Posts\OpenNest.Posts.Cincinnati\OpenNest.Posts.Cincinnati.csproj" ReferenceOutputAssembly="false" />
|
||||
|
||||
Reference in new issue
Block a user