From 8b8ff4eafe0f37e23016a2d0848e3b8d979688bf Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Wed, 26 Jun 2024 16:48:48 -0400
Subject: [PATCH 01/28] Updated CI workflows to avoid race conditions on PRs
 with concurrency label

---
 .github/workflows/tests_lgpu_cpp.yml           | 2 +-
 .github/workflows/tests_lgpu_python.yml        | 2 +-
 .github/workflows/tests_lgpumpi_cpp.yml        | 2 +-
 .github/workflows/tests_lgpumpi_python.yml     | 2 +-
 .github/workflows/tests_linux_cpp.yml          | 2 +-
 .github/workflows/tests_lkcpu_python.yml       | 2 +-
 .github/workflows/tests_lkcuda_cpp.yml         | 2 +-
 .github/workflows/tests_lkcuda_python.yml      | 2 +-
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 2 +-
 .github/workflows/tests_lmps_tncuda_python.yml | 2 +-
 .github/workflows/tests_lqcpu_python.yml       | 2 +-
 .github/workflows/tests_windows_cpp.yml        | 2 +-
 .github/workflows/tests_without_binary.yml     | 2 +-
 .github/workflows/update_dev_version.yml       | 5 +++++
 14 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 49e95a4902..694af1bed2 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -30,7 +30,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lgpu_python.yml b/.github/workflows/tests_lgpu_python.yml
index a5f3a8ea8e..6ba1754483 100644
--- a/.github/workflows/tests_lgpu_python.yml
+++ b/.github/workflows/tests_lgpu_python.yml
@@ -34,7 +34,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lgpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lgpumpi_cpp.yml b/.github/workflows/tests_lgpumpi_cpp.yml
index 9bc959ea78..dab7f44e70 100644
--- a/.github/workflows/tests_lgpumpi_cpp.yml
+++ b/.github/workflows/tests_lgpumpi_cpp.yml
@@ -29,7 +29,7 @@ env:
   CI_CUDA_ARCH: 86
 
 concurrency:
-  group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lgpumpi_python.yml b/.github/workflows/tests_lgpumpi_python.yml
index fb88a4bf83..cf9bf8e3a6 100644
--- a/.github/workflows/tests_lgpumpi_python.yml
+++ b/.github/workflows/tests_lgpumpi_python.yml
@@ -30,7 +30,7 @@ env:
   CI_CUDA_ARCH: 86
 
 concurrency:
-  group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml
index d0392d6e51..34d1184d10 100644
--- a/.github/workflows/tests_linux_cpp.yml
+++ b/.github/workflows/tests_linux_cpp.yml
@@ -30,7 +30,7 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  group: tests_linux_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_linux_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcpu_python.yml b/.github/workflows/tests_lkcpu_python.yml
index 0db8138530..7efc1df00c 100644
--- a/.github/workflows/tests_lkcpu_python.yml
+++ b/.github/workflows/tests_lkcpu_python.yml
@@ -34,7 +34,7 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  group: tests_lkcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lkcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcuda_cpp.yml b/.github/workflows/tests_lkcuda_cpp.yml
index fe1bf5b4f5..f489f937d7 100644
--- a/.github/workflows/tests_lkcuda_cpp.yml
+++ b/.github/workflows/tests_lkcuda_cpp.yml
@@ -29,7 +29,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcuda_python.yml b/.github/workflows/tests_lkcuda_python.yml
index f8aa87416b..0491d13312 100644
--- a/.github/workflows/tests_lkcuda_python.yml
+++ b/.github/workflows/tests_lkcuda_python.yml
@@ -33,7 +33,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lkcuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lkcuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index d65f43f3f3..a3d997da37 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -31,7 +31,7 @@ env:
   GCC_VERSION: 11
 
 concurrency:
-  group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index c45a266761..f2e783f6fe 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -34,7 +34,7 @@ env:
   GCC_VERSION: 11
 
 concurrency:
-  group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml
index 9423570b2a..c3b2ad322f 100644
--- a/.github/workflows/tests_lqcpu_python.yml
+++ b/.github/workflows/tests_lqcpu_python.yml
@@ -24,7 +24,7 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  group: tests_lqcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lqcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_windows_cpp.yml b/.github/workflows/tests_windows_cpp.yml
index eea4b25e0f..2faccc0831 100644
--- a/.github/workflows/tests_windows_cpp.yml
+++ b/.github/workflows/tests_windows_cpp.yml
@@ -20,7 +20,7 @@ on:
       - '!pennylane_lightning/core/src/simulators/lightning_gpu/**'
 
 concurrency:
-  group: tests_windows_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_windows_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_without_binary.yml b/.github/workflows/tests_without_binary.yml
index 65aae6dea3..919e162a4b 100644
--- a/.github/workflows/tests_without_binary.yml
+++ b/.github/workflows/tests_without_binary.yml
@@ -21,7 +21,7 @@ env:
   COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --cov-report=xml:./coverage.xml --no-flaky-report -p no:warnings --tb=native"
 
 concurrency:
