From 4c79f8f52933fb854330362ad7cf6eb92c30d149 Mon Sep 17 00:00:00 2001 From: Joey Carter Date: Thu, 2 Jan 2025 13:50:12 -0500 Subject: [PATCH 1/4] Exclude OQD packages, modules and data from wheels --- MANIFEST.in | 1 - Makefile | 2 -- setup.py | 7 +++++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 49183a875b..6452376cfd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,4 +3,3 @@ recursive-include frontend/catalyst/lib * recursive-include frontend/catalyst/enzyme * recursive-include frontend/mlir_quantum * recursive-include frontend/catalyst/third_party/cuda/ *.toml -recursive-include frontend/catalyst/third_party/oqd/ *.toml diff --git a/Makefile b/Makefile index 1fc7b8908d..5f2d4de540 100644 --- a/Makefile +++ b/Makefile @@ -194,8 +194,6 @@ wheel: cp $(OQC_BUILD_DIR)/librtd_oqc* $(MK_DIR)/frontend/catalyst/lib cp $(OQC_BUILD_DIR)/oqc_python_module.so $(MK_DIR)/frontend/catalyst/lib cp $(OQC_BUILD_DIR)/backend/*.toml $(MK_DIR)/frontend/catalyst/lib/backend - cp $(OQD_BUILD_DIR)/librtd_oqd* $(MK_DIR)/frontend/catalyst/lib - cp $(OQD_BUILD_DIR)/backend/*.toml $(MK_DIR)/frontend/catalyst/lib/backend cp $(COPY_FLAGS) $(LLVM_BUILD_DIR)/lib/libmlir_float16_utils.* $(MK_DIR)/frontend/catalyst/lib cp $(COPY_FLAGS) $(LLVM_BUILD_DIR)/lib/libmlir_c_runner_utils.* $(MK_DIR)/frontend/catalyst/lib cp $(COPY_FLAGS) $(LLVM_BUILD_DIR)/lib/libmlir_async_runtime.* $(MK_DIR)/frontend/catalyst/lib diff --git a/setup.py b/setup.py index 0926063144..89fb29027f 100644 --- a/setup.py +++ b/setup.py @@ -84,7 +84,6 @@ entry_points = { "pennylane.plugins": [ "oqc.cloud = catalyst.third_party.oqc:OQCDevice", - "oqd = catalyst.third_party.oqd:OQDDevice", "softwareq.qpp = catalyst.third_party.cuda:SoftwareQQPP", "nvidia.custatevec = catalyst.third_party.cuda:NvidiaCuStateVec", "nvidia.cutensornet = catalyst.third_party.cuda:NvidiaCuTensorNet", @@ -331,7 +330,11 @@ def run(self): packages=find_namespace_packages( where="frontend", include=["catalyst", "catalyst.*", "mlir_quantum"], - exclude=["catalyst.third_party.oqc.*"], + exclude=[ + "catalyst.third_party.oqc.*", + "catalyst.third_party.oqd.*", # Exclude OQD packages and modules from wheels + "catalyst.third_party.oqd", # as they are still under development + ], ), package_dir={"": "frontend"}, include_package_data=True, From bdbfa0a69f54b1c249ac75b546324c21ec7eab8b Mon Sep 17 00:00:00 2001 From: Joey Carter Date: Thu, 2 Jan 2025 13:51:20 -0500 Subject: [PATCH 2/4] Remove OQD device from docs --- doc/dev/devices.rst | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/doc/dev/devices.rst b/doc/dev/devices.rst index e030285439..7e86b5f1a4 100644 --- a/doc/dev/devices.rst +++ b/doc/dev/devices.rst @@ -95,16 +95,3 @@ Supported backend devices include: See the `Catalyst configuration file `__ for natively supported instructions. - - * - ``oqd.default`` - - - Experimental support for execution on `Open Quantum Design (OQD) `__ - trapped-ion hardware. To use OQD with Catalyst, use the ``backend`` argument to specify the - OQD backend to use when initializing the device: - - .. code-block:: python - - dev = qml.device("oqd", backend="default", shots=1024, wires=2) - - See the `Catalyst configuration file `__ - for natively supported instructions. From 29747934f8bf95b0adb7b973e4cc0f48eb3ed603 Mon Sep 17 00:00:00 2001 From: Joey Carter Date: Thu, 2 Jan 2025 14:08:42 -0500 Subject: [PATCH 3/4] Clarify comment in setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 89fb29027f..704e89029c 100644 --- a/setup.py +++ b/setup.py @@ -332,8 +332,8 @@ def run(self): include=["catalyst", "catalyst.*", "mlir_quantum"], exclude=[ "catalyst.third_party.oqc.*", - "catalyst.third_party.oqd.*", # Exclude OQD packages and modules from wheels - "catalyst.third_party.oqd", # as they are still under development + "catalyst.third_party.oqd.*", + "catalyst.third_party.oqd", # Exclude OQD from wheels as it is still under development ], ), package_dir={"": "frontend"}, From da3fa3fb5aa170e0577546245fb75ca73aa73c47 Mon Sep 17 00:00:00 2001 From: Joey Carter Date: Thu, 2 Jan 2025 14:17:59 -0500 Subject: [PATCH 4/4] Update changelog --- doc/releases/changelog-dev.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/releases/changelog-dev.md b/doc/releases/changelog-dev.md index 2b90faf3ab..9ad809e758 100644 --- a/doc/releases/changelog-dev.md +++ b/doc/releases/changelog-dev.md @@ -168,6 +168,10 @@ * A default backend for OQD trapped-ion quantum devices has been added. [(#1355)](https://github.com/PennyLaneAI/catalyst/pull/1355) + [(#1403)](https://github.com/PennyLaneAI/catalyst/pull/1355) + + Support for OQD devices is still under development, therefore the OQD modules are currently not + included in the distributed wheels. * `expval` and `var` operations no longer keep the static shots attribute, as a step towards supporting dynamic shots across catalyst. [(#1360)](https://github.com/PennyLaneAI/catalyst/pull/1360)