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_layer.wgsl | 55 ------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 workspaces/main/shaders/cnn/cnn_layer.wgsl (limited to 'workspaces/main/shaders/cnn/cnn_layer.wgsl') diff --git a/workspaces/main/shaders/cnn/cnn_layer.wgsl b/workspaces/main/shaders/cnn/cnn_layer.wgsl deleted file mode 100644 index cbd1686..0000000 --- a/workspaces/main/shaders/cnn/cnn_layer.wgsl +++ /dev/null @@ -1,55 +0,0 @@ -// CNN layer shader - uses modular convolution snippets -// Supports multi-pass rendering with residual connections -// DO NOT EDIT - Generated by train_cnn.py - -@group(0) @binding(0) var smplr: sampler; -@group(0) @binding(1) var txt: texture_2d; - -#include "common_uniforms" -#include "cnn_activation" -#include "cnn_conv3x3" -#include "cnn_conv5x5" -#include "cnn_weights_generated" - -struct CNNLayerParams { - layer_index: i32, - blend_amount: f32, - _pad: vec2, -}; - -@group(0) @binding(2) var uniforms: CommonUniforms; -@group(0) @binding(3) var params: CNNLayerParams; -@group(0) @binding(4) var original_input: texture_2d; - -@vertex fn vs_main(@builtin(vertex_index) i: u32) -> @builtin(position) vec4 { - var pos = array, 3>( - vec2(-1.0, -1.0), vec2(3.0, -1.0), vec2(-1.0, 3.0) - ); - return vec4(pos[i], 0.0, 1.0); -} - -@fragment fn fs_main(@builtin(position) p: vec4) -> @location(0) vec4 { - // Match PyTorch linspace - let uv = (p.xy - 0.5) / (uniforms.resolution - 1.0); - let original_raw = textureSample(original_input, smplr, uv); - let original = (original_raw - 0.5) * 2.0; // Normalize to [-1,1] - let gray = (dot(original_raw.rgb, vec3(0.2126, 0.7152, 0.0722)) - 0.5) * 2.0; - var result = vec4(0.0); - - // Layer 0: 7→4 (RGBD output, normalizes [0,1] input) - if (params.layer_index == 0) { - result = cnn_conv5x5_7to4_src(txt, smplr, uv, uniforms.resolution, weights_layer0); - result = cnn_tanh(result); - } - else if (params.layer_index == 1) { - result = cnn_conv3x3_7to4(txt, smplr, uv, uniforms.resolution, gray, weights_layer1); - result = cnn_tanh(result); // Keep in [-1,1] - } - else if (params.layer_index == 2) { - let sum = cnn_conv3x3_7to1(txt, smplr, uv, uniforms.resolution, gray, weights_layer2); - let gray_out = 1.0 / (1.0 + exp(-sum)); // Sigmoid activation - result = vec4(gray_out, gray_out, gray_out, 1.0); - return mix(original_raw, result, params.blend_amount); // [0,1] - } - return result; // [-1,1] -} -- cgit v1.2.3