From 84812163972250fbf8ebc80aa9bf8a3ba8efda62 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:40:01 -0400
Subject: [PATCH 01/12] Add local sim precompilation to container build steps

---
 nbi/buildspec.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index 88cc81d73..bd6e4f1a6 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -28,6 +28,8 @@ phases:
       - mkdir -p envs
       - conda config --set path_conflict warn
       - conda env create --name $BRAKET_ENV -f environment.yml --no-default-package --solver libmamba
+      - conda activate $BRAKET_ENV
+      - python -c "import braket.simulator_v2"
       - pip cache purge
       - conda pack --quiet --name $BRAKET_ENV --output envs/Braket.tar --compress-level 1 --n-threads -1
       - zstd -16 envs/Braket.tar -T0 --auto-threads=logical --rsyncable --sparse

From d1ce23e4f5951060f3d12467a515fad2c19cd17d Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:50:01 -0400
Subject: [PATCH 02/12] Add source activate command

---
 nbi/buildspec.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index bd6e4f1a6..e41679b56 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -22,13 +22,14 @@ phases:
       - conda config --set channel_priority strict
       - conda config --set solver libmamba
       - conda install -y -q --freeze-installed -c conda-forge conda-pack=0.7.1
+      - conda init bash
   build:
     commands:
       - BRAKET_ENV=Braket
       - mkdir -p envs
       - conda config --set path_conflict warn
       - conda env create --name $BRAKET_ENV -f environment.yml --no-default-package --solver libmamba
-      - conda activate $BRAKET_ENV
+      - source activate base && conda activate $BRAKET_ENV
       - python -c "import braket.simulator_v2"
       - pip cache purge
       - conda pack --quiet --name $BRAKET_ENV --output envs/Braket.tar --compress-level 1 --n-threads -1

From 9dbd34ca2decb5753896304553dcab0e8677de98 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:56:38 -0400
Subject: [PATCH 03/12] Combine activate and import commands

---
 nbi/buildspec.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index e41679b56..64dbfa307 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -29,8 +29,7 @@ phases:
       - mkdir -p envs
       - conda config --set path_conflict warn
       - conda env create --name $BRAKET_ENV -f environment.yml --no-default-package --solver libmamba
-      - source activate base && conda activate $BRAKET_ENV
-      - python -c "import braket.simulator_v2"
+      - source activate base && conda activate $BRAKET_ENV && python -c "import braket.simulator_v2"
       - pip cache purge
       - conda pack --quiet --name $BRAKET_ENV --output envs/Braket.tar --compress-level 1 --n-threads -1
       - zstd -16 envs/Braket.tar -T0 --auto-threads=logical --rsyncable --sparse

From 838c89b77d9fd5e9326c8d31d161cb7c55f09e90 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:04:45 -0400
Subject: [PATCH 04/12] Add v2 local sim to requirements.txt

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 36061f866..36dc2e7e6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@ botocore==1.34.113
 awscli==1.32.113
 boto3==1.34.113
 amazon-braket-default-simulator==1.23.2
+amazon-braket-simulator-v2==0.2.2
 amazon-braket-pennylane-plugin==1.27.3
 amazon-braket-schemas==1.22.0
 amazon-braket-sdk==1.80.0

From 4547a2565c9eef347ced8459a806ae2dad215458 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:14:48 -0400
Subject: [PATCH 05/12] Remove unnecessary command

---
 nbi/buildspec.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index 64dbfa307..9e3d4fd2a 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -22,7 +22,6 @@ phases:
       - conda config --set channel_priority strict
       - conda config --set solver libmamba
       - conda install -y -q --freeze-installed -c conda-forge conda-pack=0.7.1
-      - conda init bash
   build:
     commands:
       - BRAKET_ENV=Braket

From 2ed75a411ab9eb7b9a224b5fd4d664f73797cac3 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:29:31 -0400
Subject: [PATCH 06/12] Update pip requirements

---
 requirements.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 36dc2e7e6..de72b5eff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,17 +1,19 @@
 botocore==1.34.113
 awscli==1.32.113
 boto3==1.34.113
-amazon-braket-default-simulator==1.23.2
+amazon-braket-default-simulator==1.26.0
 amazon-braket-simulator-v2==0.2.2
 amazon-braket-pennylane-plugin==1.27.3
 amazon-braket-schemas==1.22.0
