Merge branch 'master' of ssh://gitlab:2222/kwb13215/quantera-2

NEWPROPOSAL/FULLPROP.tex

@@ -201,7 +201,7 @@ in realising a quantum procedure on hardware, including
     and managing the realisation of error correction,    
   \end{itemize}
   in a way which can be specified in a modular way but which is tightly integrated upon compilation.
-  To demonstrate this technology, we will develop a compiler from a high-level quantum programming language to hardware, for (i)~optically-coupled ion traps (NQIT)~\cite{PhysRevX.4.041041} and (ii)~quantum-dot devices (Grenoble)\REM{ [do we have something here to cite?]}.
+  To demonstrate this technology, we will develop a compiler from a high-level quantum programming language to hardware, for (i)~optically-coupled ion traps (NQIT)~\cite{PhysRevX.4.041041} and (ii)~silicon spin qubits (Grenoble)\REM{ [do we have something here to cite?]}.
   We will specifically pursue the development of deep quantum compilation technology by exploiting the versatility of the \zxcalculus, and further developing its application. 
 This will greatly improve the software ecosystem for quantum computers:
 deep quantum compilation will allow future quantum devices to
@@ -231,7 +231,7 @@ new possibilities for optimisation and verification of quantum
 computations. 
 
 %  and is complete for important subtheories such as the stablizer
-% fragment \cite{1367-2630-16-9-093021} and single qubit Clifford+T
+% fragment \cite{1367-2630-16-9-093021} and single qubit Clifford+T 
 % equations \cite{Backens:2014aa}. 
 
 %\REM{The closely related ZW-calculus \cite{Hadzihasanovic2015A-Diagrammatic-} provides a complete characterisation of qubit entanglement-classes.}
@@ -242,18 +242,9 @@ computations.
 \newt{The tensor network structure means that the \zxcalculus represents initial states, unitary operations, measurements and discarding in one unified notation.
 It also makes the notation vastly more flexible than quantum circuits: \zx-based transformations between quantum circuits may have intermediate steps that cannot directly be expressed as equations between circuits \cite{DKPdW-2019}.
 An example of such a transformation is the following:}
-  \textit{\bfseries\ttfamily\color{red!70!black} \KILL{INSERT UPDATED FIGURE HERE}}
-
-\vspace{-2mm}%
-   % (see Figure~\ref{fig:zx-mbqc-cnot}).
-  \[
-    \cnoti[0.7] \rTo^* 
-    \cnotii[0.6] \rTo^*
-    \cnotiii[0.6] \rTo^*  
-    \cnotiv[0.6] \rTo^* 
-    %\cnotv[0.6] \rTo^* 
-    \cnotvi[0.7]
-  \]~\\[-4mm]%
+
+\includegraphics[width=\textwidth]{figures/circuit-fig}
+
 Members of our consortium have demonstrated how to use these formal
 reasoning techniques in software, including the interactive theorem
 prover {\tt quantomatic} \cite{Kissinger2015Quantomatic:-A-} (which
@@ -801,9 +792,9 @@ This annotation system will again be modular, in that any hardware platform may
 This will make the \dzxc system extensible in principle to any sufficiently well-characterised quantum computing platform.
 
 Annotation systems representing the hardware implementation are to be provided by the development environment, using a standardised interface, as developed in \ref{task:backendapi}.
-As a way to demonstrate and to prototype this hardware-dependent annotation layer,  we will study concrete hardware platforms quantum computers based on different technologies: optically linked ion traps (NQIT) in Task~\ref{task:NQIT-model}, and quantum dots (Grenoble) in Task~\ref{task:qdot-model}.
+As a way to demonstrate and to prototype this hardware-dependent annotation layer,  we will study concrete hardware platforms quantum computers based on different technologies: silicon spin qubits (Grenoble) in Task~\ref{task:qdot-model}, and optically linked ion traps (NQIT) in Task~\ref{task:NQIT-model}.
 In both cases we will interact strongly with the experimental groups working on these
-models, who are close colleagues of our consortium members (N.~de Beaudrap for NQIT, and D.~Horsman for Grenoble).
+models, who are close colleagues of our consortium members (D.~Horsman for Grenoble, and N.~de Beaudrap for NQIT).
 Since these architectures are dissimilar, tackling both is an ideal demonstration of our approach. 
 The completion of this phase will allow quantum programs
 generated by the \dzxc system
@@ -860,7 +851,7 @@ We will promote these cross-disciplinary interactions by a number of our planned
 \subsection{Expected impacts}
 \label{sec:expected-impacts}
 
-\newt{Co-Op ZX} significantly advances the state-of-the-art across \newt{six of the seven} expected impacts.% the seventh is out of project scope.
+\newt{The \dzxc system} significantly advances the state-of-the-art across \newt{six of the seven} expected impacts.% the seventh is out of project scope.
 
 \KILL{\texttt{\bfseries \color{red!70!black} [Some of these may need shortening a bit, particularly as we add material for the new Expected Impacts.]}}
 
@@ -1163,7 +1154,7 @@ The project is a single integrated whole, so there are many linkages
 between the work packages; these are displayed in
 Figure~\ref{fig:pert}. As discussed in
 \S~\ref{sec:manag-struct-milest}, only some of these linkages are true
-dependencies, where later tasks rely on results of earlier ones. On the other hand, many tasks can influence and enhance each other as they run in parallel.
+dependencies, where later tasks rely on results of earlier ones. On the other hand, many tasks can influence and enhance each other as they run in parallel. 
 
 Our work plan consists of a balance of short tasks with concrete software deliverables (e.g. \ref{task:transQASM} and \ref{task:HPC-sim-model}) and longer term, more ambitious and open-ended tasks (e.g. \ref{task:algorithms} and \ref{task:opt-machine}) which can offer significant, but less predictable, step-changes in the state of the art.
 
@@ -1190,13 +1181,13 @@ scheduled toward the end of the project.
   \centering
   \input{pertchart.tex}
   
-  \caption{Dependencies and interactions between tasks}
+  \caption{Dependencies and interactions between tasks} 
 \label{fig:pert}
 \end{figure}
 
 The allocation of staff to work packages is discussed in
 \S~\ref{sec:consortium-as-whole} and \S\ref{sec:descr-cons}.
-However, because of the integrated nature of the project, and the high
+However, because of the integrated nature of the project, and the high 
 degree of past collaboration among the consortium members, most tasks
 receive attention from the personnel of several sites.  This degree of
 collaboration is a strong point of this project.
@@ -1211,7 +1202,7 @@ collaboration is a strong point of this project.
 
 \begin{WP}{A quantum compiler stack}{1M}{36M}{wp:frontend}
 \WPleaderLOR
-\WPeffort{12}{14}{32}{12}{12}{3}
+\WPeffort{12}{20}{32}{12}{12}{3}
 \begin{WPaim}
   This WP develops elements of \zx as an abstract intermediate
   compiler language.  We provide interface between \zx and known
@@ -1443,7 +1434,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
     \WPdeliverable{M24}{An extended \zx language which expresses
       topological and quantitative properties, with associated
       reasoning techniques.} 
-  \WPdeliverable{M24}{\newt{Setting the state-of-the-art for all forms circuit optimization}.}
+  \WPdeliverable{M24}{\newt{Setting the state-of-the-art for all forms of circuit optimization}.}
         \WPdeliverable{M24}{\newt{Optimization techniques for a variety of computational models}.}
  % \WPdeliverable{M24}{Routines for adding error-correction to \zx programs}
     \WPdeliverable{M24}{Routines for adding error-correction to ZX programs.}
@@ -1469,13 +1460,13 @@ Perdrix, Valiron, Carette.}
   \WPleaderGREN
   \WPeffort{12}{9}{12}{6}{\newt{6}}{0}
   \begin{WPaim}
