Experiment with GPU Cauchy-field deformation

.github/workflows/google-play.yml

@@ -59,16 +59,6 @@ jobs:
       - name: Install native Android toolchain
         run: sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;29.0.14206865" "cmake;3.22.1"
 
-      - name: Test the active holomorphic worker
-        run: |
-          cc -std=c11 -Wall -Wextra -Werror \
-            -Iandroid/app/src/main/cpp \
-            tests/test_holomorphic_walk.c \
-            android/app/src/main/cpp/holomorphic_walk.c \
-            -pthread -lm \
-            -o /tmp/test-holomorphic-walk
-          /tmp/test-holomorphic-walk
-
       - name: Create disposable validation key
         run: |
           keytool -genkeypair -noprompt \
@@ -134,7 +124,7 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      - name: Launch and touch the random holomorphic explorer
+      - name: Launch and touch the Cauchy-field explorer
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: 34
@@ -152,18 +142,16 @@ jobs:
             adb logcat -d > analytic-continuation-emulator.log
             adb exec-out screencap -p > analytic-continuation-emulator.png
             adb shell pidof -s org.isomorphisms.analyticcontinuation.lasso.dev | tr -d '\r' | grep -Eq '^[0-9]+$'
-            grep -Fq 'holomorphic field started with 3 workers' analytic-continuation-emulator.log
-            grep -Fq 'holomorphic field ready:' analytic-continuation-emulator.log
+            grep -Fq 'Cauchy field ready:' analytic-continuation-emulator.log
             grep -Fq 'zeros=1 poles=1' analytic-continuation-emulator.log
-            grep -Fq 'holomorphic field first frame:' analytic-continuation-emulator.log
-            steps=$(sed -n 's/.*holomorphic field: workers=3 steps=\([0-9][0-9]*\).*/\1/p' analytic-continuation-emulator.log | tail -1); test -n "$steps"; test "$steps" -gt 0
-            set -- $(sed -n 's/.*holomorphic field ready: surface=\([0-9][0-9]*\)x\([0-9][0-9]*\).*/\1 \2/p' analytic-continuation-emulator.log | tail -1); width=$1; height=$2; min_side=$width; if [ "$height" -lt "$width" ]; then min_side=$height; fi; pixel_radius=$((42 * min_side / 100)); adb shell input tap "$((width / 2 + pixel_radius / 2))" "$((height / 2 + pixel_radius / 4))"
+            grep -Fq 'Cauchy field first frame:' analytic-continuation-emulator.log
+            set -- $(sed -n 's/.*Cauchy field ready: surface=\([0-9][0-9]*\)x\([0-9][0-9]*\).*/\1 \2/p' analytic-continuation-emulator.log | tail -1); width=$1; height=$2; min_side=$width; if [ "$height" -lt "$width" ]; then min_side=$height; fi; pixel_radius=$((42 * min_side / 100)); adb shell input tap "$((width / 2 + pixel_radius / 2))" "$((height / 2 + pixel_radius / 4))"
             sleep 1
             adb logcat -d > analytic-continuation-emulator.log
             adb exec-out screencap -p > analytic-continuation-emulator.png
             grep -Fq 'zero added:' analytic-continuation-emulator.log
             grep -Fq 'count=2' analytic-continuation-emulator.log
-            ! grep -Eiq 'shader compilation failed|program link failed|eglInitialize failed|could not choose GLES3 EGL config|could not create EGL surface/context|eglMakeCurrent failed|holomorphic field shader uniforms unavailable|FATAL EXCEPTION' analytic-continuation-emulator.log
+            ! grep -Eiq 'shader compilation failed|program link failed|eglInitialize failed|could not choose GLES3 EGL config|could not create EGL surface/context|eglMakeCurrent failed|Cauchy field shader uniforms unavailable|FATAL EXCEPTION' analytic-continuation-emulator.log
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()

.github/workflows/holomorphic-apk.yml

@@ -6,7 +6,7 @@ on:
       - main
     paths:
       - 'android/**'
