diff options
Diffstat (limited to 'training')
| -rwxr-xr-x | training/train_cnn.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/training/train_cnn.py b/training/train_cnn.py index 497a07b..d8522ed 100755 --- a/training/train_cnn.py +++ b/training/train_cnn.py @@ -420,7 +420,8 @@ def generate_conv_src_function(kernel_size, output_path): # Normalize center pixel for gray channel f.write(f" let original = (textureSample(tex, samp, uv) - 0.5) * 2.0;\n") f.write(f" let gray = dot(original.rgb, vec3<f32>(0.2126, 0.7152, 0.0722));\n") - f.write(f" let uv_norm = (uv - 0.5) * 2.0;\n\n") + f.write(f" let uv_norm = (uv - 0.5) * 2.0;\n") + f.write(f" let in1 = vec4<f32>(uv_norm, gray, 1.0);\n\n") f.write(f" var sum = vec4<f32>(0.0);\n") f.write(f" var pos = 0;\n\n") @@ -429,8 +430,7 @@ def generate_conv_src_function(kernel_size, output_path): f.write(f" for (var dy = -{radius}; dy <= {radius}; dy++) {{\n") f.write(f" for (var dx = -{radius}; dx <= {radius}; dx++) {{\n") f.write(f" let offset = vec2<f32>(f32(dx), f32(dy)) * step;\n") - f.write(f" let rgbd = (textureSample(tex, samp, uv + offset) - 0.5) * 2.0;\n") - f.write(f" let in1 = vec4<f32>(uv_norm, gray, 1.0);\n\n") + f.write(f" let rgbd = (textureSample(tex, samp, uv + offset) - 0.5) * 2.0;\n\n") # Accumulate with dot products (unrolled) f.write(f" sum.r += dot(weights[pos+0], rgbd) + dot(weights[pos+1], in1);\n") @@ -465,7 +465,8 @@ def generate_conv_final_function(kernel_size, output_path): f.write(f" weights: array<vec4<f32>, {num_positions * 2}>\n") f.write(f") -> f32 {{\n") f.write(f" let step = 1.0 / resolution;\n") - f.write(f" let uv_norm = (uv - 0.5) * 2.0;\n\n") + f.write(f" let uv_norm = (uv - 0.5) * 2.0;\n") + f.write(f" let in1 = vec4<f32>(uv_norm, gray, 1.0);\n\n") f.write(f" var sum = 0.0;\n") f.write(f" var pos = 0;\n\n") @@ -473,8 +474,7 @@ def generate_conv_final_function(kernel_size, output_path): f.write(f" for (var dy = -{radius}; dy <= {radius}; dy++) {{\n") f.write(f" for (var dx = -{radius}; dx <= {radius}; dx++) {{\n") f.write(f" let offset = vec2<f32>(f32(dx), f32(dy)) * step;\n") - f.write(f" let rgbd = textureSample(tex, samp, uv + offset);\n") - f.write(f" let in1 = vec4<f32>(uv_norm, gray, 1.0);\n\n") + f.write(f" let rgbd = textureSample(tex, samp, uv + offset);\n\n") # Accumulate with dot products f.write(f" sum += dot(weights[pos], rgbd) + dot(weights[pos+1], in1);\n") |