-amazon-braket-sdk==1.80.0
+amazon-braket-sdk==1.84.0
 amazon-braket-algorithm-library==1.4.11
 cvxpy==1.5.1
 ipykernel==6.29.4
 jax==0.4.28
 jaxlib==0.4.28
 jinja2==3.1.4
+juliacall==0.9.20
+juliapkg==0.1.13
 markupsafe==2.1.5
 matplotlib==3.9.0
 ml-dtypes==0.4.0
@@ -29,4 +31,5 @@ qiskit-braket-provider==0.4.0
 qiskit==1.0.2
 scipy==1.13.1
 scs<3.2.6 # Pinned for GLIBC 2.26 compatability
+semver==3.0.2
 sympy<1.13 # Sympy 1.13 produces different results for Simon's algorithm

From 23b14d0aca9497be8a0c9f3e8c284854f50de4cd Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:41:39 -0400
Subject: [PATCH 07/12] Use allowed name for FreeParameter

---
 examples/pulse_control/1_Bringup_experiments.ipynb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/pulse_control/1_Bringup_experiments.ipynb b/examples/pulse_control/1_Bringup_experiments.ipynb
index 326e2f526..9ec6fbfb2 100644
--- a/examples/pulse_control/1_Bringup_experiments.ipynb
+++ b/examples/pulse_control/1_Bringup_experiments.ipynb
@@ -461,12 +461,12 @@
     "detuning=250e3\n",
     "x90 = experiment_configuration[device_name][\"x90_wf\"]\n",
     "\n",
-    "delay = FreeParameter(\"delay\")\n",
+    "delay_duration = FreeParameter(\"delay_duration\")\n",
     "ramsey_spectroscopy = ( \n",
     "    PulseSequence()\n",
     "    .set_frequency(drive_frame, drive_frame.frequency - detuning)\n",
     "    .play(drive_frame, x90)\n",
-    "    .delay(drive_frame, delay)\n",
+    "    .delay(drive_frame, delay_duration)\n",
     "    .play(drive_frame, x90)\n",
     "    .capture_v0(readout_frame)\n",
     ")"
@@ -491,7 +491,7 @@
     "delays = np.arange(start_delay, end_delay, 512e-9)\n",
     "N_shots=100\n",
     "\n",
-    "pulse_sequences = [ramsey_spectroscopy(delay=delay) for delay in delays]\n",
+    "pulse_sequences = [ramsey_spectroscopy(delay_duration=delay_duration) for delay in delays]\n",
     "\n",
     "batch = device.run_batch(pulse_sequences, shots=N_shots)"
    ]

From af7353250ff9598aeeddeb6eed14f9d002dbc2b7 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Mon, 12 Aug 2024 14:14:37 -0400
Subject: [PATCH 08/12] Fix CI errors

---
 examples/pulse_control/1_Bringup_experiments.ipynb | 2 +-
 requirements.txt                                   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/pulse_control/1_Bringup_experiments.ipynb b/examples/pulse_control/1_Bringup_experiments.ipynb
index 9ec6fbfb2..f1f81673f 100644
--- a/examples/pulse_control/1_Bringup_experiments.ipynb
+++ b/examples/pulse_control/1_Bringup_experiments.ipynb
@@ -491,7 +491,7 @@
     "delays = np.arange(start_delay, end_delay, 512e-9)\n",
     "N_shots=100\n",
     "\n",
-    "pulse_sequences = [ramsey_spectroscopy(delay_duration=delay_duration) for delay in delays]\n",
+    "pulse_sequences = [ramsey_spectroscopy(delay_duration=delay) for delay in delays]\n",
     "\n",
     "batch = device.run_batch(pulse_sequences, shots=N_shots)"
    ]
diff --git a/requirements.txt b/requirements.txt
index de72b5eff..27bc68731 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,10 +25,11 @@ optax==0.2.2
 pandas==2.2.2
 pennylane==0.35.1
 PennyLane-Lightning==0.35.1
-qiskit-aer==0.14.0.1
+qiskit-aer==0.14.2
 qiskit-algorithms==0.3.0
-qiskit-braket-provider==0.4.0
-qiskit==1.0.2
+qiskit-braket-provider==0.4.1
+qiskit-ionq==0.5.4
+qiskit==1.1.2
 scipy==1.13.1
 scs<3.2.6 # Pinned for GLIBC 2.26 compatability
 semver==3.0.2

