Skip to content

Commit

Permalink
Merge branch 'main' into jcjaskula-aws/add_u_gate
Browse files Browse the repository at this point in the history
  • Loading branch information
jcjaskula-aws committed Nov 19, 2023
2 parents 7a52eb8 + 44a2bbb commit d8917f3
Show file tree
Hide file tree
Showing 8 changed files with 687 additions and 92 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## v1.62.1 (2023-11-17)

### Bug Fixes and Other Changes

* Fix broken link to example notebook
* update: default no longer returning RETIRED devices from get_devices

### Documentation Changes

* Add matrix expressions to docstrings

## v1.62.0 (2023-11-09)

### Features
Expand Down
2 changes: 1 addition & 1 deletion doc/examples-hybrid-jobs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Learn more about hybrid jobs on Amazon Braket.
:maxdepth: 2

************************************************************************************************************************************************************************************************
`Creating your first Hybrid Job <https://github.com/amazon-braket/amazon-braket-examples/blob/main/examples/hybrid_jobs/0_Creating_your_first_Hybrid_Job/Creating_your_first_Hybrid_Job.ipynb>`_
`Creating your first Hybrid Job <https://github.com/amazon-braket/amazon-braket-examples/blob/main/examples/hybrid_jobs/0_Creating_your_first_Hybrid_Job/0_Creating_your_first_Hybrid_Job.ipynb>`_
************************************************************************************************************************************************************************************************

This tutorial shows how to run your first Amazon Braket Hybrid Job.
Expand Down
2 changes: 1 addition & 1 deletion src/braket/_sdk/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "1.62.1.dev0"
__version__ = "1.62.2.dev0"
12 changes: 7 additions & 5 deletions src/braket/aws/aws_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,13 +564,15 @@ def get_devices(
>>> AwsDevice.get_devices(types=['SIMULATOR'])
Args:
arns (Optional[list[str]]): device ARN list, default is `None`
names (Optional[list[str]]): device name list, default is `None`
types (Optional[list[AwsDeviceType]]): device type list, default is `None`
arns (Optional[list[str]]): device ARN filter, default is `None`
names (Optional[list[str]]): device name filter, default is `None`
types (Optional[list[AwsDeviceType]]): device type filter, default is `None`
QPUs will be searched for all regions and simulators will only be
searched for the region of the current session.
statuses (Optional[list[str]]): device status list, default is `None`
provider_names (Optional[list[str]]): provider name list, default is `None`
statuses (Optional[list[str]]): device status filter, default is `None`. When `None`
is used, RETIRED devices will not be returned. To include RETIRED devices in
the results, use a filter that includes "RETIRED" for this parameter.
provider_names (Optional[list[str]]): provider name filter, default is `None`
order_by (str): field to order result by, default is `name`.
Accepted values are ['arn', 'name', 'type', 'provider_name', 'status']
aws_session (Optional[AwsSession]): An AWS session object.
Expand Down
12 changes: 8 additions & 4 deletions src/braket/aws/aws_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,12 @@ def search_devices(
all the filters `arns`, `names`, `types`, `statuses`, `provider_names`.
Args:
arns (Optional[list[str]]): device ARN list, default is `None`.
names (Optional[list[str]]): device name list, default is `None`.
types (Optional[list[str]]): device type list, default is `None`.
statuses (Optional[list[str]]): device status list, default is `None`.
arns (Optional[list[str]]): device ARN filter, default is `None`.
names (Optional[list[str]]): device name filter, default is `None`.
types (Optional[list[str]]): device type filter, default is `None`.
statuses (Optional[list[str]]): device status filter, default is `None`. When `None`
is used, RETIRED devices will not be returned. To include RETIRED devices in
the results, use a filter that includes "RETIRED" for this parameter.
provider_names (Optional[list[str]]): provider name list, default is `None`.
Returns:
Expand All @@ -645,6 +647,8 @@ def search_devices(
continue
if statuses and result["deviceStatus"] not in statuses:
continue
if statuses is None and result["deviceStatus"] == "RETIRED":
continue
if provider_names and result["providerName"] not in provider_names:
continue
results.append(result)
Expand Down
Loading

0 comments on commit d8917f3

Please sign in to comment.