Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for current dev version of qutip #46

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Support for current dev version of qutip #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90e54eb
Update setup.cfg
dstrbad Mar 30, 2023
a381bfc
Update pyproject.toml
dstrbad Mar 30, 2023
d935bc6
fix ValueError exception due to QuTiPv5 changes
dstrbad Mar 30, 2023
bb8f8f6
Update .cirun.yml
dstrbad Mar 30, 2023
99d043e
Update .cirun.yml
dstrbad Mar 30, 2023
fae93af
Update tests-gpu.yml
dstrbad Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .cirun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,20 @@ runners:
instance_type: g4dn.xlarge # Cheapest VM on AWS
# Amazon AMI: Deep Learning AMI GPU CUDA 11.2.1 (Ubuntu 20.04) 20210625
# for eu-west-1
machine_image: ami-07b138161bedd526d
machine_image: ami-00ac0c28c01352e53
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you find the name and region for the new AMI and update the comment above? Note that we need the AMI for eu-west-1 (I think).

preemptible: false
workflow: .github/workflows/tests-gpu.yml
count: 1
labels:
- gpu
- "cirun-gpu-runner"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did the label name change?


- name: docs-gpu-runner
cloud: aws
region: eu-west-1
instance_type: g4dn.xlarge # Cheapest VM on AWS
# Amazon AMI: Deep Learning AMI GPU CUDA 11.2.1 (Ubuntu 20.04) 20210625
# for eu-west-1
machine_image: ami-07b138161bedd526d
machine_image: ami-00ac0c28c01352e53
preemptible: false
workflow: .github/workflows/docs-gpu.yml
count: 1
labels:
- gpu
- "cirun-gpu-runner"
2 changes: 1 addition & 1 deletion .github/workflows/tests-gpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
cases:
name: ${{ matrix.os }}, ${{ matrix.case-name }}
needs: validate
runs-on: [self-hosted, gpu]
runs-on: [self-hosted, cirun-gpu-runner]
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"setuptools>=36.6",
"packaging",
"packaging<=21.3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can just replace the code in setup.py as was done in qutip/qutip@2fc35ba8c6 instead of pinning packaging.

"wheel",
]
build-backend = "setuptools.build_meta"
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ include_package_data = True
install_requires =
qutip>=5.0.0.dev0
setup_requires =
packaging
packaging<=21.3

[options.packages.find]
where = src
Expand Down
4 changes: 2 additions & 2 deletions src/qutip_cupy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ def is_cupydense(data):
data.norm.max.add_specialisations([(CuPyDense, cdf.max_cupydense)])
data.norm.one.add_specialisations([(CuPyDense, cdf.one_cupydense)])

data.inv.add_specialisations([(CuPyDense, linalg.inv_cupydense)])
data.inv.add_specialisations([(CuPyDense, CuPyDense, linalg.inv_cupydense)])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

data.pow.add_specialisations([(CuPyDense, CuPyDense, cdf.pow_cupydense)])
data.project.add_specialisations([(CuPyDense, CuPyDense, cdf.project_cupydense)])


data.isherm.add_specialisations([(CuPyDense, cdf.isherm_cupydense)])

data.inv.add_specialisations([(CuPyDense, linalg.inv_cupydense)])
data.inv.add_specialisations([(CuPyDense, CuPyDense, linalg.inv_cupydense)])


# We must register the functions to the data layer but do not want
Expand Down