-  group: tests_without_binary-${{ github.ref }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_without_binary-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/update_dev_version.yml b/.github/workflows/update_dev_version.yml
index a7c08fb40f..eba14db6eb 100644
--- a/.github/workflows/update_dev_version.yml
+++ b/.github/workflows/update_dev_version.yml
@@ -4,6 +4,11 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+
 jobs:
   update-dev-version:
     name: Update version for development branches

From 8aa8463c5d8a76850ad674277f8420870be8fa12 Mon Sep 17 00:00:00 2001
From: ringo-but-quantum <github-ringo-but-quantum@xanadu.ai>
Date: Wed, 26 Jun 2024 20:59:12 +0000
Subject: [PATCH 02/28] Auto update version from '0.37.0-dev49' to
 '0.37.0-dev50'

---
 pennylane_lightning/core/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py
index 0321bcbfde..9a871e864f 100644
--- a/pennylane_lightning/core/_version.py
+++ b/pennylane_lightning/core/_version.py
@@ -16,4 +16,4 @@
    Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.37.0-dev49"
+__version__ = "0.37.0-dev50"

From ccd6c2e2f08300b9f79a8208dcd8f5980db2a83f Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:54:23 -0400
Subject: [PATCH 03/28] Update Changelog

---
 .github/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 4559558eea..6b69466113 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -35,6 +35,9 @@
 
 ### Improvements
 
+* Updated concurrency labels for tests ensuring different workflows do not run under the same concurrency group label
+  [(#778)](https://github.com/PennyLaneAI/pennylane-lightning/pull/778)
+
 * Release candidate branches are automatically switched over to using the new large GitHub runner pool.
   [(#769)](https://github.com/PennyLaneAI/pennylane-lightning/pull/769)
 

From 0a62856836d520c6409dee014c5f6a2540616353 Mon Sep 17 00:00:00 2001
From: AmintorDusko <amintor_dusko@hotmail.com>
Date: Fri, 28 Jun 2024 13:56:38 -0400
Subject: [PATCH 04/28] Trigger CIs


From e86b0328e0d0c97361081198d5a171d71dce80fb Mon Sep 17 00:00:00 2001
From: AmintorDusko <amintor_dusko@hotmail.com>
Date: Fri, 28 Jun 2024 14:28:16 -0400
Subject: [PATCH 05/28] Trigger CIs


From c7ecac96530c8b8299e3cc40ab2681416edfc74c Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 08:56:26 -0400
Subject: [PATCH 06/28] Trigger CI


From fbf19993617dc38b769af65bb77a13e4788ef4ec Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 08:56:43 -0400
Subject: [PATCH 07/28] Trigger CI


From 121d782f2814f0dda012ade7822230afd6cac245 Mon Sep 17 00:00:00 2001
From: Ali Asadi <10773383+maliasadi@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:44:20 -0400
Subject: [PATCH 08/28] Temporary update
 .github/workflows/update_dev_version.yml

---
 .github/workflows/update_dev_version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update_dev_version.yml b/.github/workflows/update_dev_version.yml
index eba14db6eb..569fdf5b93 100644
--- a/.github/workflows/update_dev_version.yml
+++ b/.github/workflows/update_dev_version.yml
@@ -6,7 +6,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: false
 
 
 jobs:

From 904123ddf4d8b01054e3323650f9aa29073b8b3a Mon Sep 17 00:00:00 2001
From: Ali Asadi <10773383+maliasadi@users.noreply.github.com>
Date: Tue, 2 Jul 2024 12:06:13 -0400
Subject: [PATCH 09/28] Apply suggestions from code review

---
 .github/workflows/tests_lgpu_cpp.yml     | 2 +-
 .github/workflows/update_dev_version.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 694af1bed2..49e95a4902 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -30,7 +30,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/update_dev_version.yml b/.github/workflows/update_dev_version.yml
index 569fdf5b93..eba14db6eb 100644
--- a/.github/workflows/update_dev_version.yml
+++ b/.github/workflows/update_dev_version.yml
@@ -6,7 +6,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 
 jobs:

From d939cd8412e6785eaa5af471355fce6f3a376b22 Mon Sep 17 00:00:00 2001
From: Ali Asadi <10773383+maliasadi@users.noreply.github.com>
Date: Tue, 2 Jul 2024 12:11:33 -0400
Subject: [PATCH 10/28] Update tests_lgpu_cpp

---
 .github/workflows/tests_lgpu_cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 49e95a4902..21044ef87f 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -123,7 +123,7 @@ jobs:
       - name: Install required packages
         run: |
           python -m pip install ninja cmake custatevec-cu${{ matrix.cuda_version }}
-          sudo apt-get -y -q install liblapack-dev
+          sudo apt-get -y -q install liblapack-dev black
 
       - name: Build and run unit tests
         run: |

From 7a93de6151b64b13286bd5c22c91a804491f7b00 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:48:00 -0400
Subject: [PATCH 11/28] Put back existing lgpu group

---
 .github/workflows/tests_lgpu_cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 21044ef87f..89c40d3ca1 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -30,7 +30,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:

From 996475fe8d7f633eba193ba932b320cc962b08f0 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 14:18:33 -0400
Subject: [PATCH 12/28] Try: Revert everything back to github.event. Try
 testing some hypothesis

---
 .github/workflows/tests_lgpu_cpp.yml           | 3 ++-
 .github/workflows/tests_lgpu_python.yml        | 3 ++-
 .github/workflows/tests_lgpumpi_cpp.yml        | 3 ++-
 .github/workflows/tests_lgpumpi_python.yml     | 3 ++-
 .github/workflows/tests_linux_cpp.yml          | 3 ++-
 .github/workflows/tests_lkcpu_python.yml       | 3 ++-
 .github/workflows/tests_lkcuda_cpp.yml         | 3 ++-
 .github/workflows/tests_lkcuda_python.yml      | 3 ++-
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 3 ++-
 .github/workflows/tests_lmps_tncuda_python.yml | 3 ++-
 .github/workflows/tests_lqcpu_python.yml       | 3 ++-
 .github/workflows/tests_windows_cpp.yml        | 3 ++-
 .github/workflows/tests_without_binary.yml     | 3 ++-
 13 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 89c40d3ca1..d9f2d5dd59 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -30,7 +30,8 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lgpu_python.yml b/.github/workflows/tests_lgpu_python.yml
index 6ba1754483..508a198623 100644
--- a/.github/workflows/tests_lgpu_python.yml
+++ b/.github/workflows/tests_lgpu_python.yml
@@ -34,7 +34,8 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lgpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Testing github.event, revert back to event_name
+  group: tests_lgpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lgpumpi_cpp.yml b/.github/workflows/tests_lgpumpi_cpp.yml
index dab7f44e70..bec6cbdcbe 100644
--- a/.github/workflows/tests_lgpumpi_cpp.yml
+++ b/.github/workflows/tests_lgpumpi_cpp.yml
@@ -29,7 +29,8 @@ env:
   CI_CUDA_ARCH: 86
 
 concurrency:
-  group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lgpumpi_python.yml b/.github/workflows/tests_lgpumpi_python.yml
index cf9bf8e3a6..66e57e4a6a 100644
--- a/.github/workflows/tests_lgpumpi_python.yml
+++ b/.github/workflows/tests_lgpumpi_python.yml
@@ -30,7 +30,8 @@ env:
   CI_CUDA_ARCH: 86
 
 concurrency:
-  group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml
index 34d1184d10..9d069a3aac 100644
--- a/.github/workflows/tests_linux_cpp.yml
+++ b/.github/workflows/tests_linux_cpp.yml
@@ -30,7 +30,8 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  group: tests_linux_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_linux_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcpu_python.yml b/.github/workflows/tests_lkcpu_python.yml
index 7efc1df00c..cffc45b738 100644
--- a/.github/workflows/tests_lkcpu_python.yml
+++ b/.github/workflows/tests_lkcpu_python.yml
@@ -34,7 +34,8 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  group: tests_lkcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lkcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcuda_cpp.yml b/.github/workflows/tests_lkcuda_cpp.yml
index f489f937d7..e1a8ddef47 100644
--- a/.github/workflows/tests_lkcuda_cpp.yml
+++ b/.github/workflows/tests_lkcuda_cpp.yml
@@ -29,7 +29,8 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcuda_python.yml b/.github/workflows/tests_lkcuda_python.yml
index 0491d13312..f43a2d0622 100644
--- a/.github/workflows/tests_lkcuda_python.yml
+++ b/.github/workflows/tests_lkcuda_python.yml
@@ -33,7 +33,8 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  group: tests_lkcuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lkcuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index a3d997da37..4578b40db4 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -31,7 +31,8 @@ env:
   GCC_VERSION: 11
 
 concurrency:
-  group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index f2e783f6fe..2ac03ef6a7 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -34,7 +34,8 @@ env:
   GCC_VERSION: 11
 
 concurrency:
-  group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml
index c3b2ad322f..93d51c5065 100644
--- a/.github/workflows/tests_lqcpu_python.yml
+++ b/.github/workflows/tests_lqcpu_python.yml
@@ -24,7 +24,8 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  group: tests_lqcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_lqcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_windows_cpp.yml b/.github/workflows/tests_windows_cpp.yml
index 2faccc0831..9478fcbb83 100644
--- a/.github/workflows/tests_windows_cpp.yml
+++ b/.github/workflows/tests_windows_cpp.yml
@@ -20,7 +20,8 @@ on:
       - '!pennylane_lightning/core/src/simulators/lightning_gpu/**'
 
 concurrency:
-  group: tests_windows_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_windows_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_without_binary.yml b/.github/workflows/tests_without_binary.yml
index 919e162a4b..8a97719262 100644
--- a/.github/workflows/tests_without_binary.yml
+++ b/.github/workflows/tests_without_binary.yml
@@ -21,7 +21,8 @@ env:
   COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --cov-report=xml:./coverage.xml --no-flaky-report -p no:warnings --tb=native"
 
 concurrency:
-  group: tests_without_binary-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  # TODO: Revert back to using event_name
+  group: tests_without_binary-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:

From 38171cf0fba128481831c7b2b7cdefc945fdbd3e Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:02:45 -0400
Subject: [PATCH 13/28] Try

---
 .github/workflows/tests_lmps_tncuda_python.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index 2ac03ef6a7..acb17af46c 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -35,7 +35,7 @@ env:
 
 concurrency:
   # TODO: Revert back to using event_name
-  group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lmps_tncuda_python-v2-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:

From 5d27caca2d18a596888bf7173e5c83a3d220ea29 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:33:49 -0400
Subject: [PATCH 14/28] try event name again

---
 .github/workflows/tests_lmps_tncuda_python.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index acb17af46c..c2919f06e9 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -35,7 +35,7 @@ env:
 
 concurrency:
   # TODO: Revert back to using event_name
-  group: tests_lmps_tncuda_python-v2-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lmps_tncuda_python-v2-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:

From 2a212920814bb2b370d477e967ebb0a976f94b03 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:38:10 -0400
Subject: [PATCH 15/28] try event name again

---
 .github/workflows/tests_lmps_tncuda_python.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index c2919f06e9..137745b5c2 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -35,7 +35,7 @@ env:
 
 concurrency:
   # TODO: Revert back to using event_name
-  group: tests_lmps_tncuda_python-v2-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:

From b0fb092aa9653f20a9f6c8b0ba920eb84179195c Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 15:42:07 -0400
Subject: [PATCH 16/28] Trigger CI


From d51fabc5afc0f995f5400fddd294040c1023800e Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 16:14:19 -0400
Subject: [PATCH 17/28] Update another workflow with event_name

---
 .github/workflows/tests_lgpu_cpp.yml           | 3 +--
 .github/workflows/tests_lmps_tncuda_python.yml | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index d9f2d5dd59..89c40d3ca1 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -30,8 +30,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index 137745b5c2..f2e783f6fe 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -34,7 +34,6 @@ env:
   GCC_VERSION: 11
 
 concurrency:
-  # TODO: Revert back to using event_name
   group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 

From c12f44a45b7fe0e24525339e7f869447985bd22a Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 17:06:12 -0400
Subject: [PATCH 18/28] Update another workflow with event_name

---
 .github/workflows/tests_lgpu_python.yml | 3 +--
 .github/workflows/tests_lgpumpi_cpp.yml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests_lgpu_python.yml b/.github/workflows/tests_lgpu_python.yml
index 508a198623..6ba1754483 100644
--- a/.github/workflows/tests_lgpu_python.yml
+++ b/.github/workflows/tests_lgpu_python.yml
@@ -34,8 +34,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  # TODO: Testing github.event, revert back to event_name
-  group: tests_lgpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lgpumpi_cpp.yml b/.github/workflows/tests_lgpumpi_cpp.yml
index bec6cbdcbe..dab7f44e70 100644
--- a/.github/workflows/tests_lgpumpi_cpp.yml
+++ b/.github/workflows/tests_lgpumpi_cpp.yml
@@ -29,8 +29,7 @@ env:
   CI_CUDA_ARCH: 86
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:

From 99d0edc51d9ec506bee4017817fbee64627cada9 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 17:42:09 -0400
Subject: [PATCH 19/28] Try setting PYTHONPATH for venv

---
 .github/workflows/tests_lgpu_cpp.yml           |  5 ++++-
 .github/workflows/tests_lgpu_python.yml        |  5 +++++
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 10 +++++++++-
 .github/workflows/tests_lmps_tncuda_python.yml |  7 +++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 89c40d3ca1..1586dfe215 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -108,6 +108,9 @@ jobs:
 
           # Adding venv name as an output for subsequent steps to reference if needed
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          
+          # Adding venv site-packages to output for subsequent step to referecen if needed
+          echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
 
       - name: Display Python-Path
         id: python_path
@@ -116,7 +119,7 @@ jobs:
           echo "Python Interpreter Path => $py_path"
           echo "python=$py_path" >> $GITHUB_OUTPUT
           
-          pip_path=$(which python)
+          pip_path=$(which pip)
           echo "PIP Path => $pip_path"
           echo "pip=$pip_path" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/tests_lgpu_python.yml b/.github/workflows/tests_lgpu_python.yml
index 6ba1754483..bcd24f4661 100644
--- a/.github/workflows/tests_lgpu_python.yml
+++ b/.github/workflows/tests_lgpu_python.yml
@@ -128,6 +128,11 @@ jobs:
           # Adding venv name as an output for subsequent steps to reference if needed
           source ${{ env.VENV_NAME }}/bin/activate
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          
+                    
+          # Adding venv site-packages to output for subsequent step to referecen if needed
+          echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
+
 
       - name: Display Python-Path
         id: python_path
diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index 4578b40db4..e25fc50a13 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -32,7 +32,7 @@ env:
 
 concurrency:
   # TODO: Revert back to using event_name
-  group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
@@ -116,6 +116,11 @@ jobs:
 
           # Adding venv name as an output for subsequent steps to reference if needed
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          
+                    
+          # Adding venv site-packages to output for subsequent step to referecen if needed
+          echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
+
 
       - name: Display Python-Path
         id: python_path
@@ -131,8 +136,11 @@ jobs:
         run: |
           python -m pip install ninja cmake scipy custatevec-cu${{ matrix.cuda_version }} cutensornet-cu${{ matrix.cuda_version }}
       - name: Build and run unit tests
+        env:
+          PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
           set -x
+          export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           cmake . -BBuild \
             -DCUQUANTUM_SDK=$(python -c "import site; print( f'{site.getsitepackages()[0]}/cuquantum')")\
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index f2e783f6fe..87cbdd1b89 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -121,6 +121,10 @@ jobs:
           # Adding venv name as an output for subsequent steps to reference if needed
           source ${{ env.VENV_NAME }}/bin/activate
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          
+          # Adding venv site-packages to output for subsequent step to referecen if needed
+          echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
+
 
       - name: Display Python-Path
         id: python_path
@@ -160,7 +164,10 @@ jobs:
           python -m pip uninstall -y pennylane && python -m pip install -U pennylane
   
       - name: Build and install package
+        env:
+          PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
+          export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           rm -rf build
           CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION)" \

From 615c6b606e18abdaa383cd00d8beb3312f347d47 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 17:52:44 -0400
Subject: [PATCH 20/28] Try activating venv

---
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 1 +
 .github/workflows/tests_lmps_tncuda_python.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index e25fc50a13..082ed1220a 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -139,6 +139,7 @@ jobs:
         env:
           PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
+          source ${{ steps.setup_venv.outputs.venv_name }}/bin/activate
           set -x
           export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index 87cbdd1b89..b8f6133a03 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -167,6 +167,7 @@ jobs:
         env:
           PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
+          source ${{ steps.setup_venv.outputs.venv_name }}/bin/activate
           export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           rm -rf build

From 73692fda3e0bd865748586174959807d8582328d Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:00:28 -0400
Subject: [PATCH 21/28] Try passing path to python executable

---
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 1 +
 .github/workflows/tests_lmps_tncuda_python.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index 082ed1220a..7e7b8e58b1 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -144,6 +144,7 @@ jobs:
           export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           cmake . -BBuild \
+            -DPython3_EXECUTABLE=$(which python) \
             -DCUQUANTUM_SDK=$(python -c "import site; print( f'{site.getsitepackages()[0]}/cuquantum')")\
             -DBUILD_TESTS=ON \
             -DENABLE_PYTHON=OFF \
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index b8f6133a03..dae253e959 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -171,7 +171,7 @@ jobs:
           export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           rm -rf build
-          CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION)" \
+          CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION) -DPython3_EXECUTABLE=$(which python)" \
           python -m pip install . -vv
           rm -rf build
   

From 6aad67ccc3c42f85258a24e64cb60ac710b83d39 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:07:56 -0400
Subject: [PATCH 22/28] Try passing Python_SITELIB

---
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 2 +-
 .github/workflows/tests_lmps_tncuda_python.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index 7e7b8e58b1..0e82096cf4 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -144,7 +144,7 @@ jobs:
           export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           cmake . -BBuild \
-            -DPython3_EXECUTABLE=$(which python) \
+            -DPython_SITELIB=$PY_VENV_SITE_PACKAGES \
             -DCUQUANTUM_SDK=$(python -c "import site; print( f'{site.getsitepackages()[0]}/cuquantum')")\
             -DBUILD_TESTS=ON \
             -DENABLE_PYTHON=OFF \
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index dae253e959..3fe4c4c695 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -171,7 +171,7 @@ jobs:
           export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           rm -rf build
-          CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION) -DPython3_EXECUTABLE=$(which python)" \
+          CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION) -DPython_SITELIB=$PY_VENV_SITE_PACKAGES \" \
           python -m pip install . -vv
           rm -rf build
   

From 330527191e5381da5f6be00bd9efe87b9c5287a2 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:19:46 -0400
Subject: [PATCH 23/28] Try setting Python(3)_ROOT_DIR

---
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 2 ++
 .github/workflows/tests_lmps_tncuda_python.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index 0e82096cf4..09ad7c7c94 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -137,6 +137,8 @@ jobs:
           python -m pip install ninja cmake scipy custatevec-cu${{ matrix.cuda_version }} cutensornet-cu${{ matrix.cuda_version }}
       - name: Build and run unit tests
         env:
+          Python_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
+          Python3_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
           PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
           source ${{ steps.setup_venv.outputs.venv_name }}/bin/activate
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index 3fe4c4c695..ef4238aa97 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -165,6 +165,8 @@ jobs:
   
       - name: Build and install package
         env:
+          Python_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
+          Python3_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
           PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
           source ${{ steps.setup_venv.outputs.venv_name }}/bin/activate

From 3e31f5beec07cb2aa441a55550ebebb4ad3bb692 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:20:05 -0400
Subject: [PATCH 24/28] Fix

---
 .github/workflows/tests_lmps_tncuda_python.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index ef4238aa97..c43b91d5cd 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -173,7 +173,7 @@ jobs:
           export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           rm -rf build
-          CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION) -DPython_SITELIB=$PY_VENV_SITE_PACKAGES \" \
+          CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION)" \
           python -m pip install . -vv
           rm -rf build
   

From 627e43a40d1f3f281fae12b6f8241c75f99dc6cb Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:35:04 -0400
Subject: [PATCH 25/28] Set Python_ROOT_DIR, in more workflows

---
 .github/workflows/tests_lgpu_cpp.yml           | 2 ++
 .github/workflows/tests_lgpu_python.yml        | 2 ++
 .github/workflows/tests_lgpumpi_cpp.yml        | 2 ++
 .github/workflows/tests_lgpumpi_python.yml     | 5 +++--
 .github/workflows/tests_lmps_tncuda_cpp.yml    | 9 ++-------
 .github/workflows/tests_lmps_tncuda_python.yml | 8 ++------
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 1586dfe215..478c1efa40 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -108,6 +108,8 @@ jobs:
 
           # Adding venv name as an output for subsequent steps to reference if needed
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
           
           # Adding venv site-packages to output for subsequent step to referecen if needed
           echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/tests_lgpu_python.yml b/.github/workflows/tests_lgpu_python.yml
index bcd24f4661..f806727401 100644
--- a/.github/workflows/tests_lgpu_python.yml
+++ b/.github/workflows/tests_lgpu_python.yml
@@ -128,6 +128,8 @@ jobs:
           # Adding venv name as an output for subsequent steps to reference if needed
           source ${{ env.VENV_NAME }}/bin/activate
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
           
                     
           # Adding venv site-packages to output for subsequent step to referecen if needed
diff --git a/.github/workflows/tests_lgpumpi_cpp.yml b/.github/workflows/tests_lgpumpi_cpp.yml
index dab7f44e70..78254ae346 100644
--- a/.github/workflows/tests_lgpumpi_cpp.yml
+++ b/.github/workflows/tests_lgpumpi_cpp.yml
@@ -85,6 +85,8 @@ jobs:
 
           # Adding venv name as an output for subsequent steps to reference if needed
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
 
       - name: Display Python-Path
         id: python_path
diff --git a/.github/workflows/tests_lgpumpi_python.yml b/.github/workflows/tests_lgpumpi_python.yml
index 66e57e4a6a..e92ee8aee7 100644
--- a/.github/workflows/tests_lgpumpi_python.yml
+++ b/.github/workflows/tests_lgpumpi_python.yml
@@ -30,8 +30,7 @@ env:
   CI_CUDA_ARCH: 86
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
@@ -91,6 +90,8 @@ jobs:
           # Adding venv name as an output for subsequent steps to reference if needed
           source ${{ env.VENV_NAME }}/bin/activate
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
 
 
       - name: Display Python-Path
diff --git a/.github/workflows/tests_lmps_tncuda_cpp.yml b/.github/workflows/tests_lmps_tncuda_cpp.yml
index 09ad7c7c94..583272a530 100644
--- a/.github/workflows/tests_lmps_tncuda_cpp.yml
+++ b/.github/workflows/tests_lmps_tncuda_cpp.yml
@@ -116,6 +116,8 @@ jobs:
 
           # Adding venv name as an output for subsequent steps to reference if needed
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
           
                     
           # Adding venv site-packages to output for subsequent step to referecen if needed
@@ -136,17 +138,10 @@ jobs:
         run: |
           python -m pip install ninja cmake scipy custatevec-cu${{ matrix.cuda_version }} cutensornet-cu${{ matrix.cuda_version }}
       - name: Build and run unit tests
-        env:
-          Python_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
-          Python3_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
-          PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
-          source ${{ steps.setup_venv.outputs.venv_name }}/bin/activate
           set -x
-          export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           cmake . -BBuild \
-            -DPython_SITELIB=$PY_VENV_SITE_PACKAGES \
             -DCUQUANTUM_SDK=$(python -c "import site; print( f'{site.getsitepackages()[0]}/cuquantum')")\
             -DBUILD_TESTS=ON \
             -DENABLE_PYTHON=OFF \
diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml
index c43b91d5cd..3e9f6a1d92 100644
--- a/.github/workflows/tests_lmps_tncuda_python.yml
+++ b/.github/workflows/tests_lmps_tncuda_python.yml
@@ -121,6 +121,8 @@ jobs:
           # Adding venv name as an output for subsequent steps to reference if needed
           source ${{ env.VENV_NAME }}/bin/activate
           echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
           
           # Adding venv site-packages to output for subsequent step to referecen if needed
           echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
@@ -164,13 +166,7 @@ jobs:
           python -m pip uninstall -y pennylane && python -m pip install -U pennylane
   
       - name: Build and install package
-        env:
-          Python_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
-          Python3_ROOT_DIR: ${{ steps.setup_venv.outputs.venv_name }}
-          PY_VENV_SITE_PACKAGES: ${{ steps.setup_venv.outputs.site_packages_dir }}
         run: |
-          source ${{ steps.setup_venv.outputs.venv_name }}/bin/activate
-          export PYTHONPATH="$VENV_SITE_PACKAGES:$PYTHONPATH"
           cd main
           rm -rf build
           CMAKE_ARGS="-DPL_BACKEND=${{ matrix.default_backend }} -DCMAKE_CXX_COMPILER=$(which g++-$GCC_VERSION)" \

From ccbd1cb31c5f51e1973f18dcb598ab92aef02290 Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:49:40 -0400
Subject: [PATCH 26/28] Move over workflows over to using event_name. Install
 scipy for lgpu_cpp

---
 .github/workflows/tests_lgpu_cpp.yml       |  2 +-
 .github/workflows/tests_linux_cpp.yml      |  3 +--
 .github/workflows/tests_lkcpu_python.yml   |  3 +--
 .github/workflows/tests_lkcuda_cpp.yml     |  3 +--
 .github/workflows/tests_lkcuda_python.yml  | 30 ++++++++++++++++++++--
 .github/workflows/tests_lqcpu_python.yml   |  3 +--
 .github/workflows/tests_windows_cpp.yml    |  3 +--
 .github/workflows/tests_without_binary.yml |  3 +--
 8 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/tests_lgpu_cpp.yml b/.github/workflows/tests_lgpu_cpp.yml
index 478c1efa40..75c18a276d 100644
--- a/.github/workflows/tests_lgpu_cpp.yml
+++ b/.github/workflows/tests_lgpu_cpp.yml
@@ -127,7 +127,7 @@ jobs:
 
       - name: Install required packages
         run: |
-          python -m pip install ninja cmake custatevec-cu${{ matrix.cuda_version }}
+          python -m pip install ninja cmake custatevec-cu${{ matrix.cuda_version }} scipy
           sudo apt-get -y -q install liblapack-dev black
 
       - name: Build and run unit tests
diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml
index 9d069a3aac..34d1184d10 100644
--- a/.github/workflows/tests_linux_cpp.yml
+++ b/.github/workflows/tests_linux_cpp.yml
@@ -30,8 +30,7 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_linux_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_linux_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcpu_python.yml b/.github/workflows/tests_lkcpu_python.yml
index cffc45b738..7efc1df00c 100644
--- a/.github/workflows/tests_lkcpu_python.yml
+++ b/.github/workflows/tests_lkcpu_python.yml
@@ -34,8 +34,7 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_lkcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lkcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcuda_cpp.yml b/.github/workflows/tests_lkcuda_cpp.yml
index e1a8ddef47..f489f937d7 100644
--- a/.github/workflows/tests_lkcuda_cpp.yml
+++ b/.github/workflows/tests_lkcuda_cpp.yml
@@ -29,8 +29,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_lkcuda_python.yml b/.github/workflows/tests_lkcuda_python.yml
index f43a2d0622..1ca076c16c 100644
--- a/.github/workflows/tests_lkcuda_python.yml
+++ b/.github/workflows/tests_lkcuda_python.yml
@@ -33,8 +33,7 @@ env:
   TORCH_VERSION: 1.11.0+cpu
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_lkcuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lkcuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
@@ -174,6 +173,33 @@ jobs:
         with:
           python-version: '3.9'
 
+      # Since the self-hosted runner can be re-used. It is best to set up all package
+      # installations in a virtual environment that gets cleaned at the end of each workflow run
+      - name: Setup Python virtual environment
+        id: setup_venv
+        env:
+          VENV_NAME: ${{ github.workspace }}/venv_${{ steps.setup_python.outputs.python-version }}_${{ github.sha }}
+        run: |
+          # Clear any pre-existing venvs
+          rm -rf venv_*
+
+          # Create new venv for this workflow_run
+          python --version
+          python -m venv ${{ env.VENV_NAME }}
+
+          # Add the venv to PATH for subsequent steps
+          echo ${{ env.VENV_NAME }}/bin >> $GITHUB_PATH
+
+          # Adding venv name as an output for subsequent steps to reference if needed
+          echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+
+
+          # Adding venv site-packages to output for subsequent step to referecen if needed
+          echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
+
+
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION  g++-$GCC_VERSION
 
diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml
index 93d51c5065..c3b2ad322f 100644
--- a/.github/workflows/tests_lqcpu_python.yml
+++ b/.github/workflows/tests_lqcpu_python.yml
@@ -24,8 +24,7 @@ env:
   OMP_PROC_BIND: "false"
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_lqcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_lqcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_windows_cpp.yml b/.github/workflows/tests_windows_cpp.yml
index 9478fcbb83..2faccc0831 100644
--- a/.github/workflows/tests_windows_cpp.yml
+++ b/.github/workflows/tests_windows_cpp.yml
@@ -20,8 +20,7 @@ on:
       - '!pennylane_lightning/core/src/simulators/lightning_gpu/**'
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_windows_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_windows_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/tests_without_binary.yml b/.github/workflows/tests_without_binary.yml
index 8a97719262..919e162a4b 100644
--- a/.github/workflows/tests_without_binary.yml
+++ b/.github/workflows/tests_without_binary.yml
@@ -21,8 +21,7 @@ env:
   COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --cov-report=xml:./coverage.xml --no-flaky-report -p no:warnings --tb=native"
 
 concurrency:
-  # TODO: Revert back to using event_name
-  group: tests_without_binary-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
+  group: tests_without_binary-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
   cancel-in-progress: true
 
 jobs:

From c336aa5a9e51bda40b1c396a74e257d90d8bd75c Mon Sep 17 00:00:00 2001
From: Rashid N H M <95639609+rashidnhm@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:19:39 -0400
Subject: [PATCH 27/28] Add venv to final workflow

---
 .github/workflows/tests_lkcuda_cpp.yml | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/tests_lkcuda_cpp.yml b/.github/workflows/tests_lkcuda_cpp.yml
index f489f937d7..eb95afa76e 100644
--- a/.github/workflows/tests_lkcuda_cpp.yml
+++ b/.github/workflows/tests_lkcuda_cpp.yml
@@ -153,6 +153,33 @@ jobs:
         with:
           python-version: '3.9'
 
+      # Since the self-hosted runner can be re-used. It is best to set up all package
+      # installations in a virtual environment that gets cleaned at the end of each workflow run
+      - name: Setup Python virtual environment
+        id: setup_venv
+        env:
+          VENV_NAME: ${{ github.workspace }}/venv_${{ steps.setup_python.outputs.python-version }}_${{ github.sha }}
+        run: |
+          # Clear any pre-existing venvs
+          rm -rf venv_*
+
+          # Create new venv for this workflow_run
+          python --version
+          python -m venv ${{ env.VENV_NAME }}
+
+          # Add the venv to PATH for subsequent steps
+          echo ${{ env.VENV_NAME }}/bin >> $GITHUB_PATH
+
+          # Adding venv name as an output for subsequent steps to reference if needed
+          echo "venv_name=${{ env.VENV_NAME }}" >> $GITHUB_OUTPUT
+          echo "Python_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+          echo "Python3_ROOT_DIR=${{ env.VENV_NAME }}" >> $GITHUB_ENV
+
+
+          # Adding venv site-packages to output for subsequent step to referecen if needed
+          echo "site_packages_dir=$(${{ env.VENV_NAME }}/bin/python -c 'import sysconfig; print(sysconfig.get_path("platlib"))')" >> $GITHUB_OUTPUT
+
+
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION  g++-$GCC_VERSION  ninja-build gcovr lcov
 

From e94b402c3879f935b56cadbb14d3414da576d163 Mon Sep 17 00:00:00 2001
From: ringo-but-quantum <github-ringo-but-quantum@xanadu.ai>
Date: Wed, 3 Jul 2024 14:31:47 +0000
Subject: [PATCH 28/28] Auto update version from '0.37.0-dev50' to
 '0.37.0-dev51'

---
 pennylane_lightning/core/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py
index 9a871e864f..3d439e251c 100644
--- a/pennylane_lightning/core/_version.py
+++ b/pennylane_lightning/core/_version.py
@@ -16,4 +16,4 @@
    Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.37.0-dev50"
+__version__ = "0.37.0-dev51"