-
Notifications
You must be signed in to change notification settings - Fork 633
feat(jax): support DPA4 training #5748
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.
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
Open
njzjz
wants to merge
11
commits into
deepmodeling:master
Choose a base branch
from
njzjz:feat/dpa4-jax-train
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
51ee5de
feat(jax): support DPA4 training
njzjz 590823b
fix(jax): address dpa4 ci feedback
njzjz 1c8c03b
fix(jax): remove redundant dpa4 network import
njzjz 68cb12e
fix(jax): address dpa4 review feedback
7304a67
fix(jax): address new dpa4 review feedback
njzjz-bot 3727480
chore(jax): merge master into dpa4 training branch
njzjz-bot 180fff0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 72aa9ef
fix(pt): preserve DPA4 layer trainability
njzjz-bot 7c73a56
fix(jax): reject unsupported DPA4 training modes
e5c7b14
fix(jax): retain full DPA4 neighbor capacity
ef05aa9
test(jax): use supported DPA4 consistency options
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,309 @@ | ||
| # SPDX-License-Identifier: LGPL-3.0-or-later | ||
| from collections.abc import ( | ||
| Mapping, | ||
| Sequence, | ||
| ) | ||
| from typing import ( | ||
| Any, | ||
| ) | ||
|
|
||
| import numpy as np | ||
|
|
||
| from deepmd.dpmodel.common import ( | ||
| NativeOP, | ||
| ) | ||
| from deepmd.dpmodel.descriptor.dpa4 import DescrptDPA4 as DescrptDPA4DP | ||
| from deepmd.dpmodel.descriptor.dpa4_nn.activation import SwiGLU as SwiGLUDP | ||
| from deepmd.dpmodel.descriptor.dpa4_nn.grid_net import GridProduct as GridProductDP | ||
| from deepmd.dpmodel.descriptor.dpa4_nn.radial import ( | ||
| C3CutoffEnvelope as C3CutoffEnvelopeDP, | ||
| ) | ||
| from deepmd.dpmodel.descriptor.dpa4_nn.radial import RadialMLP as RadialMLPDP | ||
| from deepmd.dpmodel.descriptor.dpa4_nn.so2 import SO2Linear as SO2LinearDP | ||
| from deepmd.dpmodel.descriptor.dpa4_nn.wignerd import ( | ||
| WignerDCalculator as WignerDCalculatorDP, | ||
| ) | ||
| from deepmd.jax.common import ( | ||
| ArrayAPIVariable, | ||
| flax_module, | ||
| register_dpmodel_mapping, | ||
| to_jax_array, | ||
| try_convert_module, | ||
| ) | ||
| from deepmd.jax.descriptor.base_descriptor import ( | ||
| BaseDescriptor, | ||
| ) | ||
| from deepmd.jax.env import ( | ||
| jnp, | ||
| nnx, | ||
| ) | ||
| from deepmd.jax.utils.network import ( | ||
| ArrayAPIParam, | ||
| ) | ||
|
|
||
|
|
||
| @flax_module | ||
| class SwiGLU(SwiGLUDP): | ||
| pass | ||
|
|
||
|
|
||
| register_dpmodel_mapping(SwiGLUDP, lambda v: SwiGLU()) | ||
|
|
||
|
|
||
| @flax_module | ||
| class C3CutoffEnvelope(C3CutoffEnvelopeDP): | ||
| pass | ||
|
|
||
|
|
||
| register_dpmodel_mapping( | ||
| C3CutoffEnvelopeDP, | ||
| lambda v: C3CutoffEnvelope(v.rcut, v.p, precision=v.precision), | ||
| ) | ||
|
|
||
|
|
||
| @flax_module | ||
| class RadialMLP(RadialMLPDP): | ||
| def __init__(self, *args: Any, **kwargs: Any) -> None: | ||
| super().__init__(*args, **kwargs) | ||
| converted = [self._convert_layer(layer) for layer in self.net] | ||
| self.net = nnx.List(converted) if hasattr(nnx, "List") else converted | ||
|
|
||
| @staticmethod | ||
| def _convert_layer(layer: Any) -> Any: | ||
| if isinstance(layer, nnx.Module): | ||
| return layer | ||
| if isinstance(layer, NativeOP): | ||
| converted = try_convert_module(layer) | ||
| if converted is not None: | ||
| return converted | ||
| return layer | ||
|
|
||
|
|
||
| register_dpmodel_mapping( | ||
| RadialMLPDP, | ||
| lambda v: RadialMLP.deserialize(v.serialize()), | ||
| ) | ||
|
|
||
|
|
||
| @flax_module | ||
| class GridProduct(GridProductDP): | ||
| pass | ||
|
|
||
|
|
||
| register_dpmodel_mapping(GridProductDP, lambda v: GridProduct()) | ||
|
|
||
|
|
||
| @flax_module | ||
| class WignerDCalculator(WignerDCalculatorDP): | ||
| pass | ||
|
|
||
|
|
||
| register_dpmodel_mapping( | ||
| WignerDCalculatorDP, | ||
| lambda v: WignerDCalculator(v.lmax, eps=v.eps, precision=v.precision), | ||
| ) | ||
|
|
||
|
|
||
| _TRAINABLE_ATTRS: dict[str, tuple[str, ...]] = { | ||
| "RMSNorm": ("adam_scale",), | ||
| "EquivariantRMSNorm": ("adam_scale", "bias"), | ||
| "ReducedEquivariantRMSNorm": ("adam_scale", "bias0"), | ||
| "ScalarRMSNorm": ("adam_scale",), | ||
| "RadialBasis": ("adam_freqs",), | ||
| "SO3Linear": ("weight", "bias"), | ||
| "FocusLinear": ("weight", "bias"), | ||
| "ChannelLinear": ("weight", "bias"), | ||
| "FrameContract": ("weight",), | ||
| "FrameExpand": ("weight",), | ||
| "SO2Linear": ("weight_m0", "bias0"), | ||
| "DynamicRadialDegreeMixer": ("weight", "channel_basis"), | ||
| "SO2Convolution": ( | ||
| "adamw_attn_logit_w", | ||
| "adamw_attn_z_bias_raw", | ||
| "adamw_attn_gate_w", | ||
| "adamw_focus_compete_w", | ||
| "focus_compete_bias", | ||
| ), | ||
| "SeZMTypeEmbedding": ("adam_type_embedding",), | ||
| "SpinEmbedding": ("adam_spin_vec_weight", "adam_spin_nbr_weight"), | ||
| "EnvironmentInitialEmbedding": ("spin_scale",), | ||
| "DepthAttnRes": ("adamw_pseudo_query",), | ||
| "S2GridNet": ("residual_scale",), | ||
| "SO3GridNet": ("residual_scale",), | ||
| "DescrptDPA4": ("film_scale_strength_log", "film_shift_strength_log"), | ||
| } | ||
|
|
||
| _TRAINABLE_LIST_ATTRS: dict[str, tuple[str, ...]] = { | ||
| "SeZMInteractionBlock": ("adam_ffn_layer_scales",), | ||
| "SO2Linear": ("weight_m",), | ||
| "SO2Convolution": ("adam_so2_layer_scales",), | ||
| } | ||
|
|
||
|
|
||
| def _is_array_like(value: Any) -> bool: | ||
| return hasattr(value, "shape") and hasattr(value, "dtype") | ||
|
|
||
|
|
||
| def _array_value(value: Any) -> Any: | ||
| if isinstance(value, nnx.Variable): | ||
| return value.value | ||
| return value | ||
|
|
||
|
|
||
| def _is_floating_array(value: Any) -> bool: | ||
| value = _array_value(value) | ||
| if value is None or not _is_array_like(value): | ||
| return False | ||
| return bool(jnp.issubdtype(value.dtype, jnp.floating)) | ||
|
|
||
|
|
||
| def _as_parameter_variable(value: Any, *, trainable: bool) -> Any: | ||
| """Track a floating parameter with the requested optimizer visibility.""" | ||
| variable_type = ArrayAPIParam if trainable else ArrayAPIVariable | ||
| if type(value) is variable_type: | ||
| return value | ||
| if not _is_floating_array(value): | ||
| return value | ||
| if isinstance(value, nnx.Variable): | ||
| value = value.value | ||
| if isinstance(value, np.ndarray): | ||
| value = to_jax_array(value) | ||
| return variable_type(value) | ||
|
|
||
|
|
||
| def _as_parameter_variable_list(value: Any, *, trainable: bool) -> Any: | ||
| if not isinstance(value, Sequence) or isinstance(value, (str, bytes)): | ||
| return value | ||
| promoted = [] | ||
| changed = False | ||
| for item in value: | ||
| new_item = _as_parameter_variable(item, trainable=trainable) | ||
| promoted.append(new_item) | ||
| changed = changed or new_item is not item | ||
| if not changed: | ||
| return value | ||
| return nnx.List(promoted) if hasattr(nnx, "List") else promoted | ||
|
|
||
|
|
||
| def _iter_object_tree(root: Any) -> Any: | ||
| seen: set[int] = set() | ||
|
|
||
| def visit(value: Any) -> Any: | ||
| if value is None or isinstance(value, (str, bytes, int, float, bool)): | ||
| return | ||
| if _is_array_like(value): | ||
| return | ||
| value_id = id(value) | ||
| if value_id in seen: | ||
| return | ||
| seen.add(value_id) | ||
|
|
||
| if isinstance(value, Mapping): | ||
| for item in value.values(): | ||
| yield from visit(item) | ||
| return | ||
| if isinstance(value, Sequence): | ||
| for item in value: | ||
| yield from visit(item) | ||
| return | ||
| try: | ||
| value_dict = object.__getattribute__(value, "__dict__") | ||
| except AttributeError: | ||
| return | ||
|
|
||
| yield value | ||
| for item in value_dict.values(): | ||
| yield from visit(item) | ||
|
|
||
| yield from visit(root) | ||
|
|
||
|
|
||
| def _promote_parameters( | ||
| module: Any, names: tuple[str, ...], *, trainable: bool | ||
| ) -> None: | ||
| for name in names: | ||
| if not hasattr(module, name): | ||
| continue | ||
| value = getattr(module, name) | ||
| new_value = _as_parameter_variable(value, trainable=trainable) | ||
| if new_value is not value: | ||
| setattr(module, name, new_value) | ||
|
|
||
|
|
||
| def _promote_parameter_lists( | ||
| module: Any, names: tuple[str, ...], *, trainable: bool | ||
| ) -> None: | ||
| for name in names: | ||
| if not hasattr(module, name): | ||
| continue | ||
| value = getattr(module, name) | ||
| new_value = _as_parameter_variable_list(value, trainable=trainable) | ||
| if new_value is not value: | ||
| setattr(module, name, new_value) | ||
|
|
||
|
|
||
| def _promote_trainable_tree(module: Any) -> Any: | ||
| root_trainable = bool(getattr(module, "trainable", True)) | ||
| for submodule in _iter_object_tree(module): | ||
| # A frozen descriptor freezes every descendant, including helper | ||
| # modules such as RadialBasis that do not carry a local flag. | ||
| trainable = root_trainable and bool(getattr(submodule, "trainable", True)) | ||
| names = _TRAINABLE_ATTRS.get(type(submodule).__name__) | ||
| if names is not None: | ||
| _promote_parameters(submodule, names, trainable=trainable) | ||
| list_names = _TRAINABLE_LIST_ATTRS.get(type(submodule).__name__) | ||
| if list_names is not None: | ||
| _promote_parameter_lists(submodule, list_names, trainable=trainable) | ||
| return module | ||
|
|
||
|
|
||
| @flax_module | ||
| class SO2Linear(SO2LinearDP): | ||
| def __init__(self, *args: Any, **kwargs: Any) -> None: | ||
| super().__init__(*args, **kwargs) | ||
| self.weight_m = _as_parameter_variable_list( | ||
| self.weight_m, trainable=bool(self.trainable) | ||
| ) | ||
|
|
||
| @classmethod | ||
| def deserialize(cls, data: dict) -> "SO2Linear": | ||
| obj = super().deserialize(data) | ||
| obj.weight_m = _as_parameter_variable_list( | ||
| obj.weight_m, trainable=bool(obj.trainable) | ||
| ) | ||
| return obj | ||
|
|
||
|
|
||
| register_dpmodel_mapping( | ||
| SO2LinearDP, | ||
| lambda v: SO2Linear.deserialize(v.serialize()), | ||
| ) | ||
|
|
||
|
|
||
| @BaseDescriptor.register("SeZM") | ||
| @BaseDescriptor.register("sezm") | ||
| @BaseDescriptor.register("DPA4") | ||
| @BaseDescriptor.register("dpa4") | ||
| @flax_module | ||
| class DescrptDPA4(DescrptDPA4DP): | ||
|
njzjz marked this conversation as resolved.
|
||
| def __init__(self, *args: Any, **kwargs: Any) -> None: | ||
| # The dpmodel implementation currently fixes gamma and performs no | ||
| # automatic mixed-precision policy under JAX. Reject explicit requests | ||
| # instead of silently accepting training options that have no effect. | ||
| if kwargs.get("random_gamma") is True: | ||
| raise NotImplementedError( | ||
| "DPA4 random_gamma=True is not supported in the JAX backend." | ||
| ) | ||
| if kwargs.get("use_amp") is True: | ||
| raise NotImplementedError( | ||
| "DPA4 use_amp=True is not supported in the JAX backend." | ||
| ) | ||
| kwargs.setdefault("random_gamma", False) | ||
| kwargs.setdefault("use_amp", False) | ||
| super().__init__(*args, **kwargs) | ||
|
njzjz marked this conversation as resolved.
|
||
| _promote_trainable_tree(self) | ||
|
|
||
| @classmethod | ||
| def deserialize(cls, data: dict) -> "DescrptDPA4": | ||
| obj = super().deserialize(data) | ||
| return _promote_trainable_tree(obj) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.