-      - 'tests/test_holomorphic_walk.c'
+      - 'tests/**'
       - '.github/workflows/holomorphic-apk.yml'
   workflow_dispatch:
 
@@ -15,7 +15,7 @@ permissions:
 
 concurrency:
   group: holomorphic-apk-${{ github.ref }}
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -34,38 +34,33 @@ jobs:
       - name: Install native Android toolchain
         run: sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;29.0.14206865" "cmake;3.22.1"
 
-      - name: Verify random holomorphic architecture
+      - name: Verify GPU Cauchy-field architecture
         run: |
-          grep -Fq '#define HOLOMORPHIC_WALK_WORKER_COUNT 3' android/app/src/main/cpp/holomorphic_walk.h
-          grep -Fq '#define HOLOMORPHIC_WALK_COEFFICIENT_BUDGET 1.20f' android/app/src/main/cpp/holomorphic_walk.h
-          grep -Fq '#define SEARCH_CANDIDATES 128' android/app/src/main/cpp/holomorphic_walk.c
-          grep -Fq 'Re(delta_q) and Im(delta_q) are log-modulus/phase sensitivities' android/app/src/main/cpp/holomorphic_walk.c
-          grep -Fq 'holomorphic_walk_best_direction' android/app/src/main/cpp/analytic_continuation_random.c
-          grep -Fq 'const float speed = 0.30f;' android/app/src/main/cpp/analytic_continuation_random.c
-          grep -Fq 'APP_CMD_LOST_FOCUS' android/app/src/main/cpp/analytic_continuation_random.c
-          grep -Fq 'PLACEMENT_POLE' android/app/src/main/cpp/analytic_continuation_random.c
-          grep -Fq 'HOLOMORPHIC_WALK_COEFFICIENT_BUDGET' android/app/src/main/cpp/analytic_continuation_random.c
-          ! grep -Fq 'pause_control_contains' android/app/src/main/cpp/analytic_continuation_random.c
-          grep -Fq 'u_holomorphic_coefficients' android/app/src/main/assets/continuation.frag.in
-          grep -Fq 'vec2 u = z / 3.0;' android/app/src/main/assets/continuation.frag.in
+          test ! -e android/app/src/main/cpp/holomorphic_walk.c
+          test ! -e android/app/src/main/cpp/holomorphic_walk.h
+          test ! -e tests/test_holomorphic_walk.c
+          grep -Fq 'GLint time_location;' android/app/src/main/cpp/analytic_continuation_random.c
+          grep -Fq 'glGetUniformLocation(engine->program, "u_time")' android/app/src/main/cpp/analytic_continuation_random.c
+          grep -Fq 'glUniform1f(engine->time_location, animation_time);' android/app/src/main/cpp/analytic_continuation_random.c
+          grep -Fq 'if (zoom < 0.1f) zoom = 0.1f;' android/app/src/main/cpp/analytic_continuation_random.c
+          grep -Fq 'if (zoom > 32.0f) zoom = 32.0f;' android/app/src/main/cpp/analytic_continuation_random.c
+          grep -Fq '#define SOURCE_COUNT 24' android/app/src/main/assets/continuation.frag.in
+          grep -Fq 'uniform float u_time;' android/app/src/main/assets/continuation.frag.in
+          grep -Fq 'vec2 source_position' android/app/src/main/assets/continuation.frag.in
+          grep -Fq 'vec2 source_weight' android/app/src/main/assets/continuation.frag.in
+          grep -Fq 'vec2 holomorphic_field' android/app/src/main/assets/continuation.frag.in
+          grep -Fq 'float base = 1.8 * view_radius;' android/app/src/main/assets/continuation.frag.in
+          grep -Fq 'float radial = 0.35 * view_radius' android/app/src/main/assets/continuation.frag.in
+          grep -Fq 'vec2 q = holomorphic_field(z, u_time, view_radius);' android/app/src/main/assets/continuation.frag.in
           grep -Fq 'log_modulus += q.x;' android/app/src/main/assets/continuation.frag.in
           grep -Fq 'phase += q.y;' android/app/src/main/assets/continuation.frag.in
           grep -Fq 'vec3 color = wegert_color_from_phase_log_modulus(phase, log_modulus);' android/app/src/main/assets/continuation.frag.in
