From e66d0ccadc34f821942e3bd851398e611553b0d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Zaragoza=20Cort=C3=A9s?=
 <cesar.zaragoza@outlook.com>
Date: Thu, 7 Apr 2022 10:33:08 -0700
Subject: [PATCH 1/2] Extend submitter factory.

---
 src/Azure/Azure.Quantum.Client/SubmitterFactory.cs | 10 +++++++++-
 src/Simulation/EntryPointDriver/Azure/Azure.cs     |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Azure/Azure.Quantum.Client/SubmitterFactory.cs b/src/Azure/Azure.Quantum.Client/SubmitterFactory.cs
index 38698d85423..d5920c2d10e 100644
--- a/src/Azure/Azure.Quantum.Client/SubmitterFactory.cs
+++ b/src/Azure/Azure.Quantum.Client/SubmitterFactory.cs
@@ -23,8 +23,16 @@ public static class SubmitterFactory
         /// </summary>
         private static readonly ImmutableList<SubmitterInfo> QirSubmitters = ImmutableList.Create(
             new SubmitterInfo(
-                new Regex(@"\Amicrosoft\.simulator\.([\w]+\.)*[\w]+\z"),
+                new Regex(@"\Amicrosoft\.simulator\.([\w-_]+\.)*[\w-_]+\z"),
                 "Microsoft.Quantum.Providers.Targets.MicrosoftSimulatorSubmitter, Microsoft.Quantum.Providers.Core",
+                "QirSubmitter"),
+            new SubmitterInfo(
+                new Regex(@"\Aquantinuum\.([\w-_]+\.)*[\w-_]+\z"),
+                "Microsoft.Quantum.Providers.Quantinuum.Targets.QuantinuumQirSubmitter, Microsoft.Quantum.Providers.Honeywell",
+                "QirSubmitter"),
+            new SubmitterInfo(
+                new Regex(@"\Aqci\.([\w-_]+\.)*[\w-_]+\z"),
+                "Microsoft.Quantum.Providers.QCI.Targets.QCIQirSubmitter, Microsoft.Quantum.Providers.QCI",
                 "QirSubmitter"));
 
         private static readonly ImmutableList<SubmitterInfo> QirPayloadGenerators = ImmutableList.Create(
diff --git a/src/Simulation/EntryPointDriver/Azure/Azure.cs b/src/Simulation/EntryPointDriver/Azure/Azure.cs
index 21b0f931aa6..f7636dc6c5b 100644
--- a/src/Simulation/EntryPointDriver/Azure/Azure.cs
+++ b/src/Simulation/EntryPointDriver/Azure/Azure.cs
@@ -68,7 +68,7 @@ public static Task<int> Submit<TIn, TOut>(
             AzureSettings settings, QSharpSubmission<TIn, TOut> qsSubmission, QirSubmission? qirSubmission)
         {
             LogIfVerbose(settings, settings.ToString());
-
+            LogIfVerbose(settings, $"QIR submission is {((qirSubmission is null) ? "not " : string.Empty)}present.");
             if ((settings.Location is null) && (settings.BaseUri is null))
             {
                 DisplayError($"Either --location or --base-uri must be provided.", null);
@@ -78,16 +78,19 @@ public static Task<int> Submit<TIn, TOut>(
             {
                 return SubmitQir(settings, qirSubmitter, qirSubmission);
             }
+            LogIfVerbose(settings, "QIR submitter not found.");
 
             if (QSharpSubmitter(settings) is { } qsSubmitter)
             {
                 return SubmitQSharp(settings, qsSubmitter, qsSubmission);
             }
+            LogIfVerbose(settings, "Q# submitter not found.");
 
             if (QSharpMachine(settings) is { } machine)
             {
                 return SubmitQSharpMachine(settings, machine, qsSubmission);
             }
+            LogIfVerbose(settings, "Q# machine not found.");
 
             if (qirSubmission is null && !(QirSubmitter(settings) is null))
             {

From b9a3aa94d30e190f12ae02142c81afcf50960ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Zaragoza=20Cort=C3=A9s?=
 <cesar.zaragoza@outlook.com>
Date: Mon, 11 Apr 2022 08:34:48 -0700
Subject: [PATCH 2/2] Remove logging.

---
 src/Simulation/EntryPointDriver/Azure/Azure.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Simulation/EntryPointDriver/Azure/Azure.cs b/src/Simulation/EntryPointDriver/Azure/Azure.cs
index f7636dc6c5b..21b0f931aa6 100644
--- a/src/Simulation/EntryPointDriver/Azure/Azure.cs
+++ b/src/Simulation/EntryPointDriver/Azure/Azure.cs
@@ -68,7 +68,7 @@ public static Task<int> Submit<TIn, TOut>(
             AzureSettings settings, QSharpSubmission<TIn, TOut> qsSubmission, QirSubmission? qirSubmission)
         {
             LogIfVerbose(settings, settings.ToString());
-            LogIfVerbose(settings, $"QIR submission is {((qirSubmission is null) ? "not " : string.Empty)}present.");
+
             if ((settings.Location is null) && (settings.BaseUri is null))
             {
                 DisplayError($"Either --location or --base-uri must be provided.", null);
@@ -78,19 +78,16 @@ public static Task<int> Submit<TIn, TOut>(
             {
                 return SubmitQir(settings, qirSubmitter, qirSubmission);
             }
-            LogIfVerbose(settings, "QIR submitter not found.");
 
             if (QSharpSubmitter(settings) is { } qsSubmitter)
             {
                 return SubmitQSharp(settings, qsSubmitter, qsSubmission);
             }
-            LogIfVerbose(settings, "Q# submitter not found.");
 
             if (QSharpMachine(settings) is { } machine)
             {
                 return SubmitQSharpMachine(settings, machine, qsSubmission);
             }
-            LogIfVerbose(settings, "Q# machine not found.");
 
             if (qirSubmission is null && !(QirSubmitter(settings) is null))
             {