diff options
36 files changed, 13 insertions, 13 deletions
diff --git a/checkpoints/checkpoint_epoch_50.pth b/checkpoints/checkpoint_epoch_50.pth Binary files differindex 03795aa..f57900a 100644 --- a/checkpoints/checkpoint_epoch_50.pth +++ b/checkpoints/checkpoint_epoch_50.pth diff --git a/cmake/DemoExecutables.cmake b/cmake/DemoExecutables.cmake index 86b63da..4ea3b34 100644 --- a/cmake/DemoExecutables.cmake +++ b/cmake/DemoExecutables.cmake @@ -7,11 +7,11 @@ if(DEMO_STRIP_EXTERNAL_LIBS) # Size measurement mode: Stub main, no timeline/music - add_demo_executable(demo64k src/stub_main.cc ${PLATFORM_SOURCES} ${GEN_DEMO_CC}) + add_demo_executable(demo64k src/app/stub_main.cc ${PLATFORM_SOURCES} ${GEN_DEMO_CC}) add_dependencies(demo64k generate_demo_assets) else() # Normal mode: Full main with timeline and music - add_demo_executable(demo64k src/main.cc ${PLATFORM_SOURCES} ${GEN_DEMO_CC} ${GENERATED_TIMELINE_CC} ${GENERATED_MUSIC_DATA_CC}) + add_demo_executable(demo64k src/app/main.cc ${PLATFORM_SOURCES} ${GEN_DEMO_CC} ${GENERATED_TIMELINE_CC} ${GENERATED_MUSIC_DATA_CC}) add_dependencies(demo64k generate_demo_assets generate_timeline generate_tracker_music) endif() @@ -79,7 +79,7 @@ set_source_files_properties(${GENERATED_TEST_DEMO_MUSIC_CC} PROPERTIES GENERATED if(NOT DEMO_STRIP_EXTERNAL_LIBS) add_demo_executable( test_demo - src/test_demo.cc + src/app/test_demo.cc ${PLATFORM_SOURCES} ${GEN_DEMO_CC} ${GENERATED_TEST_DEMO_TIMELINE_CC} diff --git a/scripts/train_cnn_v2_full.sh b/scripts/train_cnn_v2_full.sh index fc9355a..d6ddbe2 100755 --- a/scripts/train_cnn_v2_full.sh +++ b/scripts/train_cnn_v2_full.sh @@ -40,13 +40,13 @@ INPUT_DIR="training/input" TARGET_DIR="training/target_2" CHECKPOINT_DIR="checkpoints" VALIDATION_DIR="validation_results" -EPOCHS=100 -CHECKPOINT_EVERY=5 +EPOCHS=200 +CHECKPOINT_EVERY=50 BATCH_SIZE=16 # Patch-based training (default) -PATCH_SIZE=32 -PATCHES_PER_IMAGE=64 +PATCH_SIZE=8 +PATCHES_PER_IMAGE=256 DETECTOR="harris" # Full-image training (alternative - uncomment to use) diff --git a/src/main.cc b/src/app/main.cc index 45a642a..45a642a 100644 --- a/src/main.cc +++ b/src/app/main.cc diff --git a/src/stub_main.cc b/src/app/stub_main.cc index 8540fcd..8540fcd 100644 --- a/src/stub_main.cc +++ b/src/app/stub_main.cc diff --git a/src/test_demo.cc b/src/app/test_demo.cc index 7f10c3b..7f10c3b 100644 --- a/src/test_demo.cc +++ b/src/app/test_demo.cc diff --git a/validation_results/epoch_100_output.png b/validation_results/epoch_100_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_100_output.png +++ /dev/null diff --git a/validation_results/epoch_10_output.png b/validation_results/epoch_10_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_10_output.png +++ /dev/null diff --git a/validation_results/epoch_15_output.png b/validation_results/epoch_15_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_15_output.png +++ /dev/null diff --git a/validation_results/epoch_20_output.png b/validation_results/epoch_20_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_20_output.png +++ /dev/null diff --git a/validation_results/epoch_25_output.png b/validation_results/epoch_25_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_25_output.png +++ /dev/null diff --git a/validation_results/epoch_30_output.png b/validation_results/epoch_30_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_30_output.png +++ /dev/null diff --git a/validation_results/epoch_35_output.png b/validation_results/epoch_35_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_35_output.png +++ /dev/null diff --git a/validation_results/epoch_40_output.png b/validation_results/epoch_40_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_40_output.png +++ /dev/null diff --git a/validation_results/epoch_45_output.png b/validation_results/epoch_45_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_45_output.png +++ /dev/null diff --git a/validation_results/epoch_50_output.png b/validation_results/epoch_50_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_50_output.png +++ /dev/null diff --git a/validation_results/epoch_55_output.png b/validation_results/epoch_55_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_55_output.png +++ /dev/null diff --git a/validation_results/epoch_5_output.png b/validation_results/epoch_5_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_5_output.png +++ /dev/null diff --git a/validation_results/epoch_60_output.png b/validation_results/epoch_60_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_60_output.png +++ /dev/null diff --git a/validation_results/epoch_65_output.png b/validation_results/epoch_65_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_65_output.png +++ /dev/null diff --git a/validation_results/epoch_70_output.png b/validation_results/epoch_70_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_70_output.png +++ /dev/null diff --git a/validation_results/epoch_75_output.png b/validation_results/epoch_75_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_75_output.png +++ /dev/null diff --git a/validation_results/epoch_80_output.png b/validation_results/epoch_80_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_80_output.png +++ /dev/null diff --git a/validation_results/epoch_85_output.png b/validation_results/epoch_85_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_85_output.png +++ /dev/null diff --git a/validation_results/epoch_90_output.png b/validation_results/epoch_90_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_90_output.png +++ /dev/null diff --git a/validation_results/epoch_95_output.png b/validation_results/epoch_95_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/epoch_95_output.png +++ /dev/null diff --git a/validation_results/img_000_output.png b/validation_results/img_000_output.png Binary files differdeleted file mode 100644 index ea63a31..0000000 --- a/validation_results/img_000_output.png +++ /dev/null diff --git a/validation_results/img_001_output.png b/validation_results/img_001_output.png Binary files differdeleted file mode 100644 index 8c5a6e0..0000000 --- a/validation_results/img_001_output.png +++ /dev/null diff --git a/validation_results/img_002_output.png b/validation_results/img_002_output.png Binary files differdeleted file mode 100644 index 2044840..0000000 --- a/validation_results/img_002_output.png +++ /dev/null diff --git a/validation_results/img_003_output.png b/validation_results/img_003_output.png Binary files differdeleted file mode 100644 index 9caff40..0000000 --- a/validation_results/img_003_output.png +++ /dev/null diff --git a/validation_results/img_004_output.png b/validation_results/img_004_output.png Binary files differdeleted file mode 100644 index b9fa2da..0000000 --- a/validation_results/img_004_output.png +++ /dev/null diff --git a/validation_results/img_005_output.png b/validation_results/img_005_output.png Binary files differdeleted file mode 100644 index 0b43ab0..0000000 --- a/validation_results/img_005_output.png +++ /dev/null diff --git a/validation_results/img_006_output.png b/validation_results/img_006_output.png Binary files differdeleted file mode 100644 index 26885d3..0000000 --- a/validation_results/img_006_output.png +++ /dev/null diff --git a/validation_results/img_007_output.png b/validation_results/img_007_output.png Binary files differdeleted file mode 100644 index 2a3a411..0000000 --- a/validation_results/img_007_output.png +++ /dev/null diff --git a/workspaces/main/assets.txt b/workspaces/main/assets.txt index 4cbbb0f..4f262ea 100644 --- a/workspaces/main/assets.txt +++ b/workspaces/main/assets.txt @@ -43,8 +43,8 @@ SHADER_CNN_CONV5X5, NONE, shaders/cnn/cnn_conv5x5.wgsl, "CNN 5x5 Convolution" SHADER_CNN_CONV7X7, NONE, shaders/cnn/cnn_conv7x7.wgsl, "CNN 7x7 Convolution" SHADER_CNN_WEIGHTS, NONE, shaders/cnn/cnn_weights_generated.wgsl, "CNN Weights (Generated)" SHADER_CNN_LAYER, NONE, shaders/cnn/cnn_layer.wgsl, "CNN Layer Shader" -SHADER_CNN_V2_STATIC, NONE, shaders/cnn_v2_static.wgsl, "CNN v2 Static Features" -SHADER_CNN_V2_COMPUTE, NONE, shaders/cnn_v2_compute.wgsl, "CNN v2 Compute (Storage Buffer)" +SHADER_CNN_V2_STATIC, NONE, shaders/cnn_v2/cnn_v2_static.wgsl, "CNN v2 Static Features" +SHADER_CNN_V2_COMPUTE, NONE, shaders/cnn_v2/cnn_v2_compute.wgsl, "CNN v2 Compute (Storage Buffer)" WEIGHTS_CNN_V2, NONE, cnn_v2_weights.bin, "CNN v2 Binary Weights" SHADER_SOLARIZE, NONE, shaders/solarize.wgsl, "Solarize Shader" SHADER_DISTORT, NONE, shaders/distort.wgsl, "Distort Shader" @@ -60,8 +60,8 @@ SHADER_RENDER_SCENE_QUERY_BVH, NONE, shaders/render/scene_query_bvh.wgsl, "Scene SHADER_RENDER_SCENE_QUERY_LINEAR, NONE, shaders/render/scene_query_linear.wgsl, "Scene Query Snippet (Linear)" SHADER_RENDER_LIGHTING_UTILS, NONE, shaders/render/lighting_utils.wgsl, "Lighting Utils Snippet" SHADER_MESH, NONE, shaders/mesh_render.wgsl, "Mesh Rasterization Shader" -MESH_CUBE, NONE, test_mesh.obj, "A simple cube mesh" -DODECAHEDRON, NONE, dodecahedron.obj, "A dodecahedron mesh" +MESH_CUBE, NONE, obj/test_mesh.obj, "A simple cube mesh" +DODECAHEDRON, NONE, obj/dodecahedron.obj, "A dodecahedron mesh" SHADER_VIGNETTE, NONE, shaders/vignette.wgsl, "Vignette Shader" SHADER_COMPUTE_GEN_NOISE, NONE, shaders/compute/gen_noise.wgsl, "GPU Noise Compute Shader" SHADER_COMPUTE_GEN_PERLIN, NONE, shaders/compute/gen_perlin.wgsl, "GPU Perlin Noise Compute Shader" diff --git a/workspaces/test/assets.txt b/workspaces/test/assets.txt index 62551d3..85f35b2 100644 --- a/workspaces/test/assets.txt +++ b/workspaces/test/assets.txt @@ -50,8 +50,8 @@ SHADER_RENDER_SCENE_QUERY_BVH, NONE, shaders/render/scene_query_bvh.wgsl, "Scene SHADER_RENDER_SCENE_QUERY_LINEAR, NONE, shaders/render/scene_query_linear.wgsl, "Scene Query Snippet (Linear)" SHADER_RENDER_LIGHTING_UTILS, NONE, shaders/render/lighting_utils.wgsl, "Lighting Utils Snippet" SHADER_MESH, NONE, shaders/mesh_render.wgsl, "Mesh Rasterization Shader" -MESH_CUBE, NONE, test_mesh.obj, "A simple cube mesh" -DODECAHEDRON, NONE, dodecahedron.obj, "A dodecahedron mesh" +MESH_CUBE, NONE, obj/test_mesh.obj, "A simple cube mesh" +DODECAHEDRON, NONE, obj/dodecahedron.obj, "A dodecahedron mesh" SHADER_VIGNETTE, NONE, shaders/vignette.wgsl, "Vignette Shader" SHADER_COMPUTE_GEN_NOISE, NONE, shaders/compute/gen_noise.wgsl, "GPU Noise Compute Shader" SHADER_COMPUTE_GEN_PERLIN, NONE, shaders/compute/gen_perlin.wgsl, "GPU Perlin Noise Compute Shader" |