From 93ad393c92ee5a3894058689fe277977a42102ff Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:52:45 -0400
Subject: [PATCH 09/12] Set Julia env vars for conda env

---
 nbi/buildspec.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index 9e3d4fd2a..d09e25d6e 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -28,6 +28,10 @@ phases:
       - mkdir -p envs
       - conda config --set path_conflict warn
       - conda env create --name $BRAKET_ENV -f environment.yml --no-default-package --solver libmamba
+      - export PYTHON_JULIAPKG_PROJECT=$HOME/anaconda3/envs/$BRAKET_ENV/julia_env
+      - export CONDA_JL_HOME=$HOME/anaconda3/envs/$BRAKET_ENV
+      - export JULIA_CONDAPKG_ENV=$HOME/anaconda3/envs/$BRAKET_ENV
+      - export JULIA_CONDAPKG_BACKEND=Current
       - source activate base && conda activate $BRAKET_ENV && python -c "import braket.simulator_v2"
       - pip cache purge
       - conda pack --quiet --name $BRAKET_ENV --output envs/Braket.tar --compress-level 1 --n-threads -1

From 0950141638047a819c30d7e7f98d626e349c2f82 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:18:00 -0400
Subject: [PATCH 10/12] Use miniconda install dir for Julia env vars

---
 nbi/buildspec.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index d09e25d6e..52bdc2c02 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -28,9 +28,9 @@ phases:
       - mkdir -p envs
       - conda config --set path_conflict warn
       - conda env create --name $BRAKET_ENV -f environment.yml --no-default-package --solver libmamba
-      - export PYTHON_JULIAPKG_PROJECT=$HOME/anaconda3/envs/$BRAKET_ENV/julia_env
-      - export CONDA_JL_HOME=$HOME/anaconda3/envs/$BRAKET_ENV
-      - export JULIA_CONDAPKG_ENV=$HOME/anaconda3/envs/$BRAKET_ENV
+      - export PYTHON_JULIAPKG_PROJECT=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/julia_env
+      - export CONDA_JL_HOME=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV
+      - export JULIA_CONDAPKG_ENV=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV
       - export JULIA_CONDAPKG_BACKEND=Current
       - source activate base && conda activate $BRAKET_ENV && python -c "import braket.simulator_v2"
       - pip cache purge

From bab72db5ca1773cc459ea74a2e2a2f623c2ce64f Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:55:57 -0400
Subject: [PATCH 11/12] Set JULIA_HOME and JULIA_PKGDIR

---
 nbi/buildspec.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index 52bdc2c02..33de52ecd 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -28,7 +28,9 @@ phases:
       - mkdir -p envs
       - conda config --set path_conflict warn
       - conda env create --name $BRAKET_ENV -f environment.yml --no-default-package --solver libmamba
+      - export JULIA_HOME=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/julia_env/pyjuliapkg/install/bin
       - export PYTHON_JULIAPKG_PROJECT=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/julia_env
+      - export JULIA_PKGDIR=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/.julia
       - export CONDA_JL_HOME=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV
       - export JULIA_CONDAPKG_ENV=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV
       - export JULIA_CONDAPKG_BACKEND=Current

From 638f0df6fa26d11ce4d507e6b53a229df48f3385 Mon Sep 17 00:00:00 2001
From: Ryan Shaffer <3620100+rmshaffer@users.noreply.github.com>
Date: Tue, 13 Aug 2024 17:14:54 -0400
Subject: [PATCH 12/12] Set JULIA_DEPOT_PATH

---
 nbi/buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nbi/buildspec.yml b/nbi/buildspec.yml
index 33de52ecd..4b6f66b62 100644
--- a/nbi/buildspec.yml
+++ b/nbi/buildspec.yml
@@ -30,7 +30,7 @@ phases:
       - conda env create --name $BRAKET_ENV -f environment.yml --no-default-package --solver libmamba
       - export JULIA_HOME=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/julia_env/pyjuliapkg/install/bin
       - export PYTHON_JULIAPKG_PROJECT=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/julia_env
-      - export JULIA_PKGDIR=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/.julia
+      - export JULIA_DEPOT_PATH=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV/.julia
       - export CONDA_JL_HOME=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV
       - export JULIA_CONDAPKG_ENV=$LCC_MINICONDA_INSTALL_DIR/envs/$BRAKET_ENV
       - export JULIA_CONDAPKG_BACKEND=Current