Skip to content

Commit

Permalink
fix jax version bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick committed May 9, 2024
1 parent 035f196 commit 3091501
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ jobs:
run: |
python -m pip install 'git+https://github.com/qutip/qutip-qtrl.git'
- name: Install qutip-jax from GitHub
if: ${{ matrix.qutip-version == '@master'}}
run: |
python -m pip install 'git+https://github.com/qutip/qutip-jax.git'
- name: Install qutip-qoc
# Installing in-place so that coveralls can locate the source code.
run: |
Expand Down
4 changes: 2 additions & 2 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
numpy>=1.16.6
scipy>=1.10.1
jax==0.4.23
jaxlib==0.4.23
jax>=0.4.23
jaxlib>=0.4.23
qutip>=5.0.1
cython>=0.29.33
numpydoc==1.5.0
Expand Down
2 changes: 1 addition & 1 deletion doc/rtd-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- numpy>=1.16.6
- scipy>=1.10.1
- jax>=0.4.23
- jaxlib==0.4.23
- jaxlib>=0.4.23
- cython>=0.29.33
- sphinx==6.1.3
- sphinx_rtd_theme==1.2.0
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cython>=1.0
numpy>=1.16.6
scipy>=1.10.1
jax==0.4.23
jaxlib==0.4.23
jax>=0.4.23
jaxlib>=0.4.23
qutip>=5.0.1
qutip-qtrl @ git+https://github.com/qutip/qutip-qtrl.git@master
qutip-jax
qutip-jax @ git+https://github.com/qutip/qutip-jax.git@master
pre-commit
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install_requires =
packaging
qutip
qutip-qtrl @ git+https://github.com/qutip/qutip-qtrl.git@master
qutip-jax
qutip-jax @ git+https://github.com/qutip/qutip-jax.git@master
setup_requires =
cython>=1.0
packaging
Expand Down
2 changes: 1 addition & 1 deletion src/qutip_qoc/_optimizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def _global_local_optimization(
Sequence of ``(min, max)`` pairs for each element in
`guess`. None is used to specify no bound.
time_interval : :class:`qutip_qoc.TimeInterval`
time_interval : :class:`qutip_qoc._TimeInterval`
Time interval for the optimization.
time_options : dict, optional
Expand Down

0 comments on commit 3091501

Please sign in to comment.