Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into kron_open_issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Giguere committed Apr 18, 2024
2 parents 5a88c09 + 17675c5 commit 3fa2a7f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ jobs:

- name: Install documentation dependencies
run: |
python -mpip install -r doc/requirements.txt
python -m pip install -r doc/requirements.txt
- name: Install QuTiP from GitHub
run: |
python -mpip install git+https://github.com/qutip/qutip.git@master
python -m pip install git+https://github.com/qutip/qutip.git@master
python -c 'import qutip; qutip.about()'
- name: Install qutip-jax from GitHub
run: |
python -mpip install .[full]
python -m pip install jax jax[cpu]
python -m pip install .[full]
python -c 'import qutip_jax; print(qutip_jax.__version__)'
- name: Build documentation
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@ jobs:

- name: Install QuTiP from GitHub
run: |
python -mpip install git+https://github.com/qutip/qutip.git@master
python -m pip install git+https://github.com/qutip/qutip.git@master
python -c 'import qutip; qutip.about()'
- name: Install qutip-jax and dependencies
# Install in editable mode so Coveralls detects the tree structure
# relative to the git repository root as well.
run: |
python -mpip install -e .[full]
python -mpip install pytest-cov coveralls
python -m pip install jax jax[cpu]
python -m pip install -e .[full]
python -m pip install pytest-cov coveralls
- name: Package information
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ jobs:
# Install in editable mode so Coveralls detects the tree structure
# relative to the git repository root as well.
run: |
python -mpip install -e .[full]
python -m pip install jax jax[cpu]
python -m pip install -e .[full]
- name: Package information
run: |
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.0.dev0
0.0.1.dev0
2 changes: 1 addition & 1 deletion doc/source/basics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ There are many ways to create a QuTiP ``Qobj`` backed by JAX's array class.
import qutip
import qutip_jax
with qutip.CoreOptions("default_dtype"="jax"):
with qutip.CoreOptions(default_dtype="jax"):
jax_eye_qobj = qutip.qeye(3)
assert isinstance(jax_eye_qobj.data, qutip_jax.JaxArray)
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package_dir =
packages = find:
include_package_data = True
install_requires =
qutip>=5.0.0.dev0
qutip>=5.0.0
jax
diffrax
equinox
Expand Down

0 comments on commit 3fa2a7f

Please sign in to comment.