Commit bc902da
authored
feat(pt_expt): align the training runtime with pt (deepmodeling#5958)
## Summary
- move checkpoint layout, retention, training timing, and sharding
policy into backend-independent training utilities shared by `pt` and
`pt_expt`
- add `pt_expt` support for checkpoint directories and retention ratios,
EMA training/checkpoints, EMA full validation, consistent training
reports, and restart-safe state restoration
- support the same `zero_stage` strategies as `pt`, including DDP,
ZeRO-1, and FSDP2, with collective checkpoint assembly and
optimizer-state restoration
- reuse overflow-safe gradient norm reduction and defer the non-finite
verdict to checkpoint boundaries so a diverged model is not saved
- make EMA checkpoint retention inherit `max_ckpt_keep` by default while
preserving an explicit `ema_ckpt_keep` override
## Motivation
The `pt_expt` trainer currently lacks several operational guarantees
available in `pt`: equivalent checkpoint retention and restart behavior,
EMA support, distributed state sharding, stable gradient checks, and
consistent progress reporting. Implementing these separately would leave
two training runtimes with duplicated policies that can drift.
This PR keeps backend-specific serialization and execution in each
trainer, while centralizing the policies that are independent of a
backend. It also relocates the EMA, validation, and gradient helpers
under `pt_expt`, which is their continuing owner as the legacy `pt`
trainer is retired.
## Notable fixes
- rerunning in a directory from a longer run no longer lets stale future
checkpoints evict the newly written checkpoint
- `max_ckpt_keep < 1` retains all checkpoints instead of deleting the
current checkpoint
- `ckpt_keep_ratio` works when periodic saving is disabled and overrides
both regular and EMA windows
- restarting from a checkpoint without optimizer state resumes the
learning-rate schedule from the recorded step
- sharded checkpoints are assembled collectively, avoiding rank
desynchronization at the next barrier
- regular and EMA checkpoint families are pruned independently; absent
`ema_ckpt_keep` now gives both families the `max_ckpt_keep` window
## Validation
- `OMP_NUM_THREADS=1 DP_INTER_OP_PARALLELISM_THREADS=0
DP_INTRA_OP_PARALLELISM_THREADS=0
/Users/outisli/Software/miniforge3/envs/dpmd/bin/python -m pytest
source/tests/common/dpmodel/test_train_checkpoint.py
source/tests/common/test_argcheck_training.py -q` (`14 passed`)
- a five-step `pt_expt` training run with EMA, `save_freq=1`, and only
`max_ckpt_keep=2` retained regular steps `4, 5` and EMA steps `4, 5`
- repository pre-commit checks passed
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* Added configurable checkpoint retention, restart-safe cleanup, and
separate EMA checkpoints.
* Added distributed training with multiple sharding strategies and
improved checkpoint restoration.
* Added EMA full-validation workflows with independent schedules and
best-checkpoint tracking.
* Added parameter-count reporting and improved training progress timing,
averages, and ETA estimates.
* Added safer handling of non-finite gradients.
* Added support for checkpoint retention and EMA features across
supported PyTorch backends.
* **Documentation**
* Expanded guidance for checkpoint retention, EMA, distributed training,
and inference options.
* **Bug Fixes**
* Improved validation compatibility and handling of shared or relocated
save directories.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->1 parent a3195b0 commit bc902da
28 files changed
Lines changed: 2729 additions & 965 deletions
File tree
- deepmd
- dpmodel/train
- loggers
- pt_expt/train
- pt/train
- utils
- doc/train
- source/tests
- common
- dpmodel
- pt_expt
- pt
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
4 | 9 | | |
5 | 10 | | |
6 | 11 | | |
| |||
15 | 20 | | |
16 | 21 | | |
17 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
18 | 30 | | |
19 | 31 | | |
20 | 32 | | |
| |||
32 | 44 | | |
33 | 45 | | |
34 | 46 | | |
| 47 | + | |
| 48 | + | |
35 | 49 | | |
36 | 50 | | |
| 51 | + | |
37 | 52 | | |
38 | 53 | | |
39 | 54 | | |
40 | 55 | | |
41 | 56 | | |
42 | 57 | | |
43 | 58 | | |
| 59 | + | |
| 60 | + | |
44 | 61 | | |
45 | 62 | | |
46 | 63 | | |
47 | 64 | | |
48 | 65 | | |
| 66 | + | |
49 | 67 | | |
50 | 68 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
0 commit comments