TL;DR: Add an experimental FSR Ray Regeneration backend on Windows, run the K

network natively on HIP with Vulkan->HIP shared memory, extend K kernels to gfx11 (RDNA3), and add dependency/packaging/test tooling around them. Windows: FSR RR backend, native HIP K runner, gfx11 K kernels, tooling FSR Ray Regeneration (experimental) - Add fsr_rr_backend.{h,cpp}, fsr_rr_passes.h and the fsr_rr/ prepare and compose compute shaders. They run AMD's FidelityFX denoiser (amd_fidelityfx_denoiser_dx12.dll, SDK 2.3, not bundled) on a private vkd3d-proton device. - Add the amdxc64 shim (tools/windows/amdxc64_shim) and two vkd3d-proton patches for libcxx includes. AMD's amdxc64.dll is never loaded. - d4r_nvngx_windows: RrFeature now selects between the native DLSS RR backend and the FSR backend (D4R_RR_BACKEND=fsr). After the denoiser it runs an internal Super Sampling stage (feature 1) to upscale. If SR is unavailable and output != render size, the frame fails; it is never returned noisy. - d4r.ini / player_config: new [RayReconstruction] FsrDenoiser, FsrStabilityBias (auto or >= 0) and FsrDetail (0-1), with validation, and matching D4R_FSR_* environment variables. - Add the FSR RR fixture, output-check and ngx test scripts, and a shader compile script. Native HIP K runner (Windows) - CMake: add d4r_engine_k_hip (d4r-k-hip) plus separate volk/engine copies, because VK_USE_PLATFORM_WIN32_KHR changes volk's entry points. - Share Vulkan memory with HIP via Win32 opaque handles on Windows (VK_KHR_external_memory_win32) and via fds on Linux. Handle types are now intptr_t, and the platform choice is in D4R_EXT_MEMORY_* macros. - HipNetwork: add debugRepeatHashes and debugNodeMicros, exposed as D4R_HIP_REPEAT_CHECK, D4R_HIP_REPEAT_ALL and D4R_HIP_NODE_PROFILE in replay.cpp. - replay.cpp: display-resolution-motion frames (FrameFlagDisplayMotion) no longer require near2rnd == out2rnd. Both values must still be in (0, 1]. K kernels on gfx11 - Allow position-token and enc1 tiling on __GFX11__ as well as gfx12. - Add an opt-in ds_bpermute cross-half exchange (D4R_WINDOWS_GFX11_DS_EXCHANGE, enabled for K on Windows gfx11). M keeps its LDS path. - Fix a block-barrier race in the position layer. Without POS_VSHARE a fast wave could overwrite its hb rows while a slower wave still read them for a later head, giving rare wrong results on gfx1101 (enc0 outputs differing between identical launches). Packaging and install - install.bat, d4r.ini, WINDOWS_README: FSR option, and install_dependencies.py to install pinned NVIDIA dependencies with staged, hash-verified replacement and rollback. - Update the release package, local package refresh and test scripts. - Add the InteropBatchInputCopies option (default false). Batching is faster on some synthetic runs, but player temporal exactness is unresolved. Tooling and tests - K model: capture_k_weights, build_k_model, compare_k_outputs, benchmark_k_hip, build_capture_runtime, test_k_model and the zluda-k-output-capture patch. Captured weights and models are private local assets and must not enter release archives. - Synthetic probes: test_m_ngx, test_sr_dynamic, prepare_rr_dynamic_fixture and the d3d12/rr_ngx probe updates. - Add tests/windows/test_install_dependencies.py. Docs - Update the windows-fsr-rr, k-performance, local-package, rr-interop and rr-model-cache docs. Add windows-parity-handoff.md and windows-parity-continuation-prompt.md.
2026-10-17 01:43:06 -04:00
1 parent 247fe1092d
commit a617c818de
@@ -3,7 +3,7 @@ param([ValidateSet('enc0','enc1','enc2','enc3','enc4','dec5','dec4','dec3','dec2
    [string]$Layer='enc1', [ValidateSet('source','cu','wgp')][string]$Mode='source',
    [ValidateSet('baseline','load','store','both')][string]$NonTemporal='baseline',
    [ValidateSet(0,1,2,4)][int]$PosTiles=0, [switch]$ShareValues, [switch]$PrivateValues,
-    [switch]$PackedAccumulator,
+    [switch]$PackedAccumulator, [ValidateSet('lds','ds')][string]$LaneExchange='lds',
    [ValidateSet('gfx1100','gfx1101','gfx1102','gfx1103','gfx1150','gfx1151','gfx1152','gfx1153','gfx1154','gfx1200','gfx1201')]
    [string]$GpuArch='gfx1201',
    [string]$HipRoot, [string]$OutputDirectory)
@@ -11,8 +11,8 @@ $ErrorActionPreference='Stop'
 $repo=[IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../..'))
 if (!$HipRoot) { $HipRoot=Join-Path $repo '.tools/therock-10.2.0a20260929/_rocm_sdk_core' }
 if ($ShareValues -and $PrivateValues) { throw 'Choose shared or private V storage.' }
-if ($GpuArch -notmatch '^gfx12' -and ($PosTiles -or $ShareValues -or $PrivateValues -or $PackedAccumulator)) {
-    throw 'Token tiling and accumulator/storage experiments require gfx12.'
+if ($GpuArch -notmatch '^gfx12' -and $PackedAccumulator) {
+    throw 'Packed accumulator experiments require gfx12.'
 }
 if (!$OutputDirectory) { $OutputDirectory=Join-Path $repo "build/native-k-experiment-$GpuArch-$Layer-$Mode-$NonTemporal-pos$PosTiles-share$([int][bool]$ShareValues)-private$([int][bool]$PrivateValues)-packed$([int][bool]$PackedAccumulator)" }
 $OutputDirectory=[IO.Path]::GetFullPath($OutputDirectory)
@@ -46,6 +46,10 @@ if ($ShareValues) {
 if ($PackedAccumulator) { $flags+='-DD4R_K_PACKED_ACC' }
 if ($PrivateValues) { $flags+='-DD4R_K_PRIVATE_V' }
 if ($GpuArch -match '^gfx11') { $flags+='-DD4R_WINDOWS_GFX11_LANE_EXCHANGE' }
+if ($LaneExchange -eq 'ds') {
+    if ($GpuArch -notmatch '^gfx11') { throw 'DS lane exchange experiment requires gfx11.' }
+    $flags+='-DD4R_WINDOWS_GFX11_DS_EXCHANGE'
+}
 New-Item -ItemType Directory -Force $OutputDirectory | Out-Null
 $object=Join-Path $OutputDirectory "$name.hsaco"
 $arguments=@('-x','hip','-std=c++17',"--offload-arch=$GpuArch",'--offload-device-only',
@@ -64,7 +68,7 @@ if ($LASTEXITCODE) { throw 'Native object metadata extraction failed.' }
@{layer=$Layer; architecture=$GpuArch; experimental=$true; numericalValidation='pending';
    mode=$Mode; nonTemporal=$NonTemporal; tokenTilesPerWave=$PosTiles; shareValues=[bool]$ShareValues;
    privateValues=[bool]$PrivateValues;
-    packedAccumulator=[bool]$PackedAccumulator;
+    packedAccumulator=[bool]$PackedAccumulator; laneExchange=$LaneExchange;
    compiler=$compiler; arguments=$arguments;
    sourceCommit=(git -C $repo rev-parse HEAD); workingTreeDirty=[bool](& git -C $repo status --porcelain);
    compilerVersion=(& $compiler --version | Out-String).Trim();
@@ -0,0 +1,26 @@
+"""Compile the FSR RR conversion shaders with the pinned glslang into tools/windows/fsr_rr/fsr_rr_shaders_spv.h."""
+import hashlib
+import struct
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+repo = Path(__file__).resolve().parents[2]
+glslang = repo / '.tools/glslang-16.6.0/bin/glslangValidator.exe'
+if hashlib.sha256(glslang.read_bytes()).hexdigest() != '9643709c02c83e26773f96b6a87f197ab2e84f78be0879ad8fb3619418b5d9ad':
+    sys.exit('requires the pinned glslang 16.6.0')
+source = repo / 'tools/windows/fsr_rr'
+lines = ['#pragma once', '#include <cstdint>', '// Generated by scripts/windows/compile-fsr-rr-shaders.py; do not edit.']
+with tempfile.TemporaryDirectory() as tmp:
+    for name in ('fsr_rr_prepare', 'fsr_rr_compose'):
+        out = Path(tmp) / (name + '.spv')
+        subprocess.run([str(glslang), '-V', '--target-env', 'vulkan1.0', '-o', str(out), str(source / (name + '.comp'))],
+                       check=True, stdout=subprocess.DEVNULL)
+        data = out.read_bytes()
+        words = struct.unpack('<' + 'I' * (len(data) // 4), data)
+        lines.append(f'static const uint32_t d4r_vk_{name}[] = {{')
+        lines.extend(','.join(f'0x{w:08x}' for w in words[i:i + 8]) + ',' for i in range(0, len(words), 8))
+        lines.append('};')
+(source / 'fsr_rr_shaders_spv.h').write_text('\n'.join(lines) + '\n')
+print('wrote', source / 'fsr_rr_shaders_spv.h')
@@ -198,8 +198,8 @@ $iniPath = Join-Path $d4r 'd4r.ini'
 $model = 'K'
 if (Test-Path -LiteralPath $iniPath) {
    $section = ''; $iniProblems = 0
-    $known = @{ 'dlss.model' = 1; 'dlss.showwatermark' = 1; 'interop.asyncinterop' = 1; 'debug.validateoutput' = 1; 'debug.log' = 1; 'paths.cachedir' = 1; 'paths.nativedir' = 1; 'kernels.nativefp8' = 1; 'rayreconstruction.backend' = 1; 'rayreconstruction.modeldir' = 1 }
-    $boolean = @('dlss.showwatermark', 'interop.asyncinterop', 'debug.validateoutput', 'kernels.nativefp8')
+    $known = @{ 'dlss.model' = 1; 'dlss.showwatermark' = 1; 'interop.asyncinterop' = 1; 'interop.batchinputcopies' = 1; 'debug.validateoutput' = 1; 'debug.log' = 1; 'paths.cachedir' = 1; 'paths.nativedir' = 1; 'kernels.nativefp8' = 1; 'rayreconstruction.backend' = 1; 'rayreconstruction.modeldir' = 1 }
+    $boolean = @('dlss.showwatermark', 'interop.asyncinterop', 'interop.batchinputcopies', 'debug.validateoutput', 'kernels.nativefp8')
    foreach ($raw in (Read-TextFile $iniPath).TrimStart([char]0xFEFF) -split "`n") {
        $line = $raw.Trim()
        if (!$line -or $line.StartsWith(';') -or $line.StartsWith('#')) { continue }
@@ -9,11 +9,18 @@ param(
    [Parameter(Mandatory=$true)][string]$PackageRoot,
    [string[]]$Architectures,   # default: every target in gpu-targets.json; a subset makes a smaller release
    [string]$ArchivePath,
+    [string]$RrToolsArchive,
+    [string]$FsrPayload,        # build_fsr_payload.py output: vkd3d-proton core + amdxc64 shim for the experimental FSR RR backend
    [switch]$LocalDevelopment
 )
 $ErrorActionPreference='Stop'
 . (Join-Path $PSScriptRoot 'gpu-target.ps1')
 $repo=[IO.Path]::GetFullPath((Join-Path $PSScriptRoot '../..'))
+if (!$RrToolsArchive) { $RrToolsArchive=Join-Path $repo 'build/rr-portable-tools-v2.zip' }
+if (!(Test-Path -LiteralPath $RrToolsArchive -PathType Leaf) -or
+    (Get-FileHash -LiteralPath $RrToolsArchive -Algorithm SHA256).Hash -ne '297289a57a82142eb952479c99112b1c352a6753eb15bc6b2431bf686aed9b22') {
+    throw 'Pass -RrToolsArchive with the verified clean portable-tools v2 ZIP. Never package a used tool directory.'
+}
 if (!$GamePackagePrefix) { $GamePackagePrefix=Join-Path $repo 'dist/windows-gpu-coverage-game' }
 $PackageRoot=[IO.Path]::GetFullPath($PackageRoot)
 if($LocalDevelopment){
@@ -81,19 +88,56 @@ Stage (Join-Path $repo 'packaging/windows/d4r.ini') 'd4r/d4r.ini'
 Stage (Join-Path $repo 'tools/windows/dll-pins.txt') 'd4r/dll-pins.txt'
 Stage (Join-Path $repo 'tools/windows/gpu-targets.json') 'd4r/gpu-targets.json'
 if (!$inventoryStaged) { throw 'No d4r/d4r_gpu_inventory.exe in the inputs; d4r-check.ps1 needs it to query the GPU.' }
+if ($FsrPayload) {
+    # Experimental FSR RR backend: d4r-built vkd3d-proton (LGPL, source offer in SOURCE.txt) and d4r's amdxc64 shim.
+    # AMD's denoiser is never bundled; install.bat downloads the hash-pinned file when FSR is selected.
+    $FsrPayload=[IO.Path]::GetFullPath($FsrPayload)
+    $payloadManifest=Get-Content -LiteralPath (Join-Path $FsrPayload 'fsr-payload.json') -Raw | ConvertFrom-Json
+    if ($payloadManifest.kind -ne 'd4r-fsr-payload' -or $payloadManifest.amdDenoiserBundled) { throw 'Unsupported FSR payload manifest.' }
+    foreach ($property in $payloadManifest.files.PSObject.Properties) {
+        $file=Join-Path $FsrPayload $property.Name
+        if ((Get-FileHash -LiteralPath $file -Algorithm SHA256).Hash -ne $property.Value) { throw "FSR payload file changed: $($property.Name)" }  # -ne ignores case
+    }
+    foreach ($name in @('d4r_vkd3d_core.dll','amdxc64.dll')) { Stage (Join-Path $FsrPayload "fsr/$name") "d4r/fsr/$name" }
+    Stage (Join-Path $FsrPayload 'SOURCE.txt') 'd4r/fsr/SOURCE.txt'
+    foreach ($license in Get-ChildItem -LiteralPath (Join-Path $FsrPayload 'licenses') -File) { Stage $license.FullName "d4r/licenses/$($license.Name)" }
+    foreach ($patch in Get-ChildItem -LiteralPath (Join-Path $repo 'patches/vkd3d-proton-windows') -Filter '*.patch' -File) { Stage $patch.FullName "d4r/fsr/patches/$($patch.Name)" }
+}
 foreach ($optional in @(@{source='packaging/windows/WINDOWS_README.txt'; path='WINDOWS_README.txt'},
                         @{source='packaging/windows/install.bat'; path='install.bat'},
                         @{source='scripts/windows/install-dlss.ps1'; path='install-dlss.ps1'},
+                         @{source='tools/windows/install_dependencies.py'; path='install-dependencies.py'},
                         @{source='scripts/windows/d4r-check.ps1'; path='d4r/d4r-check.ps1'})) {
    $path=Join-Path $repo $optional.source
    if (Test-Path -LiteralPath $path) { Stage $path $optional.path }
 }
+Add-Type -AssemblyName System.IO.Compression,System.IO.Compression.FileSystem
+$toolZip=[IO.Compression.ZipFile]::OpenRead([IO.Path]::GetFullPath($RrToolsArchive))
+try {
+    $reader=[IO.StreamReader]::new($toolZip.GetEntry('rr-tools.json').Open())
+    try { $toolManifest=$reader.ReadToEnd() | ConvertFrom-Json } finally { $reader.Dispose() }
+    foreach ($entry in $toolZip.Entries) {
+        if ($entry.FullName.EndsWith('/')) { continue }
+        $name=$entry.FullName
+        if ($name -match '(^/|\\|:|(^|/)\.\.(/|$))') { throw "Unsafe portable-tools entry: $name" }
+        $relative='d4r/model-tools/'+$name
+        $destination=Join-Path $PackageRoot $relative
+        New-Item -ItemType Directory -Force (Split-Path $destination) | Out-Null
+        $inputStream=$entry.Open(); $outputStream=[IO.File]::Open($destination,[IO.FileMode]::CreateNew)
+        try { $inputStream.CopyTo($outputStream) } finally { $inputStream.Dispose(); $outputStream.Dispose() }
+        $digest=(Get-FileHash -LiteralPath $destination -Algorithm SHA256).Hash
+        if ($name -ne 'rr-tools.json' -and $digest -ne $toolManifest.files.PSObject.Properties[$name].Value) {
+            throw "Portable-tools hash mismatch: $name"
+        }
+        $files.Add(@{path=$relative; sha256=$digest; version=$null})
+    }
+} finally { $toolZip.Dispose() }
 # Shows players where the NGX core goes; a ZIP cannot carry an empty folder.
 $placeholder=Join-Path $PackageRoot 'd4r/ngx/PUT _nvngx.dll HERE.txt'
 New-Item -ItemType Directory -Force (Split-Path $placeholder) | Out-Null
 "Copy NVIDIA's _nvngx.dll into this folder. See WINDOWS_README.txt." | Set-Content -LiteralPath $placeholder -Encoding ASCII
 $files.Add(@{path='d4r/ngx/PUT _nvngx.dll HERE.txt'; sha256=(Get-FileHash -LiteralPath $placeholder -Algorithm SHA256).Hash; version=$null})
-if (Get-ChildItem -LiteralPath $PackageRoot -Recurse -File | Where-Object { $_.Name -in @('nvngx_dlss.dll','nvngx_dlssd.dll') -or ($_.Name -eq '_nvngx.dll' -and $_.DirectoryName -ne (Join-Path $PackageRoot 'd4r')) }) {
+if (Get-ChildItem -LiteralPath $PackageRoot -Recurse -File | Where-Object { $_.Name -in @('nvngx_dlss.dll','nvngx_dlssd.dll','amd_fidelityfx_denoiser_dx12.dll') -or ($_.Name -eq '_nvngx.dll' -and $_.DirectoryName -ne (Join-Path $PackageRoot 'd4r')) }) {
    throw 'Proprietary NVIDIA binaries must not be in the release.'
 }
 # Read by d4r-check.ps1: every shipped file's hash, so a damaged or mixed install is reported.
@@ -54,7 +54,8 @@ $release=Join-Path $OutputDirectory 'release'
 Invoke-Package $prefix $release
 foreach ($path in @('dxgi.dll','OptiScaler.ini','d4r/_nvngx.dll','d4r/d4r.ini','d4r/dll-pins.txt','d4r/package.json',
                    'd4r/hip/bin/amdhip64_7.dll','d4r/zluda/nvcuda.dll','d4r/licenses/d4r.txt','d4r/ngx/PUT _nvngx.dll HERE.txt',
-                    'd4r/gpu-targets.json','d4r/d4r_gpu_inventory.exe','d4r/d4r-check.ps1','WINDOWS_README.txt')) {
+                    'd4r/gpu-targets.json','d4r/d4r_gpu_inventory.exe','d4r/d4r-check.ps1','WINDOWS_README.txt',
+                    'install.bat','install-dependencies.py','d4r/model-tools/python/python.exe','d4r/model-tools/rr-tools.json')) {
    if (!(Test-Path -LiteralPath (Join-Path $release $path))) { throw "Release lacks $path" }
 }
 if ((Get-Content -LiteralPath (Join-Path $release 'd4r/_nvngx.dll') -Raw).Trim() -ne 'loader fixture') { throw 'd4r/_nvngx.dll is not the loader.' }
@@ -91,6 +92,47 @@ try { & (Join-Path $PSScriptRoot 'package-windows-release.ps1') -GamePackagePref
 if (!$rejected) { throw 'An unknown architecture was not rejected.' }
 $results+=@{case='architecture-subset'; passed=$true; shipped=$kept}

+# 1c. The optional FSR payload (vkd3d-proton core + amdxc64 shim) ships under d4r/fsr with its licences and source
+#     offer; AMD's denoiser never ships; a payload that claims to bundle it, or a changed file, is rejected.
+function New-FsrPayload([string]$Root,[bool]$ClaimsAmd) {
+    $files=[ordered]@{'fsr/d4r_vkd3d_core.dll'='core fixture'; 'fsr/amdxc64.dll'='shim fixture'; 'SOURCE.txt'='source offer';
+                      'licenses/vkd3d-proton-LGPL-2.1.txt'='lgpl'; 'licenses/dxil-spirv-MIT.txt'='mit'}
+    $hashes=[ordered]@{}
+    foreach ($entry in $files.GetEnumerator()) {
+        $path=Join-Path $Root $entry.Key; New-Item -ItemType Directory -Force (Split-Path $path) | Out-Null
+        Set-Content -LiteralPath $path $entry.Value -Encoding ASCII
+        $hashes[$entry.Key]=(Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash.ToLowerInvariant()
+    }
+    @{schema=1; kind='d4r-fsr-payload'; amdDenoiserBundled=$ClaimsAmd; files=$hashes} | ConvertTo-Json -Depth 4 |
+        Set-Content -LiteralPath (Join-Path $Root 'fsr-payload.json') -Encoding UTF8
+}
+$goodPrefix=Join-Path $OutputDirectory 'inputs/good/game'
+$payload=Join-Path $OutputDirectory 'fsr-payload'; New-FsrPayload $payload $false
+$fsrRelease=Join-Path $OutputDirectory 'release-fsr'
+& (Join-Path $PSScriptRoot 'package-windows-release.ps1') -GamePackagePrefix $goodPrefix -LoaderDll $loader -PackageRoot $fsrRelease -FsrPayload $payload | Out-Null
+foreach ($path in @('d4r/fsr/d4r_vkd3d_core.dll','d4r/fsr/amdxc64.dll','d4r/fsr/SOURCE.txt','d4r/licenses/vkd3d-proton-LGPL-2.1.txt',
+                    'd4r/licenses/dxil-spirv-MIT.txt','d4r/fsr/patches/0001-dxil-spirv-include-exception-for-libcxx.patch')) {
+    if (!(Test-Path -LiteralPath (Join-Path $fsrRelease $path))) { throw "FSR release lacks $path" }
+}
+if (Get-ChildItem -LiteralPath $fsrRelease -Recurse -Filter 'amd_fidelityfx_denoiser_dx12.dll') { throw "AMD's denoiser must never ship." }
+$fsrManifest=Get-Content -LiteralPath (Join-Path $fsrRelease 'd4r/package.json') -Raw | ConvertFrom-Json
+foreach ($file in $fsrManifest.files) {
+    if ((Get-FileHash -LiteralPath (Join-Path $fsrRelease $file.path) -Algorithm SHA256).Hash -ne $file.sha256) { throw "FSR manifest hash wrong: $($file.path)" }
+}
+$fsrShipped=@(Get-ChildItem -LiteralPath $fsrRelease -Recurse -File | ForEach-Object { $_.FullName.Substring($fsrRelease.Length+1).Replace('\','/') } | Where-Object { $_ -ne 'd4r/package.json' })
+if (Compare-Object $fsrShipped @($fsrManifest.files.path)) { throw 'FSR release manifest and shipped files differ.' }
+if (Test-Path -LiteralPath (Join-Path $release 'd4r/fsr')) { throw 'The default release must not carry the FSR payload.' }
+$claims=Join-Path $OutputDirectory 'fsr-payload-claims-amd'; New-FsrPayload $claims $true
+$rejected=$false
+try { & (Join-Path $PSScriptRoot 'package-windows-release.ps1') -GamePackagePrefix $goodPrefix -LoaderDll $loader -PackageRoot (Join-Path $OutputDirectory 'release-fsr-claims') -FsrPayload $claims | Out-Null } catch { $rejected=$_.Exception.Message -match 'Unsupported FSR payload' }
+if (!$rejected) { throw 'A payload claiming to bundle AMD software was not rejected.' }
+$tampered=Join-Path $OutputDirectory 'fsr-payload-tampered'; New-FsrPayload $tampered $false
+Set-Content -LiteralPath (Join-Path $tampered 'fsr/amdxc64.dll') 'changed after hashing' -Encoding ASCII
+$rejected=$false
+try { & (Join-Path $PSScriptRoot 'package-windows-release.ps1') -GamePackagePrefix $goodPrefix -LoaderDll $loader -PackageRoot (Join-Path $OutputDirectory 'release-fsr-tampered') -FsrPayload $tampered | Out-Null } catch { $rejected=$_.Exception.Message -match 'FSR payload file changed' }
+if (!$rejected) { throw 'A changed FSR payload file was not rejected.' }
+$results+=@{case='fsr-payload'; passed=$true; files=$fsrShipped.Count}
+
 # 2. A code object for another GPU in a target's input is rejected.
 $prefix=Join-Path $OutputDirectory 'inputs/mixed/game'
 New-Inputs $prefix { param($root,$arch) if ($arch -eq 'gfx1101') { Write-CodeObject (Join-Path $root 'd4r/native/kernel3.hsaco') 65 } }
@@ -125,7 +167,7 @@ $metadata=Get-Content -LiteralPath (Join-Path $developmentRoot 'package/d4r/pack
 if(!$metadata.localDevelopment){throw 'Local ZIP lacks development marker.'}
 $archive=[IO.Compression.ZipFile]::OpenRead($zip)
 try{
-    foreach($required in @('install.bat','install-dlss.ps1','d4r/d4r.ini')){
+    foreach($required in @('install.bat','install-dlss.ps1','install-dependencies.py','d4r/d4r.ini','d4r/model-tools/python/python.exe')){
        if(!$archive.GetEntry($required)){throw "Local ZIP lacks $required"}
    }
 }finally{$archive.Dispose()}