jinns 0.8.9__tar.gz → 0.8.10__tar.gz

{jinns-0.8.9 → jinns-0.8.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jinns
-Version: 0.8.9
+Version: 0.8.10
 Summary: Physics Informed Neural Network with JAX
 Author-email: Hugo Gangloff <hugo.gangloff@inrae.fr>, Nicolas Jouvin <nicolas.jouvin@inrae.fr>
 Maintainer-email: Hugo Gangloff <hugo.gangloff@inrae.fr>, Nicolas Jouvin <nicolas.jouvin@inrae.fr>

{jinns-0.8.9 → jinns-0.8.10}/doc/source/index.rst

@@ -8,6 +8,10 @@ Welcome to jinn's documentation!
 
 Changelog:
 
+* v0.8.10:
+
+    - Merge `[!44] <https://gitlab.com/mia_jinns/jinns/-/merge_requests/44>`_
+
 * v0.8.9:
 
     - Merge `[!41] <https://gitlab.com/mia_jinns/jinns/-/merge_requests/41>`_

{jinns-0.8.9 → jinns-0.8.10}/jinns/loss/_LossODE.py

@@ -237,6 +237,7 @@ class LossODE:
             "u": self.u,
             "dynamic_loss": self.dynamic_loss,
             "obs_slice": self.obs_slice,
+            "derivative_keys": self.derivative_keys,
         }
         return (children, aux_data)
 

{jinns-0.8.9 → jinns-0.8.10}/jinns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jinns
-Version: 0.8.9
+Version: 0.8.10
 Summary: Physics Informed Neural Network with JAX
 Author-email: Hugo Gangloff <hugo.gangloff@inrae.fr>, Nicolas Jouvin <nicolas.jouvin@inrae.fr>
 Maintainer-email: Hugo Gangloff <hugo.gangloff@inrae.fr>, Nicolas Jouvin <nicolas.jouvin@inrae.fr>

{jinns-0.8.9 → jinns-0.8.10}/tests/conftest.py

@@ -15,6 +15,14 @@ def pytest_addoption(parser):
         help="whether to run test scripts on GPU",
     )
 
+    parser.addoption(
+        "--all_tests",
+        action="store_true",
+        default=False,
+        help="whether to run all tests (can be long so should not be called "
+        "often especially on CI/CD)",
+    )
+
 
 def pytest_configure(config):
     gpu = config.getoption("--gpu")

{jinns-0.8.9 → jinns-0.8.10}/tests/runtests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-pytest dataGenerator_tests/*
+pytest -s dataGenerator_tests/*
 status=$?
 if [ $status -ne 0 ]; then
    exit $status
@@ -14,15 +14,15 @@ status=$?
 if [ $status -ne 0 ]; then
    exit $status
 fi
-pytest solver_tests/*
+pytest -s solver_tests/*
 status=$?
 if [ $status -ne 0 ]; then
    exit $status
 fi
-pytest solver_tests_spinn/*
+pytest -s solver_tests_spinn/*
 status=$?
 if [ $status -ne 0 ]; then
    exit $status
 fi
-pytest utils_tests/*
+pytest -s utils_tests/*
 exit $?

{jinns-0.8.9 → jinns-0.8.10}/tests/solver_tests/test_rar_algorithm.py

@@ -139,6 +139,11 @@ def get_datagenerator_rar(start_iter, update_every):
     return train_data, rar_parameters
 
 
+@pytest.fixture
+def all_tests(pytestconfig):
+    return pytestconfig.getoption("all_tests")
+
+
 def test_data_proba_shape_before_solve():
     train_data, rar_parameters = get_datagenerator_rar(1, 1)
     assert (train_data.p_times != 0).sum() == train_data.nt_start
@@ -159,43 +164,60 @@ def control_shape_after_solve_with_rar(start_iter, update_every):
     ) * rar_parameters["selected_sample_size_omega"]
 
 
-def test_rar_with_various_combination_of_start_and_update_values():
-    start_iter_list = [0, 3]
-    update_every_list = [1, 3]
-    for start_iter in start_iter_list:
-        for update_every in update_every_list:
-            with pytest.warns(UserWarning):
-                control_shape_after_solve_with_rar(start_iter, update_every)
-
-
-def test_rar_error_with_SPINN():
-
-    train_data, rar_parameters = get_datagenerator_rar(0, 1)
-    # ensure same batch size in time & space for SPINN
-    train_data.temporal_batch_size = train_data.omega_batch_size
-    d = 3
-    r = 256
-    eqx_list = [
-        [eqx.nn.Linear, 1, 128],
-        [jax.nn.tanh],
-        [eqx.nn.Linear, 128, 128],
-        [jax.nn.tanh],
-        [eqx.nn.Linear, 128, 128],
-        [jax.nn.tanh],
-        [eqx.nn.Linear, 128, r],
-    ]
-    key = jax.random.PRNGKey(12345)
-    key, subkey = random.split(key)
-    u = jinns.utils.create_SPINN(subkey, d, r, eqx_list, "nonstatio_PDE")
-    init_nn_params = u.init_params()
-
-    # update loss and params
-    init_params["nn_params"] = init_nn_params
-    loss.u = u
-    train_data.temporal_batch_size = train_data.omega_batch_size
-    # expect error
-    with pytest.raises(NotImplementedError) as e_info, pytest.warns(UserWarning):
-        tx = optax.adamw(learning_rate=1e-3)
-        jinns.solve(
-            init_params=init_params, data=train_data, optimizer=tx, loss=loss, n_iter=2
+def test_rar_with_various_combination_of_start_and_update_values(all_tests):
+    # long test run only if --all_tests
+    if all_tests:
+        start_iter_list = [0, 3]
+        update_every_list = [1, 3]
+        for start_iter in start_iter_list:
+            for update_every in update_every_list:
+                with pytest.warns(UserWarning):
+                    control_shape_after_solve_with_rar(start_iter, update_every)
+    else:
+        print(
+            "\ntest_rar_with_various_combination_of_start_and_update_values "
+            "has been skipped due to missing --all_tests option\n"
+        )
+
+
+def test_rar_error_with_SPINN(all_tests):
+    # long test run only if --all_tests
+    if all_tests:
+        train_data, rar_parameters = get_datagenerator_rar(0, 1)
+        # ensure same batch size in time & space for SPINN
+        train_data.temporal_batch_size = train_data.omega_batch_size
+        d = 3
+        r = 256
+        eqx_list = [
+            [eqx.nn.Linear, 1, 128],
+            [jax.nn.tanh],
+            [eqx.nn.Linear, 128, 128],
+            [jax.nn.tanh],
+            [eqx.nn.Linear, 128, 128],
+            [jax.nn.tanh],
+            [eqx.nn.Linear, 128, r],
+        ]
+        key = jax.random.PRNGKey(12345)
+        key, subkey = random.split(key)
+        u = jinns.utils.create_SPINN(subkey, d, r, eqx_list, "nonstatio_PDE")
+        init_nn_params = u.init_params()
+
+        # update loss and params
+        init_params["nn_params"] = init_nn_params
+        loss.u = u
+        train_data.temporal_batch_size = train_data.omega_batch_size
+        # expect error
+        with pytest.raises(NotImplementedError) as e_info, pytest.warns(UserWarning):
+            tx = optax.adamw(learning_rate=1e-3)
+            jinns.solve(
+                init_params=init_params,
+                data=train_data,
+                optimizer=tx,
+                loss=loss,
+                n_iter=2,
+            )
+    else:
+        print(
+            "\ntest_rar_error_with_SPINN has been skipped due not missing "
+            "--all_tests option\n"
         )