Repository navigation
Converter: the preset-L map, and --preset to name a map's preset - #106
Merged
Merged
Conversation
data/preset-L.v1.map.json is the spec side's map as delivered (byte for byte; map version 1, sources W, D and K, no "preset" field). The caller can name the preset a map is loaded for (wronggpu-convert --preset, load_map_bytes expected_preset): a map without the field is read as that preset when the preset uses its version; a map with the field must agree; otherwise converter data damaged, and an unknown --preset is a usage error. Tests: the real map validates, gives preset L's message with --preset L, refuses mismatches, and converts our own random data in its exact layout at two placements; unit checks for the caller's preset. Refs #89 Signed-off-by: phantoslayer21 <156617979+phantoslayer21@users.noreply.github.com>
data/preset-L.v1.map.json is kept byte for byte as delivered (data/ is spec-side output); it is the one listed CR LF exception. Refs #89 Signed-off-by: phantoslayer21 <156617979+phantoslayer21@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Model L (#89): the converter map for preset L is in, and the converter can now be told which preset it loads a map for.
data/preset-L.v1.map.json: the spec side's preset-L map, byte for byte as delivered (map version 1; sourcesW, D and K; the stages of M plus
enc0_blockanddec0_block, and the input encoder's wider linear). It keeps theCR LF line endings it was delivered with, so
tools/ci/check_line_endings.pylists it as the one CR LF exception.data/README.mdnames it.source rule is needed.
"preset"field. Read as-is, a version-1 map is preset M (the message for a filewithout the block would name preset M). So the caller names the preset:
wronggpu-convert ... --preset M|K|F|L(clean/converter/src/main.cpp), andload_map_bytes(bytes, out, log, expected_preset)(api.h/api.cpp;map.hload_mapoverload);--presetis a usage error (exit 1);--presetnothing changes (M, K and F maps, their messages and their log lines);clean/converter/README.md: the map, the option and its rules.Refs #89
Tested
Run locally on Windows, CPU only, Ninja Release
/MTwith MSVC, on main e6500a8 plus these two commits.ctest(unit, decompression-vectors, synthetic, synthetic5): 4/4 passed.run_tests.py: 5207 checks passed, 0 failed (main: 4481). The newtest_l_real_map:--preset L, and preset M's without it;--preset K,--preset Fare converter data damaged, and an unknown preset is a usage error;with every tensor of every stage, the offsets and all stage digests checked against the reference.
tests/unit_tests.cpp): the caller's preset on the version-1 and version-4 unit maps; a mapwith the field and a matching or mismatching caller; unknown and version-mismatched names refused, with the reasons
logged.
folders) was hashed: 1615 files, SHA-256 identical to main's.
load_map_byteswith the default):5/5 passed.
python tools/ci/check_line_endings.py: 1160 files, 0 problems. Public gates (secrets, personal data, licence,chunks) pass.
Not tested
GPU, no game.