+          ! grep -RniE 'holomorphic_walk|u_holomorphic_coefficients|deformation_velocity|coefficient_budget' android/app/src/main/cpp android/app/src/main/assets/continuation.frag.in
           ! grep -Fq 'u_paused' android/app/src/main/assets/continuation.frag.in
           test ! -e android/app/src/main/cpp/analytic_continuation.c
           ! grep -RniE 'lasso_map|inverse_lasso|dragging_lasso|lasso_coefficients|continuation_path' android/app/src/main/cpp android/app/src/main/assets/continuation.frag.in
 
-      - name: Test direction search on host
-        run: |
-          cc -std=c11 -Wall -Wextra -Werror \
-            -Iandroid/app/src/main/cpp \
-            tests/test_holomorphic_walk.c \
-            android/app/src/main/cpp/holomorphic_walk.c \
-            -pthread -lm \
-            -o /tmp/test-holomorphic-walk
-          /tmp/test-holomorphic-walk
-
-      - name: Build holomorphic-random APK
+      - name: Build Cauchy-field APK
         working-directory: android
         run: ./gradlew --no-daemon :app:assembleDebug
 
@@ -85,6 +80,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
+      - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0
+
       - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
         with:
           distribution: temurin
@@ -106,7 +103,7 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      - name: Launch moving soup and exercise zero and pole editing
+      - name: Launch moving Cauchy soup and exercise zero and pole editing
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: 34
@@ -123,53 +120,23 @@ jobs:
             adb shell am start -W -n org.isomorphisms.analyticcontinuation.lasso.dev/org.isomorphisms.analyticcontinuation.ExplorerActivity
             sleep 4
             adb logcat -d > holomorphic-emulator.log
-            grep -Fq 'holomorphic field started with 3 workers' holomorphic-emulator.log
-            grep -Fq 'holomorphic field ready:' holomorphic-emulator.log
+            grep -Fq 'Cauchy field ready:' holomorphic-emulator.log
             grep -Fq 'zeros=1 poles=1' holomorphic-emulator.log
-            grep -Fq 'holomorphic field first frame:' holomorphic-emulator.log
-            steps_before=$(sed -n 's/.*holomorphic field: workers=3 steps=\([0-9][0-9]*\).*/\1/p' holomorphic-emulator.log | tail -1); test -n "$steps_before"; test "$steps_before" -gt 0
-
+            grep -Fq 'Cauchy field first frame:' holomorphic-emulator.log
             adb exec-out screencap -p > holomorphic-motion-a.png
             sleep 6
             adb exec-out screencap -p > holomorphic-motion-b.png
