Merge karpathy/nanochat master with AMD | Generated by AI
Merged karpathy/nanochat:master.
State after merge:
- Clean working tree, merge committed as
2d85166 merge karpathy/nanochat:master. - Ahead of upstream/master: 18 commits (inc merge commit); behind upstream/master: 0.
Conflicts resolved:
nanochat/flash_attention.pynanochat/optim.pyscripts/base_train.pyuv.lock
Conflict markers cleared, and conflict areas kept consistent with upstream where it matched your setup (e.g., AMD/Rocm-aware FP8 help text, AMD-aware FA2 detection comment/docstrings).
