Skip to content

Commit a6dfd09

Browse files
committed
Merge branch 'main' into jax-mccallq
Resolve the mccall_q.md conflict by taking main's version. The JAX conversion is being dropped: mccall_q is inherently sequential Q-learning, which the style guide directs to Numba rather than JAX (see styleguide/jax.md, "Sequential: Numba wins"). Main has also since moved these functions to the np.random.default_rng Generator API in #959. The prose, heading and figure-legend improvements from this branch are reapplied in the next commit.
2 parents d5d2565 + 7e4c793 commit a6dfd09

168 files changed

Lines changed: 83400 additions & 30308 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,16 @@ updates:
1111
prefix: ⬆️
1212
schedule:
1313
interval: weekly
14+
15+
- package-ecosystem: "conda"
16+
directory: "/"
17+
commit-message:
18+
prefix: ⬆️
19+
schedule:
20+
interval: weekly
21+
ignore:
22+
- dependency-name: "jupyter-book"
23+
versions: [">=2.0"]
24+
- dependency-name: "python"
25+
# Python version should be constrained by the anaconda distribution version
26+
versions: [">0"]

.github/runs-on.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ images:
22
quantecon_ubuntu2404:
33
platform: "linux"
44
arch: "x64"
5-
ami: "ami-09baf66e396fa7cfd"
5+
ami: "ami-0edec81935264b6d3"
6+
region: "us-west-2"

.github/workflows/cache.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,25 @@ on:
66
workflow_dispatch:
77
jobs:
88
cache:
9-
runs-on: "runs-on=${{ github.run_id }}/family=g4dn.2xlarge/image=quantecon_ubuntu2404/disk=large"
9+
runs-on: "runs-on=${{ github.run_id }}/family=g4dn.2xlarge/image=quantecon_ubuntu2404/volume=80gb/spot=false"
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v7
1212
with:
1313
ref: ${{ github.event.pull_request.head.sha }}
1414
- name: Setup Anaconda
15-
uses: conda-incubator/setup-miniconda@v3
15+
uses: conda-incubator/setup-miniconda@v4
1616
with:
1717
auto-update-conda: true
1818
auto-activate-base: true
1919
miniconda-version: 'latest'
2020
python-version: "3.13"
2121
environment-file: environment.yml
2222
activate-environment: quantecon
23-
- name: Install JAX, Numpyro, PyTorch
23+
- name: Install JAX and Numpyro
2424
shell: bash -l {0}
2525
run: |
26-
pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu128
27-
pip install --upgrade "jax[cuda12-local]==0.6.2"
28-
pip install numpyro
26+
pip install -U "jax[cuda13]"
27+
pip install numpyro
2928
python scripts/test-jax-install.py
3029
- name: Check nvidia drivers
3130
shell: bash -l {0}
@@ -36,13 +35,13 @@ jobs:
3635
run: |
3736
jb build lectures --path-output ./ -W --keep-going
3837
- name: Upload Execution Reports
39-
uses: actions/upload-artifact@v4
38+
uses: actions/upload-artifact@v7
4039
if: failure()
4140
with:
4241
name: execution-reports
4342
path: _build/html/reports
4443
- name: Upload "_build" folder (cache)
45-
uses: actions/upload-artifact@v4
44+
uses: actions/upload-artifact@v7
4645
with:
4746
name: build-cache
4847
path: _build

0 commit comments

Comments
 (0)