Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion clean/converter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Preset K, for the spec team (48-T1, 48-T6):
| 11 | file smaller than W (or above 4 GiB) | This is not a DLSS model file. |
| 12 | M: W not found. K: T not found | This DLSS file has no preset-M model. Version 310.5 or newer is needed. / This DLSS file has no preset-K model. Version 310.1 or newer is needed. (+ "This file is version a.b.c.d." when the file has a version resource) |
| 12 | F: W not found (spec 57 section 8) | This DLSS file has no preset-F (Ray Reconstruction) model. Version 310.7 or newer is needed. (+ the file version when there is one) |
| 12 | L: W not found (a map with `"preset": "L"`) | This DLSS file has no preset-L model. Version 310.9 or newer is needed. (+ the file version when there is one; the version named is provisional) |
| 12 | L: W not found (a map with `"preset": "L"`) | This DLSS file has no preset-L model. Version 310.5 or newer is needed. (+ the file version when there is one) |
| 13 | M: W found, D or K not found. K: T found, O not found (spec 48 draft 4 section 8). F: W found, another source (or every variant of IMG-IN) not found. The log names the missing source | This DLSS build is not supported yet (model data found, but other parts differ). |
| 14 | F only (spec 57 section 8): a constant's sites disagree, a `const_f16x2` with unequal halves, a `const_f16lo` with a non-zero high half, a non-finite value where 57.6.1 or 57.6.2 forbids it, an RN16 overflow, the two reads of an `also` tensor differ, a `require` or check fails, the attention constants fail 57.6.4. The log names the tensor or check (never a value). Not an installer error: the next file is tried | This DLSS build is not supported yet (model data found, but other parts differ). |
| 20 | map invalid: unreadable, bad JSON, bad format or version, unknown op / locate / element / encoding / dtype (or one its version does not define), missing field, unknown perm, perm not dividing its axis, `axes` length ≠ `shape` length, a segment that is not a positive multiple of 4 or runs past the end of T, K sources other than T (and O), `capped_softmax` without 8 × 8 last axes, a source F that is not a keyed optional `lz4-block` block source with variants, a field outside the decoded text, variants with different numbers of fields, a `digest` list whose length is not the number of variants (or a list for a group without variants), a group that mixes tensors from F and from other sources, … Also (spec 08 section 4.3): a variant of F matched its hashes, but the block does not decompress to `decoded_length`, does not match `decoded_sha256`, or a field is not eight hexadecimal digits | Installer error: the converter data is damaged. … |
Expand Down
5 changes: 2 additions & 3 deletions clean/converter/src/api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ const char* const kMsgNoPresetK = "This DLSS file has no preset-K model. Version
// Spec 57 section 8.
const char* const kMsgNoPresetF =
"This DLSS file has no preset-F (Ray Reconstruction) model. Version 310.7 or newer is needed.";
// Model L (#89). The DLSS version named is provisional: the first version known to carry a preset-L model; one line to
// change when the first shipping version is confirmed.
const char* const kMsgNoPresetL = "This DLSS file has no preset-L model. Version 310.9 or newer is needed.";
// Model L (#89). The minimum version is the first DLSS version confirmed to carry a preset-L model.
const char* const kMsgNoPresetL = "This DLSS file has no preset-L model. Version 310.5 or newer is needed.";
const char* const kMsgUnsupported = "This DLSS build is not supported yet (model data found, but other parts differ).";
const char* const kMsgMapDamaged = "Installer error: the converter data is damaged. Please reinstall WrongGPU.";
const char* const kMsgMapDoesNotFit =
Expand Down
2 changes: 1 addition & 1 deletion clean/converter/tests/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def test_preset_l(r):
"inenc_extra" in case_l.expected and "inenc_extra" not in case_m.expected and
os.path.isdir(os.path.join(r.work, "preset-l", "out-pair-L", "raw", "inenc_extra")) and
not os.path.exists(os.path.join(r.work, "preset-l", "out-pair-M", "raw", "inenc_extra")))
msg_l = "This DLSS file has no preset-L model. Version 310.9 or newer is needed."
msg_l = "This DLSS file has no preset-L model. Version 310.5 or newer is needed."
for label, p, f, want in (("preset-L map, a file with only preset M's block", lp, mo, msg_l),
("preset-M map, a file with only preset L's block", mp, lo, MSG["no_preset_m"])):
code, so, se = r.run(p, [f], r.path("preset-l", "out-fail", "x")[:-2])
Expand Down
2 changes: 1 addition & 1 deletion clean/converter/tests/unit_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ static void test_api_files(const fs::path& work) {
// preset L (#89): the map versions of preset M, its own message; never the preset of a map without the field
CHECK(find_preset("L") && find_preset("L")->allows(1) && find_preset("L")->allows(4) && !find_preset("L")->allows(2) &&
!find_preset("L")->allows(3) && !find_preset("L")->allows(5) && std::string(find_preset("L")->no_model_message) == kMsgNoPresetL &&
std::string(kMsgNoPresetL).find("preset-L") != std::string::npos);
std::string(kMsgNoPresetL) == "This DLSS file has no preset-L model. Version 310.5 or newer is needed.");
CHECK(std::string(find_preset("M")->no_model_message) == kMsgNoPresetM && std::string(find_preset("K")->no_model_message) == kMsgNoPresetK &&
std::string(find_preset("F")->no_model_message) == kMsgNoPresetF);
{
Expand Down
Loading