From d4b67e2f6ab48ab9ec658140be4f1999f604559a Mon Sep 17 00:00:00 2001 From: skal Date: Sun, 15 Feb 2026 18:52:48 +0100 Subject: archive(cnn): move CNN v1 to cnn_v1/ subdirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate CNN v1 (CNNEffect) into dedicated directory: - C++ effect: src/effects → cnn_v1/src/ - Shaders: workspaces/main/shaders/cnn → cnn_v1/shaders/ - Training: training/train_cnn.py → cnn_v1/training/ - Docs: doc/CNN*.md → cnn_v1/docs/ Updated all references: - CMake source list - C++ includes (relative paths: ../../cnn_v1/src/) - Asset paths (../../cnn_v1/shaders/) - Documentation cross-references CNN v1 remains active in timeline. For new work, use CNN v2 with enhanced features (7D static, storage buffer, sigmoid activation). Tests: 34/34 passing (100%) --- workspaces/main/shaders/cnn/cnn_conv5x5.wgsl | 101 --------------------------- 1 file changed, 101 deletions(-) delete mode 100644 workspaces/main/shaders/cnn/cnn_conv5x5.wgsl (limited to 'workspaces/main/shaders/cnn/cnn_conv5x5.wgsl') diff --git a/workspaces/main/shaders/cnn/cnn_conv5x5.wgsl b/workspaces/main/shaders/cnn/cnn_conv5x5.wgsl deleted file mode 100644 index 9328d75..0000000 --- a/workspaces/main/shaders/cnn/cnn_conv5x5.wgsl +++ /dev/null @@ -1,101 +0,0 @@ -// 5×5 variant for 7→4 channels (vec4-optimized) -// Assumes 'tex' is already normalized to [-1,1] -// UV coordinates remain in [0,1] and are normalized internally -// weights: array, 200> (25 pos × 4 ch × 2 vec4) -fn cnn_conv5x5_7to4( - tex: texture_2d, - samp: sampler, - uv: vec2, - resolution: vec2, - gray: f32, - weights: array, 200> -) -> vec4 { - let step = 1.0 / resolution; - let uv_norm = (uv - 0.5) * 2.0; - let in1 = vec4(uv_norm, gray, 1.0); - - var sum = vec4(0.0); - var pos = 0; - - for (var dy = -2; dy <= 2; dy++) { - for (var dx = -2; dx <= 2; dx++) { - let offset = vec2(f32(dx), f32(dy)) * step; - let rgbd = textureSample(tex, samp, uv + offset); - - sum.r += dot(weights[pos+0], rgbd) + dot(weights[pos+1], in1); - sum.g += dot(weights[pos+2], rgbd) + dot(weights[pos+3], in1); - sum.b += dot(weights[pos+4], rgbd) + dot(weights[pos+5], in1); - sum.a += dot(weights[pos+6], rgbd) + dot(weights[pos+7], in1); - pos += 8; - } - } - - return sum; -} - -// 5×5 variant for 7→1 channel (vec4-optimized) -// Assumes 'tex' is already normalized to [-1,1] -// UV coordinates remain in [0,1] and are normalized internally -// weights: array, 50> (25 pos × 2 vec4) -fn cnn_conv5x5_7to1( - tex: texture_2d, - samp: sampler, - uv: vec2, - resolution: vec2, - gray: f32, - weights: array, 50> -) -> f32 { - let step = 1.0 / resolution; - let uv_norm = (uv - 0.5) * 2.0; - let in1 = vec4(uv_norm, gray, 1.0); - - var sum = 0.0; - var pos = 0; - - for (var dy = -2; dy <= 2; dy++) { - for (var dx = -2; dx <= 2; dx++) { - let offset = vec2(f32(dx), f32(dy)) * step; - let rgbd = textureSample(tex, samp, uv + offset); - - sum += dot(weights[pos], rgbd) + dot(weights[pos+1], in1); - pos += 2; - } - } - - return sum; -} - -// Source layer: 7→4 channels (vec4-optimized) -// Normalizes [0,1] input to [-1,1] internally -fn cnn_conv5x5_7to4_src( - tex: texture_2d, - samp: sampler, - uv: vec2, - resolution: vec2, - weights: array, 200> -) -> vec4 { - let step = 1.0 / resolution; - - let original = (textureSample(tex, samp, uv) - 0.5) * 2.0; - let gray = dot(original.rgb, vec3(0.2126, 0.7152, 0.0722)); - let uv_norm = (uv - 0.5) * 2.0; - let in1 = vec4(uv_norm, gray, 1.0); - - var sum = vec4(0.0); - var pos = 0; - - for (var dy = -2; dy <= 2; dy++) { - for (var dx = -2; dx <= 2; dx++) { - let offset = vec2(f32(dx), f32(dy)) * step; - let rgbd = (textureSample(tex, samp, uv + offset) - 0.5) * 2.0; - - sum.r += dot(weights[pos+0], rgbd) + dot(weights[pos+1], in1); - sum.g += dot(weights[pos+2], rgbd) + dot(weights[pos+3], in1); - sum.b += dot(weights[pos+4], rgbd) + dot(weights[pos+5], in1); - sum.a += dot(weights[pos+6], rgbd) + dot(weights[pos+7], in1); - pos += 8; - } - } - - return sum; -} -- cgit v1.2.3