-            adb logcat -d > holomorphic-emulator.log
-            steps_after_motion=$(sed -n 's/.*holomorphic field: workers=3 steps=\([0-9][0-9]*\).*/\1/p' holomorphic-emulator.log | tail -1); test -n "$steps_after_motion"; test "$steps_after_motion" -gt "$steps_before"
-            python3 - <<'PY'
-            from PIL import Image, ImageChops, ImageStat
-
-            first = Image.open('holomorphic-motion-a.png').convert('RGB')
-            second = Image.open('holomorphic-motion-b.png').convert('RGB')
-            if first.size != second.size:
-                raise SystemExit('motion screenshots have different dimensions')
-
-            width, height = first.size
-            box = (
-                int(width * 0.10),
-                int(height * 0.15),
-                int(width * 0.90),
-                int(height * 0.85),
-            )
-            diff = ImageChops.difference(first.crop(box), second.crop(box))
-            mean = sum(ImageStat.Stat(diff).mean) / 3.0
-            pixels = list(diff.getdata())
-            changed = sum(1 for pixel in pixels if max(pixel) >= 8)
-            changed_fraction = changed / max(len(pixels), 1)
-            print(f'holomorphic motion mean_abs_rgb={mean:.3f} changed_fraction={changed_fraction:.3f}')
-            if mean < 1.5 or changed_fraction < 0.10:
-                raise SystemExit('holomorphic motion is still too visually weak')
-            PY
-
-            set -- $(sed -n 's/.*holomorphic field ready: surface=\([0-9][0-9]*\)x\([0-9][0-9]*\).*/\1 \2/p' holomorphic-emulator.log | tail -1); width=$1; height=$2; min_side=$width; if [ "$height" -lt "$width" ]; then min_side=$height; fi; placement_radius=$((48 * min_side / 1000)); if [ "$placement_radius" -lt 26 ]; then placement_radius=26; fi; if [ "$placement_radius" -gt 38 ]; then placement_radius=38; fi; zero_control_x=$((placement_radius + 16)); control_y=$((height - placement_radius - 16)); pole_control_x=$((zero_control_x + 2 * placement_radius + 14)); adb shell input tap "$zero_control_x" "$control_y"; adb shell input tap "$((width / 2 - 100))" "$((height / 2 + 80))"; printf '%s %s %s %s\n' "$pole_control_x" "$control_y" "$width" "$height" > /tmp/holomorphic-placement-coordinates
+            python3 tests/check_cauchy_motion.py holomorphic-motion-a.png holomorphic-motion-b.png
+            python3 tests/check_cauchy_structure_motion.py holomorphic-motion-a.png holomorphic-motion-b.png
+            set -- $(sed -n 's/.*Cauchy field ready: surface=\([0-9][0-9]*\)x\([0-9][0-9]*\).*/\1 \2/p' holomorphic-emulator.log | tail -1); width=$1; height=$2; min_side=$width; if [ "$height" -lt "$width" ]; then min_side=$height; fi; placement_radius=$((48 * min_side / 1000)); if [ "$placement_radius" -lt 26 ]; then placement_radius=26; fi; if [ "$placement_radius" -gt 38 ]; then placement_radius=38; fi; zero_control_x=$((placement_radius + 16)); control_y=$((height - placement_radius - 16)); pole_control_x=$((zero_control_x + 2 * placement_radius + 14)); adb shell input tap "$zero_control_x" "$control_y"; adb shell input tap "$((width / 2 - 100))" "$((height / 2 + 80))"; printf '%s %s %s %s\n' "$pole_control_x" "$control_y" "$width" "$height" > /tmp/holomorphic-placement-coordinates
             sleep 1
             read pole_control_x control_y width height < /tmp/holomorphic-placement-coordinates; adb shell input tap "$pole_control_x" "$control_y"; adb shell input tap "$((width / 2 + 120))" "$((height / 2 - 70))"
             sleep 2
             adb logcat -d > holomorphic-emulator.log
             grep -Fq 'placement selected: pole' holomorphic-emulator.log
             grep -Eq 'zero added: .*count=2' holomorphic-emulator.log
             grep -Eq 'pole added: .*count=2' holomorphic-emulator.log
-            steps_after_edit=$(sed -n 's/.*holomorphic field: workers=3 steps=\([0-9][0-9]*\).*/\1/p' holomorphic-emulator.log | tail -1); test -n "$steps_after_edit"; test "$steps_after_edit" -gt "$steps_after_motion"
-            grep -Eq 'holomorphic field: workers=3 steps=[0-9]+ .*zeros=2 poles=2' holomorphic-emulator.log
-            ! grep -Eiq 'shader compilation failed|program link failed|eglInitialize failed|could not choose GLES3 EGL config|could not create EGL surface/context|eglMakeCurrent failed|holomorphic field shader uniforms unavailable|FATAL EXCEPTION' holomorphic-emulator.log
+            ! grep -Eiq 'shader compilation failed|program link failed|eglInitialize failed|could not choose GLES3 EGL config|could not create EGL surface/context|eglMakeCurrent failed|Cauchy field shader uniforms unavailable|FATAL EXCEPTION' holomorphic-emulator.log
             adb exec-out screencap -p > holomorphic-emulator.png
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2