Merge branch 'dev' into spectral-updates

Ceyron · Sep 5, 2024 · f639e14 · f639e14
2 parents 375623e + 1b2f310
commit f639e14
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 41 deletions.
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -7,7 +7,7 @@ jobs:
   run-test:
     strategy:
       matrix:
-        python-version: [ 3.10, 3.11, 3.12 ]
+        python-version: [ "3.10", "3.11", "3.12" ]
         os: [ ubuntu-latest ]
       fail-fast: false
     runs-on: ${{ matrix.os }}

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1 +1,3 @@
-jaxlib
+jaxlib
+pytest
+vape4d
diff --git a/tests/test_builtin_solvers.py b/tests/test_builtin_solvers.py
@@ -366,4 +366,6 @@ def test_nonlinear_normalized_stepper():
     regular_burgers_pred = regular_burgers_stepper(u_0)
     normalized_burgers_pred = normalized_burgers_stepper(u_0)
 
-    assert regular_burgers_pred == pytest.approx(normalized_burgers_pred)
+    assert regular_burgers_pred == pytest.approx(
+        normalized_burgers_pred, rel=1e-5, abs=1e-5
+    )
diff --git a/tests/test_mode_slices_generation.py b/tests/test_mode_slices_generation.py
@@ -3,73 +3,95 @@
 
 def test_mode_slices_generation():
     # 1D
-    assert ex.spectral.get_modes_slices(1, 10) == [
-        [slice(None), slice(None, (10 // 2) + 1)]
-    ]
-    assert ex.spectral.get_modes_slices(1, 11) == [
-        [slice(None), slice(None, (11 // 2) + 1)]
-    ]
+    assert ex.spectral.get_modes_slices(1, 10) == (
+        (
+            slice(None),
+            slice(None, (10 // 2) + 1),
+        ),
+    )
+    assert ex.spectral.get_modes_slices(1, 11) == (
+        (
+            slice(None),
+            slice(None, (11 // 2) + 1),
+        ),
+    )
 
     # 2D
-    assert ex.spectral.get_modes_slices(2, 10) == [
-        [slice(None), slice(None, (10 // 2)), slice(None, (10 // 2) + 1)],
-        [slice(None), slice(-(10 // 2), None), slice(None, (10 // 2) + 1)],
-    ]
-    assert ex.spectral.get_modes_slices(2, 11) == [
-        [slice(None), slice(None, (11 // 2) + 1), slice(None, (11 // 2) + 1)],
-        [slice(None), slice(-(11 // 2), None), slice(None, (11 // 2) + 1)],
-    ]
+    assert ex.spectral.get_modes_slices(2, 10) == (
+        (
+            slice(None),
+            slice(None, (10 // 2)),
+            slice(None, (10 // 2) + 1),
+        ),
+        (
+            slice(None),
+            slice(-(10 // 2), None),
+            slice(None, (10 // 2) + 1),
+        ),
+    )
+    assert ex.spectral.get_modes_slices(2, 11) == (
+        (
+            slice(None),
+            slice(None, (11 // 2) + 1),
+            slice(None, (11 // 2) + 1),
+        ),
+        (
+            slice(None),
+            slice(-(11 // 2), None),
+            slice(None, (11 // 2) + 1),
+        ),
+    )
 
     # 3D
-    assert ex.spectral.get_modes_slices(3, 10) == [
-        [
+    assert ex.spectral.get_modes_slices(3, 10) == (
+        (
             slice(None),
             slice(None, (10 // 2)),
             slice(None, (10 // 2)),
             slice(None, (10 // 2) + 1),
-        ],
-        [
+        ),
+        (
             slice(None),
             slice(-(10 // 2), None),
             slice(None, (10 // 2)),
             slice(None, (10 // 2) + 1),
-        ],
-        [
+        ),
+        (
             slice(None),
             slice(None, (10 // 2)),
             slice(-(10 // 2), None),
             slice(None, (10 // 2) + 1),
-        ],
-        [
+        ),
+        (
             slice(None),
             slice(-(10 // 2), None),
             slice(-(10 // 2), None),
             slice(None, (10 // 2) + 1),
-        ],
-    ]
-    assert ex.spectral.get_modes_slices(3, 11) == [
-        [
+        ),
+    )
+    assert ex.spectral.get_modes_slices(3, 11) == (
+        (
             slice(None),
             slice(None, (11 // 2) + 1),
             slice(None, (11 // 2) + 1),
             slice(None, (11 // 2) + 1),
-        ],
-        [
+        ),
+        (
             slice(None),
             slice(-(11 // 2), None),
             slice(None, (11 // 2) + 1),
             slice(None, (11 // 2) + 1),
-        ],
-        [
+        ),
+        (
             slice(None),
             slice(None, (11 // 2) + 1),
             slice(-(11 // 2), None),
             slice(None, (11 // 2) + 1),
-        ],
-        [
+        ),
+        (
             slice(None),
             slice(-(11 // 2), None),
             slice(-(11 // 2), None),
             slice(None, (11 // 2) + 1),
-        ],
-    ]
+        ),
+    )
diff --git a/tests/test_viz.py b/tests/test_viz.py
@@ -28,8 +28,10 @@ def test_plot_state_2d():
     plt.close(fig)
 
 
-def test_plot_state_3d():
-    state = jax.random.normal(jax.random.PRNGKey(0), (1, 32, 32, 32))
+# # Requires a GPU and therefore cannot easily be tested on GitHub Actions
 
-    fig = ex.viz.plot_state_3d(state)
-    plt.close(fig)
+# def test_plot_state_3d():
+#     state = jax.random.normal(jax.random.PRNGKey(0), (1, 32, 32, 32))
+
+#     fig = ex.viz.plot_state_3d(state)
+#     plt.close(fig)
-Original file line number
+Diff line change
@@ -1 +1,3 @@
-    jaxlib
+    jaxlib
+    pytest
+    vape4d