update job submit instructions

docs/accounts/billing.md

@@ -18,7 +18,6 @@ at research.csc.fi.
    data stored in Allas is billed.
 * [Pouta billing](../cloud/pouta/accounting.md)
 * [Rahti billing](../cloud/rahti/billing.md)
-* [Kvasi billing](../computing/quantum-computing/kvasi/kvasi-billing.md)
 * [SD Connect and SD Desktop billing](../data/sensitive-data/sd-use-case-new-user-project-manager.md#sd-connect-bu-consumption)
 
 

docs/accounts/index.md

@@ -14,7 +14,7 @@ The Project Manager is typically a leader of a research team or other senior res
 *   **Billing Units** (BUs) are used to allocate resources to users' projects. You can apply for Billing Units in [MyCSC](https://my.csc.fi) portal and CSC grants BUs to projects. [Usage consumes billing units](billing.md) but **no actual payment** is required.
 However, the amount of billing units must always remain positive.
 
-*   **LUMI projects** used to manage access to LUMI and the resources provided by it. LUMI projects are restricted to LUMI environment only (LUMI-C, LUMI-G etc.). Finnish LUMI projects are fixed in time and resources, and the total resources must be defined already in the project application. Lumi projects are also used for [Helmi quantum computer](../computing/quantum-computing/helmi/helmi-from-lumi.md). For further information please see [these instructions](https://www.lumi-supercomputer.eu/get-started-2021/users-in-finland/){:target="_blank"}. 
+*   **LUMI projects** used to manage access to LUMI and the resources provided by it. LUMI projects are restricted to LUMI environment only (LUMI-C, LUMI-G etc.). Finnish LUMI projects are fixed in time and resources, and the total resources must be defined already in the project application. Lumi projects are also used for [FiQCI quantum computers](../computing/quantum-computing/quantum-computers/access.md). For further information please see [these instructions](https://www.lumi-supercomputer.eu/get-started-2021/users-in-finland/){:target="_blank"}. 
 
 *   **My.csc.fi portal** MyCSC is the self-service CSC customer portal for research and education customers and end-users. MyCSC is also available for any other CSC customer or end-user, if they have CSC user accounts according to the CSCID policies.
 MyCSC portal offers users the functionality for registering CSC user accounts, creating computing or data projects, adding members to projects, and applying resources for projects. Users can also manage their projects and project lifecycles through MyCSC, and they can see the resources consumption and amount of stored data there.

docs/apps/cirq-on-iqm.md

@@ -14,16 +14,16 @@ catalog:
 # Cirq-on-iqm
 
 Cirq on IQM is an open-source cirq adapter for IQM quantum computers. It is
-installed as `fiqci-vtt-cirq` on LUMI. It is used for running quantum circuits on
-[Helmi](../computing/quantum-computing/helmi/running-on-helmi.md).
+installed as `fiqci-vtt-cirq` on LUMI. It is used for running quantum circuits on the
+[quantum computers](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md).
 
 ## Available
 
 Currently supported [cirq-on-iqm](https://iqm-finland.github.io/cirq-on-iqm/) versions:
 
 | Version | Module                               | LUMI  | Notes           |
 |:--------|:-------------------------------------|:-----:|-----------------|
-| 15.2    | `fiqci-vtt-cirq/15.2`                    | X     |                 |
+| 16.2   | `fiqci-vtt-cirq/16.2`                    | X     |                 |
 
 
 All modules are based on Tykky using LUMI-container-wrapper.
@@ -61,14 +61,14 @@ module avail fiqci-vtt-cirq
 
 ### Example batch script
 
-Example batch script for running a quantum job on Helmi:
+Example batch script for running a quantum job:
 
 ```bash title="LUMI"
 #!/bin/bash -l
 
-#SBATCH --job-name=helmijob     # Job name
-#SBATCH --output=helmijob.o%j   # Name of stdout output file
-#SBATCH --error=helmijob.e%j    # Name of stderr error file
+#SBATCH --job-name=quantumjob     # Job name
+#SBATCH --output=quantumjob.o%j   # Name of stdout output file
+#SBATCH --error=quantumjob.e%j    # Name of stderr error file
 #SBATCH --partition=q_fiqci     # Partition (queue) name
 #SBATCH --ntasks=1              # One task (process)
 #SBATCH --cpus-per-task=1       # Number of cores (threads)
@@ -79,6 +79,9 @@ Example batch script for running a quantum job on Helmi:
 module use /appl/local/quantum/modulefiles
 module load fiqci-vtt-cirq
 
+export DEVICES=("Q5") #export DEVICES=("Q5" "Q50") to use Helmi and Q50
+source $RUN_SETUP
+
 python -u quantum_job.py
 ```
 
@@ -87,4 +90,4 @@ Submit the script with `sbatch <script_name>.sh`.
 ## More information
 
 - [Cirq-IQM documentation](https://iqm-finland.github.io/cirq-on-iqm/user_guide.html)
-- [Quantum-Computing](../computing/quantum-computing/helmi/running-on-helmi.md)
+- [Quantum-Computing](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md)

docs/apps/qiskit-on-iqm.md

@@ -14,8 +14,8 @@ catalog:
 # Qiskit-on-iqm
 
 Qiskit on IQM is an open-source qiskit adapter for IQM quantum computers. It is
-installed as `fiqci-vtt-qiskit` on LUMI. It is used for running quantum circuits on
-[Helmi](../computing/quantum-computing/helmi/running-on-helmi.md).
+installed as `fiqci-vtt-qiskit` on LUMI. It is used for running quantum circuits on the
+[quantum computers](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md).
 
 
 ## Available
@@ -25,7 +25,7 @@ versions:
 
 | Version | Module                               | LUMI  | Notes           |
 |:--------|:-------------------------------------|:-----:|-----------------|
-| 15.5    | `fiqci-vtt-qiskit/15.5`                  | X     |                 |
+| 17.8    | `fiqci-vtt-qiskit/17.8`                  | X     |                 |
 
 All modules are based on Tykky using LUMI-container-wrapper.
 Wrapper scripts have been provided so that common commands such as `python`,
@@ -62,14 +62,14 @@ module avail fiqci-vtt-qiskit
 
 ### Example batch script
 
-Example batch script for running a quantum job on Helmi:
+Example batch script for running a quantum job:
 
 ```bash title="LUMI"
 #!/bin/bash -l
 
-#SBATCH --job-name=helmijob     # Job name
-#SBATCH --output=helmijob.o%j   # Name of stdout output file
-#SBATCH --error=helmijob.e%j    # Name of stderr error file
+#SBATCH --job-name=quantumjob     # Job name
+#SBATCH --output=quantumjob.o%j   # Name of stdout output file
+#SBATCH --error=quantumjob.e%j    # Name of stderr error file
 #SBATCH --partition=q_fiqci     # Partition (queue) name
 #SBATCH --ntasks=1              # One task (process)
 #SBATCH --cpus-per-task=1       # Number of cores (threads)
@@ -79,7 +79,8 @@ Example batch script for running a quantum job on Helmi:
 
 module use /appl/local/quantum/modulefiles
 module load fiqci-vtt-qiskit
-
+export DEVICES=("Q5") #export DEVICES=("Q5" "Q50") to use Helmi and Q50
+source $RUN_SETUP
 python -u quantum_job.py
 ```
 
@@ -88,4 +89,4 @@ Submit the script with `sbatch <script_name>.sh`.
 ## More information
 
 - [Qiskit-IQM documentation](https://iqm-finland.github.io/qiskit-on-iqm/)
-- [Quantum-Computing](../computing/quantum-computing/helmi/running-on-helmi.md)
+- [Quantum-Computing](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md)

docs/apps/qiskit.md

@@ -17,8 +17,8 @@ catalog:
 
 Qiskit is an open-source software for working with quantum computers at the level of circuits, pulses, and algorithms. 
 This page contains information in regard to running Quantum simulations using qiskit inside of a singularity container.
-For information pertaining to running jobs on Helmi using qiskit please refer to this documentation: 
-[Running on Helmi](../computing/quantum-computing/helmi/running-on-helmi.md).
+For information pertaining to running jobs on the physical quantum computers using qiskit please refer to this documentation: 
+[Running quantum jobs](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md).
 
 !!! info "News"
      **19.02.2025** Installed `qiskit/1.3.2` in a singularity container on LUMI with all major Qiskit packages and

docs/computing/available-systems.md

@@ -1,7 +1,7 @@
 # Systems
 
 CSC's computing environment consists of supercomputers Puhti and
-Mahti, and the quantum learning machine Kvasi. Puhti and Mahti have a
+Mahti. Puhti and Mahti have a
 fairly similar compute environment, and there is a wide range of
 workloads that can utilize both efficiently. At the same time their
 hardware is different, and this makes some worklods uniquely suitable

docs/computing/quantum-computing/access.md

@@ -0,0 +1,20 @@
+# Setting up a LUMI project and accounts for accessing the Quantum computers
+
+This page outlines the steps to set up a LUMI account and project for accessing the **Helmi(VTT Q5)** and **VTT Q50**  quantum computers. It is assumed that you have some knowledge of supercomputing systems. If you're new, start with the [overview of CSC supercomputers](../../../computing/index.md).
+
+To access Helmi or Q50, you must first create a LUMI project with quantum computing resources: [Quantum Projects on LUMI](projects.md).
+
+Once the project is created, the **Principal Investigator (PI)** can invite other users: [How to add members to project](../../../accounts/how-to-add-members-to-project.md)
+
+The project PI is responsible for ensuring that the [Helmi Terms of Use](https://a3s.fi/FiQCI/Helmi-Terms-of-Use-2022.pdf) or [Q50 Terms of Use](https://a3s.fi/FiQCI/VTT_Quantum_Academic_Use_EULA.pdf) are followed.
+
+## Connect to LUMI
+
+Follow the official instructions to connect to the LUMI system: [Connecting to LUMI – Official Documentation](https://docs.lumi-supercomputer.eu/firststeps/).
+
+Details for running jobs on the quantum computers through LUMI can found in the [Running quantum jobs](running-quantum-jobs.md) page.
+
+## Support channels
+
+For support with access via LUMI, contact the  [CSC Service Desk](../../../support/contact.md), reachable at [email protected]. 
+

docs/computing/quantum-computing/fiqci-partition.md

@@ -0,0 +1,49 @@
+# Specific instructions for the FiQCI partition on LUMI
+
+The FiQCI partition within LUMI provides access to quantum processing units (QPUs) for users belonging to projects with allocated QPU resources. In addition to executing quantum workloads via LUMI, users can leverage the full LUMI infrastructure, including its software stack and quantum simulators, for development, testing, and hybrid quantum-classical workflows.
+
+!!! info "View status of the quantum computers"
+	You can check the status of the connection here: [https://fiqci.fi/status](https://fiqci.fi/status)
+
+
+## LUMI Quantum Computing projects vs. regular LUMI projects
+
+Quantum computing projects are slightly different from standard LUMI projects. The main difference is, that you will
+need to apply for quantum resources in addition to CPU, GPU, and storage.
+
+
+## The FiQCI partition `q_fiqci`
+
+Access to the quantum computers is only available through the FiQCI partition on LUMI, which provides a direct connection between a [LUMI-C
+node](https://docs.lumi-supercomputer.eu/hardware/lumic/) and the Fiqci quantum computers.
+
+* [Further details on LUMI nodes](https://docs.lumi-supercomputer.eu/hardware/)
+
+There is one queue in the LUMI partition corresponding to FiQCI projects: `q_fiqci`. 
+Currently, the maximum run time of a quantum job is 2 hours.
+
+| Name      | Max walltime | Max jobs |
+| --------- | ------------ | -------- |
+| _q_fiqci_ | _2 hours_    | _64_      |
+
+
+## Storage areas
+
+The `q_fiqci` partition uses the same storage policies as LUMI. You can find [further details on LUMI Storage here](https://docs.lumi-supercomputer.eu/storage/).
+
+## Usage and Billing
+
+Quantum computing projects work similarly to the regular LUMI system. The main differences are:
+
+1. FiQCI projects use the `--partition=q_fiqci` partition instead of the regular LUMI-C `--partition=standard` and `--partition=small`.
+2. The maximum job walltime is **2 hours**.
+3. Usage is billed as QPU seconds **QPUs** in `q_fiqci`. 
+4. The LUMI-Fiqci computing environment has to be loaded separately. See [Running on quantum jobs](./running-quantum-jobs.md) for details.
+
+Presently, running through the `q_fiqci` queue will consume QPU seconds for the amount of wall-time spent running in the `q_fiqci` queue.
+
+!!! success "Querying your used QPUs"
+    You can check your used QPUs using the `lumi-allocations` tool. 
+
+
+Support can be reached via the [CSC Service Desk](../../../support/contact.md). Note that presently, user support is limited to technical issues.

docs/computing/quantum-computing/helmi/first-quantum-job.md → docs/computing/quantum-computing/first-quantum-job.md

@@ -1,4 +1,4 @@
-# Running your first quantum computing job on Helmi through LUMI
+# Running your first quantum computing job on the Quantum computers through LUMI
 
 If you've applied for a project, been accepted, setup your ssh keys and gained access to LUMI, then the next step is to run your first quantum computing job on a real quantum computer! This is a guide for exactly how to do that. The only thing you need to know is your project number! 
 
@@ -31,7 +31,6 @@ The next step is to create your quantum circuit! Here a simple bell state will b
 !!! info "Tip!"
 
 	You can quickly see your LUMI workspaces with
-	`module load lumi-workspaces` and
 	`lumi-workspaces`
 
 Let us first create our python file with `nano first_quantum_job.py`. Here we use `nano` but if you are comfortable you can also use `vim` or `emacs`. This will bring up the `nano` text editor, the useful commands are at the bottom, to save and exit CTRL-X + Y.
@@ -71,17 +70,23 @@ Now the circuit is created! If you wish you can see what your circuit looks like
 
 ## Setting the backend
 
-First we need to set our provider and backend. The provider is the service which gives an interface to the quantum computer and the backend provides the tools necessary to submitting the quantum job. The `HELMI_CORTEX_URL` is the endpoint to reach Helmi and is only reachable inside the `q_fiqci` partition. This environment variable is set automatically when loading any of the Quantum computing modules such as the `fiqci-vtt-qiskit` module. 
+First we need to set our provider and backend. The provider is the service which gives an interface to the quantum computer and the backend provides the tools necessary to submitting the quantum job. The `HELMI_CORTEX_URL` is the endpoint to reach Helmi(the 5 qubit machine) and is only reachable inside the `q_fiqci` partition, while the `Q50_CORTEX_URL`is the endpoint to reach Q50(the 50 qubit machine). This environment variable is set automatically when loading any of the Quantum computing modules such as the `fiqci-vtt-qiskit` module. 
 
 ```python
 HELMI_CORTEX_URL = os.getenv('HELMI_CORTEX_URL')
-
 provider = IQMProvider(HELMI_CORTEX_URL)
 backend = provider.get_backend()
+
+## Uncomment the lines below to use Q50
+#Q50_CORTEX_URL = os.getenv('Q50_CORTEX_URL')
+#Q50_provider = IQMProvider(Q50_CORTEX_URL)
+#backend2 = Q50_provider.get_backend()
+
 ```
-### Decomposing the circuit (*Optional*)
 
-The next step is optional and where the quantum circuit into you've just created into it's *basis gates*. These basis gates are the actual quantum gates on the quantum computer. The process of decomposition involves turning the above Hadamard and controlled-x gates into something that can be physically run on the quantum computer. Helmi's basis gates are the entangling gate controlled-z and the one-qubit phased-rx gate. In Qiskit these are defined in the backend and can be printed with `backend.operation_names`. 
+### Transpiling the circuit
+
+This next step is where the quantum circuit you've just created is decomposed (transpiled) into it's basis gates. These basis gates are the actual quantum gates on the quantum computer. The process of decomposition involves turning the above Hadamard and controlled-x gates into something that can be physically run on the quantum computer. For Helmi, the basis gates are the entangling gate controlled-z and the one-qubit phased-rx gate. In Qiskit these are defined in the backend and can be printed with `backend.operation_names`. For more on the specs see [Topology Overview](specs.md)
 
 ```python
 circuit_decomposed = transpile(circuit, backend=backend)
@@ -102,7 +107,7 @@ qubit_mapping = {
 Here we are mapping the first qubit in the quantum register to the first of Helmi's qubits, QB1, located at the zeroth location due to Qiskit's use of zero-indexing. The second qubit is then mapped to QB3. This is where we have made use of Helmi's topology. 
 
 <p align="center">
-    <img src="../../../../img/helmi_mapping.png" alt="Helmi's node mapping">
+    <img src="../../img/helmi_mapping.png" alt="Helmi's node mapping">
 </p>
 
 
@@ -151,10 +156,13 @@ Once you've made your first quantum program remember to save! CTRL+X then Y to s
 
 ## Running the job through LUMI
 
-To run your quantum programme on LUMI you will need to submit the job through the SLURM batch scheduler on LUMI. Accessing Helmi is done through the `q_fiqci` partition. In the same directory where you have saved your quantum program, you can submit the job to SLURM using:
+To run your quantum programme on LUMI you will need to submit the job through the SLURM batch scheduler on LUMI. Accessing the quantum computers (Helmi, Q50) is done through the `q_fiqci` partition. In the same directory where you have saved your quantum program, you can submit the job to SLURM using:
 
 ```bash
-srun --account project_xxx -t 00:15:00 -c 1 -n 1 --partition q_fiqci python -u first_quantum_job.py
+module use /appl/local/quantum/modulefiles
+module --ignore_cache load "fiqci_vtt_qiskit"
+export DEVICES=("Q50")
+srun --account project_xxx -t 00:15:00 -c 1 -n 1 --partition q_fiqci bash -c "source $RUN_SETUP && python -u first_quantum_job.py"
 ```
 
 Remember to add your own project account!
@@ -165,27 +173,33 @@ This submits the job *interactively* meaning that the output will be printed str
 ```bash
 #!/bin/bash -l
 
-#SBATCH --job-name=helmijob   # Job name
-#SBATCH --output=helmijob.o%j # Name of stdout output file
-#SBATCH --error=helmijob.e%j  # Name of stderr error file
+#SBATCH --job-name=quantumjob   # Job name
+#SBATCH --output=quantumjob.o%j # Name of stdout output file
+#SBATCH --error=quantumjob.e%j  # Name of stderr error file
 #SBATCH --partition=q_fiqci   # Partition (queue) name
 #SBATCH --ntasks=1              # One task (process)
 #SBATCH --mem-per-cpu=2G       # memory allocation
 #SBATCH --cpus-per-task=1     # Number of cores (threads)
-#SBATCH --time=00:15:00         # Run time (hh:mm:ss)
+#SBATCH --time=00:05:00         # Run time (hh:mm:ss)
 #SBATCH --account=project_xxx  # Project for billing
 
 module use /appl/local/quantum/modulefiles
 module load fiqci-vtt-qiskit
 
+#To run on both Helmi(Q5) and Q50 uncomment the line below
+#export DEVICES=("Q5" "Q50")
+
+source $RUN_SETUP
+
 python -u first_quantum_job.py
 ```
-This can be submitted with `sbatch batch_script.sh` in the same directory as your python file. Jobs in the SLURM queue can be monitored through `squeue -u username` and after the job has completed your results can be found in the `helmijob.oxxxxx` file. This can be printed to the terminal with `cat`. 
+This can be submitted with `sbatch batch_script.sh` in the same directory as your python file. Jobs in the SLURM queue can be monitored through `squeue -u username` and after the job has completed your results can be found in the `quantumjob.oxxxxx` file. This can be printed to the terminal with `cat`. 
+To run on both Helmi and Q50 or Q50 alone you will need to specify the devices that you require. Here `Q5` represents Helmi and `Q50`represents the 50 qubit machine.
 
 
 ## Congratulations!
 
-Congratulations! You have just run your first job on Helmi. 
+Congratulations! You have just run your first job on a quantum computer. 
 
 The full python script can be found below. 
 
@@ -209,8 +223,13 @@ circuit.measure_all()
 
 HELMI_CORTEX_URL = os.getenv('HELMI_CORTEX_URL')
 
-provider = IQMProvider(HELMI_CORTEX_URL)
-backend = provider.get_backend()
+helmi_provider = IQMProvider(HELMI_CORTEX_URL)
+backend = helmi_provider.get_backend()
+
+## Uncomment the lines below to use Q50
+#Q50_CORTEX_URL = os.getenv('Q50_CORTEX_URL')
+#Q50_provider = IQMProvider(Q50_CORTEX_URL)
+#backend2 = Q50_provider.get_backend()
 
 # Retrieving backend information
 # print(f'Native operations: {backend.operation_names}')