Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix external variable initialization #1775

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix external variable initialization #1775

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a92ec20
fix external variable initialization
bonneted Jun 17, 2024
9570b87
no auxiliary variable function case
bonneted Jun 18, 2024
c119852
fix inspect empty
bonneted Jun 18, 2024
de9e71b
better unknowns logic for JAX inverse
bonneted Jul 8, 2024
ea6af8b
Merge branch 'master' into fix-variable-compile
bonneted Jul 8, 2024
751aef5
Merge branch 'lululxvi:master' into fix-variable-compile
bonneted Dec 17, 2024
1362634
no default unknowns error case
bonneted Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions deepxde/data/pde.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ def losses(self, targets, outputs, loss_fn, inputs, model, aux=None):
elif get_num_args(self.pde) == 3:
if self.auxiliary_var_fn is None:
if aux is None or len(aux) == 1:
raise ValueError("Auxiliary variable function not defined.")
f = self.pde(inputs, outputs_pde, unknowns=aux[1])
f = self.pde(inputs, outputs_pde)
lululxvi marked this conversation as resolved.
Show resolved Hide resolved
else:
f = self.pde(inputs, outputs_pde, unknowns=aux[1])
else:
f = self.pde(inputs, outputs_pde, model.net.auxiliary_vars)
if not isinstance(f, (list, tuple)):
Expand Down
8 changes: 4 additions & 4 deletions deepxde/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,10 @@ def _compile_jax(self, lr, loss_fn, decay):
if self.params is None:
key = jax.random.PRNGKey(config.jax_random_seed)
self.net.params = self.net.init(key, self.data.test()[0])
external_trainable_variables_arr = [
var.value for var in self.external_trainable_variables
]
self.params = [self.net.params, external_trainable_variables_arr]
external_trainable_variables_val = [
var.value for var in self.external_trainable_variables
]
self.params = [self.net.params, external_trainable_variables_val]
# TODO: learning rate decay
self.opt = optimizers.get(self.opt_name, learning_rate=lr)
self.opt_state = self.opt.init(self.params)
Expand Down
Loading