Engine: native presets K and M in the D3D12 shim, wider game coverage
A standalone Vulkan inference engine (engine/) for DLSS presets K and M that runs from weights extracted from the user's own nvngx_dlss.dll, with d4r's own input, network and reconstruction shaders or the native HIP network layers, recorded into the game's command list by the shim. Opt-in ([Engine] Enabled / D4R_ENGINE=1); anything uncovered falls back to the CUDA/ZLUDA path with the reason logged. Byte-identical to NGX's CUDA backend under the phase-capable reference (1706x960 -> 2560x1440, native HIP network, eleven frames, RX 9070 XT): - K render- and display-resolution motion vectors, HDR and LDR - K game-supplied exposure and automatic exposure with any pre-exposure and exposure scale (one residual: effective exposure exactly 2 or 4) - K and M with the DLSS indicator's inverted-axis parameters - M with any exposure settings (NGX ignores them for M) K packages need the current compile_k.py (marker D4RO0003). Also: HIP shared buffers are pooled across feature recreation (ROCm leaks destroyed imports), hipnet.bin must match the preset, M-only games do not load the K model, install_d4r_runtime.sh stages k, k-ldr, m, m-ldr with hip/, the activation table has a generator (gen_activation_m.py), and package_release.sh can bundle the engine's shaders (never its weights). Signed-off-by: woutermans <[email protected]>
This commit is contained in:
1 parent
16cfc1f063
commit
e0d1549a21
82 files changed
+13335
-96
No files matched your search
@@ -25,6 +25,29 @@ class ShimConfigTests(unittest.TestCase):
|
||||
self.assertEqual(int(portable[1]), 200)
|
||||
self.assertEqual(int(runtime[1]), 200)
|
||||
|
||||
def test_engine_is_opt_in_and_configured_by_ini(self):
|
||||
for name in ('packaging/d4r.ini', 'config/d4r.ini.default'):
|
||||
ini = configparser.ConfigParser(inline_comment_prefixes=(';',))
|
||||
ini.read(ROOT / name)
|
||||
self.assertFalse(ini.getboolean('Engine', 'Enabled'), name)
|
||||
self.assertEqual(ini.get('Engine', 'ModelDir'), 'auto', name)
|
||||
source = SHIM.read_text()
|
||||
self.assertIn('portable_set("D4R_ENGINE", ini_flag(ini, "engine", "Enabled", 0) ? "1" : "0");', source)
|
||||
self.assertIn('env_uint("D4R_ENGINE", 0)', source)
|
||||
with tempfile.TemporaryDirectory() as temporary:
|
||||
ini = Path(temporary) / 'd4r.ini'
|
||||
env = {key: value for key, value in os.environ.items() if not key.startswith('D4R_')}
|
||||
cmd = ['python3', str(ROOT / 'scripts/d4r_config.py'), '--config', str(ini)]
|
||||
for text, enabled, model in (('', '0', None), ('[Engine]\nEnabled = true\n', '1', None),
|
||||
('[Engine]\nEnabled = true\nModelDir = /models/k\n', '1', '/models/k')):
|
||||
ini.write_text(text)
|
||||
result = subprocess.run(cmd, env=env, text=True, capture_output=True, check=True)
|
||||
self.assertIn(f'export D4R_ENGINE={enabled}\n', result.stdout)
|
||||
self.assertEqual('export D4R_ENGINE_MODEL_DIR=/models/k\n' in result.stdout, model is not None)
|
||||
ini.write_text('[Engine]\nEnabled = maybe\n')
|
||||
result = subprocess.run(cmd, env=env, text=True, capture_output=True)
|
||||
self.assertEqual(result.returncode, 2)
|
||||
|
||||
def test_launcher_marker_poll_defaults_overrides_and_validation(self):
|
||||
with tempfile.TemporaryDirectory() as temporary:
|
||||
ini = Path(temporary) / 'd4r.ini'
|
||||
@@ -49,7 +72,8 @@ class ShimConfigTests(unittest.TestCase):
|
||||
# and a captured logger, so the test exercises the production message
|
||||
# and override behavior without requiring Windows, NGX or a GPU.
|
||||
source = SHIM.read_text()
|
||||
start = source.index(' const char* presetNames[] =')
|
||||
creation = source.index('static NgxResult create_feature(')
|
||||
start = source.index(' const char* presetNames[] =', creation)
|
||||
end = source.index(' feature->preset = presets[1];', start)
|
||||
block = source[start:end]
|
||||
runner_source = r'''
|
||||
|
||||
Reference in new issue
Block a user