-We import machine-dependent specifications to \zx terms, and use this to optimise algorithms further for specific hardware constraints. We focus on the silicon quantum dot devices developing in Grenoble, the ion traps developed in Oxford, and the superconducting devices accessible through CQC and partnership with IBM. This is the culmination of all previous work packages, and feeds back into them. The final result will be \ldots.
+We import machine-dependent specifications to \zx terms, and use this to optimise algorithms further for specific hardware constraints. We focus on the silicon spin qubits developing in Grenoble, the ion traps developed in Oxford, and the superconducting devices accessible through CQC and partnership with IBM. This is the culmination of all previous work packages, and feeds back into them. The final result will be \ldots.
 Also machine-dependent error correction here?
   \end{WPaim}
   \begin{WPtasks}
-\WPtask[\label{task:qdot-model}]{Grenoble quantum dots (M13--M36  Responsible: \partnerref{partner:grenoble};
+\WPtask[\label{task:qdot-model}]{Grenoble silicon spin qubits (M13--M36  Responsible: \partnerref{partner:grenoble};
   Involved: \partnerref{partner:loria},\partnerref{partner:gdansk})}{
-  We will model the quantum dot device being developed in Grenoble, and extract specific annotations for
+  We will model the silicon spin qubits being developed in Grenoble, and extract specific annotations for
   \zx that describe key elements of the architecture.  This will
   include qubit layout on wafers, network connectivity, and timing
   and fidelity of potential entanglement links.  A suitably annotated \zx term
@@ -1492,7 +1483,7 @@ Also machine-dependent error correction here?
     (M15--M30; Responsible: \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:gdansk})}{%
     Develop algorithms which, given a collection of constraints
     representing a machine model
-    (c.f.~\ref{task:annotate1}, \ref{task:annotate2}), re-writes \dzxc terms
+    (c.f.~\ref{task:annotate1}, \ref{task:annotate2}), re-writes \zx terms
     to a form which can be executed on that machine model.
 %\BREM{      Develop a specification system for the operations and constraints of a hardware system, in order to specify how to transform a ``logical'' \azx term to a procedure to realise that transformation on a specific machine.}
       }
@@ -1583,12 +1574,12 @@ Staton, Carette.}
     & \ref{wp:admin} 
     & \textbf{TOTAL} \\\hline
 1. Grenoble   &  12 & 12 & 12 & 12 & 3  & 51 \\\hline
-2. LORIA      & 14 & 12 & 9  & 9  & 3  & 47 \\\hline
+2. LORIA      & 20 & 12 & 9  & 9  & 3  & 53 \\\hline
 3. Oxford     & 32 & 14 & 30 & 12 & 2  & 90 \\\hline
 4. CQC        &  12 & 4  & 12 &  6 & 1  & 28 \\\hline
 5. Gdansk     &  12& 30 & 12 & 6 & 4  & 71 \\\hline
 6. Nijmegen   &  3 & 6  & 12 & 0 & 2  & 23 \\\hline
-\textbf{TOTAL}& 85 & 78 & 87 & 45 & 11 & 317   \\\hline 
+\textbf{TOTAL}& 91 & 78 & 87 & 45 & 11 & 317   \\\hline 
   \end{tabular}
 \end{center}}