Skip to content

Commit

Permalink
Added dependency checker, added embedded python support & downloader
Browse files Browse the repository at this point in the history
  • Loading branch information
N00MKRAD committed Oct 15, 2020
1 parent c5af13b commit 4ed5b9d
Show file tree
Hide file tree
Showing 25 changed files with 1,215 additions and 77 deletions.
342 changes: 342 additions & 0 deletions Code/Forms/DependencyCheckerForm.Designer.cs
View file

Large diffs are not rendered by default.

230 changes: 230 additions & 0 deletions Code/Forms/DependencyCheckerForm.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
using Cupscale.OS;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Cupscale.Forms
{
public partial class DependencyCheckerForm : Form
{
public DependencyCheckerForm(bool openInstaller = false)
{
InitializeComponent();
if (openInstaller)
tabList1.SelectedIndex = 1;
}

private async void DependencyCheckerForm_Load(object sender, EventArgs e)
{
//await Task.Delay(200);
//await Refresh();
}

public async Task Refresh ()
{
string gpuName = NvApi.GetGpuName().Replace("GeForce ", "");
if (!string.IsNullOrWhiteSpace(gpuName))
{
nvGpu.Text = gpuName;
nvGpu.ForeColor = Color.Lime;
}

await Task.Delay(10);

string sysPyVer = GetSysPyVersion();
if (!string.IsNullOrWhiteSpace(sysPyVer) && !sysPyVer.ToLower().Contains("not found") && sysPyVer.Length <= 35)
{
sysPython.Text = sysPyVer;
sysPython.ForeColor = Color.Lime;
}
else
{
SetToNotFound(sysPython);
}

await Task.Delay(10);

string embedPyVer = GetEmbedPyVersion();
if (!string.IsNullOrWhiteSpace(embedPyVer) && !embedPyVer.ToLower().Contains("not found") && embedPyVer.Length <= 35)
{
embedPython.Text = embedPyVer;
embedPython.ForeColor = Color.Lime;
}
else
{
SetToNotFound(embedPython);
}

await Task.Delay(10);

string torchVer = GetPytorchVer();
if (!string.IsNullOrWhiteSpace(torchVer) && torchVer.Length <= 35)
{
torch.Text = torchVer;
torch.ForeColor = Color.Lime;
}
else
{
SetToNotFound(torch);
}

await Task.Delay(10);

string cv2Ver = GetOpenCvVer();
if (!string.IsNullOrWhiteSpace(cv2Ver) && !cv2Ver.ToLower().Contains("ModuleNotFoundError") && cv2Ver.Length <= 35)
{
cv2.Text = cv2Ver;
cv2.ForeColor = Color.Lime;
}
else
{
SetToNotFound(cv2);
}
}

void SetToNotFound (Label l)
{
l.Text = "Not Found";
l.ForeColor = Color.Red;
}

string GetSysPyVersion ()
{
string pythonOut = GetSysPythonOutput();
try
{
string ver = pythonOut.Split('(')[0].Trim();
return ver;
}
catch
{
return "";
}
}

string GetEmbedPyVersion()
{
string pythonOut = GetEmbedPythonOutput();
try
{
string ver = pythonOut.Split('(')[0].Trim();
return ver;
}
catch
{
return "";
}
}

string GetSysPythonOutput ()
{
Process py = new Process();
py.StartInfo.UseShellExecute = false;
py.StartInfo.RedirectStandardOutput = true;
py.StartInfo.RedirectStandardError = true;
py.StartInfo.CreateNoWindow = true;
py.StartInfo.FileName = "cmd.exe";
py.StartInfo.Arguments = "/C python -V";
py.Start();
py.WaitForExit();
string output = py.StandardOutput.ReadToEnd();
string err = py.StandardError.ReadToEnd();
return output + "\n" + err;
}

string GetEmbedPythonOutput ()
{
Process py = new Process();
py.StartInfo.UseShellExecute = false;
py.StartInfo.RedirectStandardOutput = true;
py.StartInfo.RedirectStandardError = true;
py.StartInfo.CreateNoWindow = true;
py.StartInfo.FileName = "cmd.exe";
py.StartInfo.Arguments = "/C " + EmbeddedPython.GetPyPath() + " -V";
py.Start();
py.WaitForExit();
string output = py.StandardOutput.ReadToEnd();
string err = py.StandardError.ReadToEnd();
return output + "\n" + err;
}

string GetPytorchVer ()
{
try
{
Process py = new Process();
py.StartInfo.UseShellExecute = false;
py.StartInfo.RedirectStandardOutput = true;
py.StartInfo.RedirectStandardError = true;
py.StartInfo.CreateNoWindow = true;
py.StartInfo.FileName = "cmd.exe";
if (embedPython.Enabled)
py.StartInfo.Arguments = "/C " + EmbeddedPython.GetPyPath() + " -c \"import torch; print(torch.__version__)\"";
else
py.StartInfo.Arguments = "/C python -c \"import torch; print(torch.__version__)\"";
py.Start();
py.WaitForExit();
string output = py.StandardOutput.ReadToEnd();
string err = py.StandardError.ReadToEnd();
return output + "\n" + err;
}
catch
{
return "";
}
}

string GetOpenCvVer()
{
try
{
Process py = new Process();
py.StartInfo.UseShellExecute = false;
py.StartInfo.RedirectStandardOutput = true;
py.StartInfo.RedirectStandardError = true;
py.StartInfo.CreateNoWindow = true;
py.StartInfo.FileName = "cmd.exe";
if (embedPython.Enabled)
py.StartInfo.Arguments = "/C " + EmbeddedPython.GetPyPath() + " -c \"import cv2; print(cv2.__version__)\"";
else
py.StartInfo.Arguments = "/C python -c \"import cv2; print(cv2.__version__)\"";
py.Start();
py.WaitForExit();
string output = py.StandardOutput.ReadToEnd();
string err = py.StandardError.ReadToEnd();
return output + "\n" + err;
}
catch
{
return "";
}
}

private async void label8_VisibleChanged(object sender, EventArgs e)
{
if (!label8.Visible)
return;
await Task.Delay(100);
await Refresh();
}

private async void installBtn_Click(object sender, EventArgs e)
{
await EmbeddedPython.Download(installerLogBox, installBtn);
}

private void DependencyCheckerForm_FormClosing(object sender, FormClosingEventArgs e)
{
if(!installBtn.Enabled)
e.Cancel = true;
}
}
}
124 changes: 124 additions & 0 deletions Code/Forms/DependencyCheckerForm.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="label7.Text" xml:space="preserve">
<value>Only one Python runtime is needed, so don't worry if one of them was not found.
If you don't have a Python installation, either install it normally or see the second page on the left to download an embedded version.</value>
</data>
</root>
8 changes: 4 additions & 4 deletions Code/Forms/ModelComparisonForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ private async void runBtn_Click(object sender, EventArgs e)
{
if(MainUIHelper.previewImg.Image == null || !File.Exists(Paths.tempImgPath))
{
MessageBox.Show("No image loaded!", "Error");
Program.ShowMessage("No image loaded!", "Error");
return;
}
Enabled = false;
Expand Down Expand Up @@ -101,7 +101,7 @@ private async void runBtn_Click(object sender, EventArgs e)
await Upscale.CopyImagesTo(Program.lastFilename.GetParentDir());
IOUtils.ClearDir(Paths.previewPath);
Enabled = true;
MessageBox.Show("Saved model composition to " + Program.lastFilename.GetParentDir() + "\\" + Path.GetFileName(mergedPath), "Message");
Program.ShowMessage("Saved model composition to " + Program.lastFilename.GetParentDir() + "\\" + Path.GetFileName(mergedPath), "Message");
}

static ImageProcessing.Format GetSaveFormat()
Expand All @@ -128,7 +128,7 @@ async Task DoUpscale (int index, ModelData mdl, bool fullImage)
{
if (MainUIHelper.previewImg.Image == null)
{
MessageBox.Show("Please load an image first!", "Error");
Program.ShowMessage("Please load an image first!", "Error");
return;
}
Program.mainForm.SetBusy(true);
Expand Down Expand Up @@ -159,7 +159,7 @@ async Task DoUpscale (int index, ModelData mdl, bool fullImage)
catch (Exception e)
{
if (e.StackTrace.Contains("Index"))
MessageBox.Show("The upscale process seems to have exited before completion!", "Error");
Program.ShowMessage("The upscale process seems to have exited before completion!", "Error");
Logger.ErrorMessage("An error occured during upscaling:", e);
Program.mainForm.SetProgress(0f, "Cancelled.");
}
Expand Down
Loading

0 comments on commit 4ed5b9d

Please sign in to comment.