Merge a9c5a2d into e19947a

compiler/qsc/src/codegen/tests.rs

@@ -393,7 +393,7 @@ mod adaptive_profile {
     }
 }
 
-mod quantinuum_profile {
+mod adaptive_ri_profile {
     use expect_test::expect;
     use qsc_data_structures::{language_features::LanguageFeatures, target::TargetCapabilityFlags};
     use qsc_frontend::compile::SourceMap;

compiler/qsc/src/target.rs

@@ -9,7 +9,7 @@ use qsc_data_structures::target::TargetCapabilityFlags;
 pub enum Profile {
     Unrestricted,
     Base,
-    Quantinuum,
+    AdaptiveRI,
 }
 
 impl Profile {
@@ -18,7 +18,7 @@ impl Profile {
         match self {
             Self::Unrestricted => "Unrestricted",
             Self::Base => "Base",
-            Self::Quantinuum => "Quantinuum",
+            Self::AdaptiveRI => "Adaptive_RI",
         }
     }
 }
@@ -28,7 +28,7 @@ impl From<Profile> for TargetCapabilityFlags {
         match value {
             Profile::Unrestricted => Self::all(),
             Profile::Base => Self::empty(),
-            Profile::Quantinuum => Self::Adaptive | Self::IntegerComputations | Self::QubitReset,
+            Profile::AdaptiveRI => Self::Adaptive | Self::QubitReset | Self::IntegerComputations,
         }
     }
 }
@@ -38,7 +38,7 @@ impl FromStr for Profile {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "Quantinuum" | "quantinuum" => Ok(Self::Quantinuum),
+            "Adaptive_RI" | "adaptive_ri" => Ok(Self::AdaptiveRI),
             "Base" | "base" => Ok(Self::Base),
             "Unrestricted" | "unrestricted" => Ok(Self::Unrestricted),
             _ => Err(()),

language_service/src/state/tests.rs

@@ -311,7 +311,7 @@ async fn rca_errors_are_reported_when_compilation_succeeds() {
     let mut updater = new_updater(&errors);
 
     updater.update_configuration(WorkspaceConfigurationUpdate {
-        target_profile: Some(Profile::Quantinuum),
+        target_profile: Some(Profile::AdaptiveRI),
         package_type: Some(PackageType::Lib),
     });
 

npm/qsharp/src/compiler/compiler.ts

@@ -213,7 +213,7 @@ export class Compiler implements ICompiler {
     return this.wasm.get_ast(
       code,
       languageFeatures ?? [],
-      profile ?? "quantinuum",
+      profile ?? "adaptive_ri",
     );
   }
 
@@ -225,7 +225,7 @@ export class Compiler implements ICompiler {
     return this.wasm.get_hir(
       code,
       languageFeatures ?? [],
-      profile ?? "quantinuum",
+      profile ?? "adaptive_ri",
     );
   }
 

pip/qsharp/_native.pyi

@@ -20,9 +20,10 @@ class TargetProfile:
     This option maps to the Base Profile as defined by the QIR specification.
     """
 
-    Quantinuum: ClassVar[Any]
+    Adaptive_RI: ClassVar[Any]
     """
-    Target supports Quantinuum profile.
+    Target supports the Adaptive profile with integer computation and qubit
+    reset capabilities.
 
     This profile includes all of the required Adaptive Profile
     capabilities, as well as the optional integer computation and qubit

pip/qsharp/_qsharp.py

@@ -29,9 +29,9 @@ def __init__(
         language_features: Optional[List[str]],
         manifest: Optional[str],
     ):
-        if target_profile == TargetProfile.Quantinuum:
-            self._config = {"targetProfile": "quantinuum"}
-            warn("The Quantinuum target profile is a preview feature.")
+        if target_profile == TargetProfile.Adaptive_RI:
+            self._config = {"targetProfile": "adaptive_ri"}
+            warn("The Adaptive_RI target profile is a preview feature.")
             warn("Functionality may be incomplete or incorrect.")
         elif target_profile == TargetProfile.Base:
             self._config = {"targetProfile": "base"}

pip/src/interpreter.rs

@@ -47,6 +47,7 @@ fn _native(py: Python, m: &PyModule) -> PyResult<()> {
 // This ordering must match the _native.pyi file.
 #[derive(Clone, Copy)]
 #[pyclass(unsendable)]
+#[allow(non_camel_case_types)]
 /// A Q# target profile.
 ///
 /// A target profile describes the capabilities of the hardware or simulator
@@ -56,12 +57,12 @@ pub(crate) enum TargetProfile {
     ///
     /// This option maps to the Base Profile as defined by the QIR specification.
     Base,
-    /// Target supports Quantinuum profile.
+    /// Target supports the Adaptive profile with integer computation and qubit reset capabilities.
     ///
     /// This profile includes all of the required Adaptive Profile
     /// capabilities, as well as the optional integer computation and qubit
     /// reset capabilities, as defined by the QIR specification.
-    Quantinuum,
+    Adaptive_RI,
     /// Target supports the full set of capabilities required to run any Q# program.
     ///
     /// This option maps to the Full Profile as defined by the QIR specification.
@@ -114,7 +115,7 @@ impl Interpreter {
         list_directory: Option<PyObject>,
     ) -> PyResult<Self> {
         let target = match target {
-            TargetProfile::Quantinuum => Profile::Quantinuum,
+            TargetProfile::Adaptive_RI => Profile::AdaptiveRI,
             TargetProfile::Base => Profile::Base,
             TargetProfile::Unrestricted => Profile::Unrestricted,
         };

pip/tests/test_interpreter.py

@@ -274,7 +274,7 @@ def test_entry_expr_circuit() -> None:
 
 # this is by design
 def test_callables_failing_profile_validation_are_still_registered() -> None:
-    e = Interpreter(TargetProfile.Quantinuum)
+    e = Interpreter(TargetProfile.Adaptive_RI)
     with pytest.raises(Exception) as excinfo:
         e.interpret(
             "operation Foo() : Double { use q = Qubit(); mutable x = 1.0; if MResetZ(q) == One { set x = 2.0; } x }"
@@ -287,7 +287,7 @@ def test_callables_failing_profile_validation_are_still_registered() -> None:
 
 # this is by design
 def test_once_rca_validation_fails_following_calls_also_fail() -> None:
-    e = Interpreter(TargetProfile.Quantinuum)
+    e = Interpreter(TargetProfile.Adaptive_RI)
     with pytest.raises(Exception) as excinfo:
         e.interpret(
             "operation Foo() : Double { use q = Qubit(); mutable x = 1.0; if MResetZ(q) == One { set x = 2.0; } x }"
@@ -299,7 +299,7 @@ def test_once_rca_validation_fails_following_calls_also_fail() -> None:
 
 
 def test_adaptive_errors_are_raised_when_interpreting() -> None:
-    e = Interpreter(TargetProfile.Quantinuum)
+    e = Interpreter(TargetProfile.Adaptive_RI)
     with pytest.raises(Exception) as excinfo:
         e.interpret(
             "operation Foo() : Double { use q = Qubit(); mutable x = 1.0; if MResetZ(q) == One { set x = 2.0; } x }"
@@ -308,14 +308,14 @@ def test_adaptive_errors_are_raised_when_interpreting() -> None:
 
 
 def test_adaptive_errors_are_raised_from_entry_expr() -> None:
-    e = Interpreter(TargetProfile.Quantinuum)
+    e = Interpreter(TargetProfile.Adaptive_RI)
     e.interpret("use q = Qubit();")
     with pytest.raises(Exception) as excinfo:
         e.run("{mutable x = 1.0; if MResetZ(q) == One { set x = 2.0; }}")
     assert "Qsc.CapabilitiesCk.UseOfDynamicDouble" in str(excinfo)
 
 
-def test_quantinuum_qir_can_be_generated() -> None:
+def test_adaptive_ri_qir_can_be_generated() -> None:
     adaptive_input = """
         namespace Test {
             open Microsoft.Quantum.Math;
@@ -333,7 +333,7 @@ def test_quantinuum_qir_can_be_generated() -> None:
             }
         }
         """
-    e = Interpreter(TargetProfile.Quantinuum)
+    e = Interpreter(TargetProfile.Adaptive_RI)
     e.interpret(adaptive_input)
     qir = e.qir("Test.Main()")
     assert qir == dedent(

playground/src/editor.tsx

@@ -428,7 +428,7 @@ export function Editor(props: {
           <span>Profile</span>
           <select value={profile} onChange={profileChanged}>
             <option value="unrestricted">Unrestricted</option>
-            <option value="quantinuum">Quantinuum</option>
+            <option value="adaptive_ri">Adaptive RI</option>
             <option value="base">Base</option>
           </select>
         </>

vscode/package.json

@@ -102,12 +102,12 @@
           "enum": [
             "unrestricted",
             "base",
-            "quantinuum"
+            "adaptive_ri"
           ],
           "enumDescriptions": [
             "The set of all capabilities required to run any Q# program.",
             "The minimal set of capabilities required to run a quantum program. This option maps to the Base Profile as defined by the QIR specification.",
-            "The Quantinuum target profile includes all of the required Adaptive Profile capabilities, as well as the optional integer computation and qubit reset capabilities, as defined by the QIR specification."
+            "The Adaptive_RI target profile includes all of the required Adaptive Profile capabilities, as well as the optional integer computation and qubit reset capabilities, as defined by the QIR specification."
           ],
           "description": "Setting the target profile allows the Q# extension to generate programs that are compatible with a specific target. The target is the hardware or simulator which will be used to run the Q# program. The target profile is a description of a target's capabilities."
         },

vscode/src/config.ts

@@ -10,7 +10,7 @@ export function getTarget(): TargetProfile {
     .get<TargetProfile>("targetProfile", "unrestricted");
   switch (target) {
     case "base":
-    case "quantinuum":
+    case "adaptive_ri":
     case "unrestricted":
       return target;
     default:
@@ -32,8 +32,8 @@ export function getTargetFriendlyName(targetProfile?: string) {
   switch (targetProfile) {
     case "base":
       return "Q#: QIR base";
-    case "quantinuum":
-      return "Q#: QIR Quantinuum";
+    case "adaptive_ri":
+      return "Q#: QIR Adaptive RI";
     case "unrestricted":
       return "Q#: unrestricted";
     default:

vscode/src/extension.ts

@@ -316,7 +316,7 @@ async function updateLanguageServiceProfile(languageService: ILanguageService) {
 
   switch (targetProfile) {
     case "base":
-    case "quantinuum":
+    case "adaptive_ri":
     case "unrestricted":
       break;
     default:

vscode/src/qirGeneration.ts

@@ -34,7 +34,7 @@ export async function getQirForActiveWindow(): Promise<string> {
   const targetProfile = getTarget();
   const enablePreviewQirGen = getEnablePreviewQirGen();
   if (targetProfile !== "base") {
-    const allowed = targetProfile === "quantinuum" && enablePreviewQirGen;
+    const allowed = targetProfile === "adaptive_ri" && enablePreviewQirGen;
     if (!allowed) {
       const result = await vscode.window.showWarningMessage(
         "Submitting to Azure is only supported when targeting the QIR base profile.",

vscode/src/statusbar.ts

@@ -101,20 +101,20 @@ function registerTargetProfileCommand() {
 
 const targetProfiles = [
   { configName: "base", uiText: "Q#: QIR base" },
-  { configName: "quantinuum", uiText: "Q#: QIR Quantinuum" },
+  { configName: "adaptive_ri", uiText: "Q#: QIR Adaptive RI" },
   { configName: "unrestricted", uiText: "Q#: unrestricted" },
 ];
 
 function getTargetProfiles(): {
   configName: string;
   uiText: string;
 }[] {
-  const allow_quantinuum = getEnableAdaptiveProfile();
-  if (allow_quantinuum) {
+  const allow_adaptive_ri = getEnableAdaptiveProfile();
+  if (allow_adaptive_ri) {
     return targetProfiles;
   } else {
     return targetProfiles.filter(
-      (profile) => profile.configName !== "quantinuum",
+      (profile) => profile.configName !== "adaptive_ri",
     );
   }
 }
@@ -123,8 +123,8 @@ function getTargetProfileSetting(uiText: string): TargetProfile {
   switch (uiText) {
     case "Q#: QIR base":
       return "base";
-    case "Q#: QIR Quantinuum":
-      return "quantinuum";
+    case "Q#: QIR Adaptive RI":
+      return "adaptive_ri";
     case "Q#: unrestricted":
       return "unrestricted";
     default:

wasm/src/language_service.rs

@@ -502,7 +502,7 @@ serializable_type! {
         pub manifest: Option<String>,
     },
     r#"export interface INotebookMetadata {
-        targetProfile?: "base" | "quantinuum" | "unrestricted";
+        targetProfile?: "base" | "adaptive_ri" | "unrestricted";
         languageFeatures?: "v2-preview-syntax"[];
         manifest?: string;
     }"#,

wasm/src/lib.rs

@@ -478,5 +478,5 @@ pub fn generate_docs() -> Vec<IDocFile> {
 
 #[wasm_bindgen(typescript_custom_section)]
 const TARGET_PROFILE: &'static str = r#"
-export type TargetProfile = "base" | "quantinuum" |"unrestricted";
+export type TargetProfile = "base" | "adaptive_ri" |"unrestricted";
 "#;