Merge branch 'main' into ifp_update

Author: jstac

.github/runs-on.yml

@@ -2,4 +2,5 @@ images:
   quantecon_ubuntu2404:
     platform: "linux"
     arch: "x64"
-    ami: "ami-09baf66e396fa7cfd"
+    ami: "ami-0edec81935264b6d3"
+    region: "us-west-2"

.github/workflows/cache.yml

@@ -20,12 +20,11 @@ jobs:
           python-version: "3.13"
           environment-file: environment.yml
           activate-environment: quantecon
-      - name: Install JAX, Numpyro, PyTorch
+      - name: Install JAX and Numpyro
         shell: bash -l {0}
         run: |
-          pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu128
-          pip install --upgrade "jax[cuda12-local]==0.6.2"
-          pip install numpyro  
+          pip install -U "jax[cuda13]"
+          pip install numpyro
           python scripts/test-jax-install.py
       - name: Check nvidia drivers
         shell: bash -l {0}

.github/workflows/ci.yml

@@ -28,17 +28,15 @@ jobs:
           python-version: "3.13"
           environment-file: environment.yml
           activate-environment: quantecon
-      - name: Install JAX, Numpyro, PyTorch
-        shell: bash -l {0}
-        run: |
-          pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu128
-          pip install pyro-ppl
-          pip install --upgrade "jax[cuda12-local]==0.6.2"
-          pip install numpyro pyro-ppl
-          python scripts/test-jax-install.py
       - name: Check nvidia Drivers
         shell: bash -l {0}
         run: nvidia-smi
+      - name: Install JAX and Numpyro
+        shell: bash -l {0}
+        run: |
+          pip install -U "jax[cuda13]"
+          pip install numpyro
+          python scripts/test-jax-install.py
       - name: Display Conda Environment Versions
         shell: bash -l {0}
         run: conda list

.github/workflows/publish.yml

@@ -19,12 +19,11 @@ jobs:
           python-version: "3.13"
           environment-file: environment.yml
           activate-environment: quantecon
-      - name: Install JAX, Numpyro, PyTorch
+      - name: Install JAX and Numpyro
         shell: bash -l {0}
         run: |
-          pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu128
-          pip install --upgrade "jax[cuda12-local]==0.6.2"
-          pip install numpyro  
+          pip install -U "jax[cuda13]"
+          pip install numpyro
           python scripts/test-jax-install.py
       - name: Check nvidia drivers
         shell: bash -l {0}

environment.yml

@@ -8,7 +8,7 @@ dependencies:
   - pip:
     - jupyter-book==1.0.4post1
     - quantecon-book-theme==0.10.1
-    - sphinx-tojupyter==0.3.1
+    - sphinx-tojupyter==0.4.0
     - sphinxext-rediraffe==0.2.7
     - sphinx-exercise==1.2.0
     - sphinx-proof==0.2.1

lectures/_static/lecture_specific/mccall_model_with_separation/mccall_resw_alpha.png

@@ -2711,3 +2711,25 @@ @article{fischer2024improving
   journal={arXiv preprint arXiv:2410.16076},
   year={2024}
 }
+
+@article{MaCurdy1982,
+  title={The use of time series processes to model the error structure of earnings in a longitudinal data analysis},
+  author={MaCurdy, Thomas E.},
+  journal={Journal of Econometrics},
+  volume={18},
+  number={1},
+  pages={83--114},
+  year={1982},
+  publisher={Elsevier}
+}
+
+@article{Meghir2004,
+  title={Income variance dynamics and heterogeneity},
+  author={Meghir, Costas and Pistaferri, Luigi},
+  journal={Econometrica},
+  volume={72},
+  number={1},
+  pages={1--32},
+  year={2004},
+  publisher={Wiley Online Library}
+}

lectures/_static/lecture_specific/mccall_model_with_separation/mccall_resw_beta.png

@@ -67,7 +67,7 @@ parts:
   - file: mccall_model_with_separation
   - file: mccall_model_with_sep_markov
   - file: mccall_fitted_vfi
-  - file: mccall_correlated
+  - file: mccall_persist_trans
   - file: career
   - file: jv
   - file: odu