Merge pull request #8 from alpinebuster/dev

Merge from branch dev to main

Author: alpinebuster

.gitattributes

@@ -6,12 +6,15 @@
 *.cpp text
 *.c text
 *.h text
-
 *.sh text eol=lf
-
 # Declare files that will always have CRLF line endings on checkout.
 *.sln text eol=crlf
-
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary
+
+# LFS
+*.stl filter=lfs diff=lfs merge=lfs -text
+*.ply filter=lfs diff=lfs merge=lfs -text
+*.obj filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text

.github/actions/python-regression-tests/action.yml

@@ -37,6 +37,7 @@ runs:
   using: composite
   steps:
     - name: Debug inputs
+      if: ${{ runner.os != 'Windows' }}
       shell: bash
       run: |
         echo << EOF
@@ -50,6 +51,19 @@ runs:
         upload_test_artifacts: ${{ inputs.upload_test_artifacts }}
         EOF
 
+    - name: Debug inputs (Windows)
+      if: ${{ runner.os == 'Windows' }}
+      shell: powershell
+      run: |
+        Write-Output "autotest_data_s3_url: ${{ inputs.autotest_data_s3_url }}"
+        Write-Output "build_config: ${{ inputs.build_config }}"
+        Write-Output "mrbind: ${{ inputs.mrbind }}"
+        Write-Output "pytest_args: ${{ inputs.pytest_args }}"
+        Write-Output "smoke: ${{ inputs.smoke }}"
+        Write-Output "test_artifacts_path: ${{ inputs.test_artifacts_path }}"
+        Write-Output "ubuntu20_arm_workaround: ${{ inputs.ubuntu20_arm_workaround }}"
+        Write-Output "upload_test_artifacts: ${{ inputs.upload_test_artifacts }}"
+
     # cache management: https://github.com/MeshInspector/MeshLib/actions/caches
     - name: Cache autotest data from S3 Tests
       uses: actions/cache@v4
@@ -64,19 +78,14 @@ runs:
         aws-region: us-east-1
 
     - name: Copy autotest data from S3 Tests
+      if: ${{ runner.os != 'Windows' }}
       shell: bash
       run: aws s3 sync ${{ inputs.autotest_data_s3_url }} test_data --delete --no-sign-request --size-only --quiet
 
-    - name: Python Regression Tests
+    - name: Copy autotest data from S3 Tests (Windows)
       if: ${{ runner.os == 'Windows' }}
       shell: powershell
-      working-directory: source\x64\${{ inputs.build_config }}
-      run: >
-        py -3 ..\..\..\scripts\run_python_test_script.py
-        -d '..\test_regression'
-        -s ${{ inputs.smoke }}
-        -bv ${{ fromJSON( inputs.mrbind ) && '3' || '2' }}
-        -a='${{ inputs.pytest_args }}'
+      run: aws s3 sync ${{ inputs.autotest_data_s3_url }} test_data --delete --no-sign-request --size-only --quiet
 
     - name: Python Regression Tests
       if: ${{ runner.os != 'Windows' }}
@@ -90,8 +99,24 @@ runs:
         -s ${{ inputs.smoke }}
         -bv ${{ fromJSON( inputs.mrbind ) && '3' || '2' }}
         -a='${{ inputs.pytest_args }}'
+        
+    - name: Python Regression Tests (Windows)
+      if: ${{ runner.os == 'Windows' }}
+      shell: powershell
+      working-directory: source\x64\${{ inputs.build_config }}
+      run: >
+        py -3 ..\..\..\scripts\run_python_test_script.py
+        -d '..\test_regression'
+        -s ${{ inputs.smoke }}
+        -bv ${{ fromJSON( inputs.mrbind ) && '3' || '2' }}
+        -a='${{ inputs.pytest_args }}'
 
     - name: Copy test artifacts to S3
-      if: ${{ fromJSON( inputs.upload_test_artifacts ) && !cancelled() }}
+      if: ${{ fromJSON( inputs.upload_test_artifacts ) && !cancelled() && runner.os != 'Windows' }}
       shell: bash
       run: aws s3 cp pytest_temp 's3://test-artifacts-git/tests/${{ github.run_id }}/${{ inputs.test_artifacts_path }}' --recursive --quiet
+
+    - name: Copy test artifacts to S3 (Windows)
+      if: ${{ fromJSON( inputs.upload_test_artifacts ) && !cancelled() && runner.os == 'Windows' }}
+      shell: powershell
+      run: aws s3 cp pytest_temp 's3://test-artifacts-git/tests/${{ github.run_id }}/${{ inputs.test_artifacts_path }}' --recursive --quiet

.github/workflows/build-test-distribute.yml

@@ -138,7 +138,7 @@ jobs:
       - config
       - windows-build-test
     timeout-minutes: 60
-    runs-on: windows-2019
+    runs-on: [self-hosted, windows, x64, vs-2019, vcpkg-2024.10.21, meshinspector]
     env:
       vs19_vcpkg_version: ${{ needs.config.outputs.vs19_vcpkg_version }}
     steps:

.github/workflows/build-test-windows.yml

@@ -40,30 +40,32 @@ jobs:
       matrix:
         config: [ "Debug", "Release" ]
         build_system: [ MSBuild, CMake ]
-        runner: [ windows-2022, windows-2019 ]
+        os: [ windows-2022, windows-2019 ]
         full_config_build:
           - ${{fromJSON(inputs.full_config_build)}}
         exclude:
           - full_config_build: false
-            runner: windows-2022
+            os: windows-2022
             build_system: MSBuild
             config: "Debug"
           - full_config_build: false
-            runner: windows-2019
+            os: windows-2019
             build_system: CMake
           - full_config_build: false
-            runner: windows-2022
+            os: windows-2022
             build_system: CMake
             config: "Release"
         include:
-          - runner: windows-2022
+          - os: windows-2022
+            runner: [windows-2022]
             vc-path: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
             CUDA-VERSION: '12.0.1.52833'
             CUDA-MAJOR: '12'
             CUDA-MINOR: '0'
             vcpkg-version: ${{ inputs.vs22_vcpkg_version }}
-          - runner: windows-2019
-            vc-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
+          - os: windows-2019
+            runner: [self-hosted, windows, x64, vs-2019, meshinspector]
+            vc-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community'
             CUDA-VERSION: '11.4.2.47141'
             CUDA-MAJOR: '11'
             CUDA-MINOR: '4'
@@ -73,7 +75,7 @@ jobs:
       contents: read  # This is required for actions/checkout
 
     env:
-      BUILD_C_SHARP: ${{ matrix.runner == 'windows-2022' && matrix.build_system == 'MSBuild' }}
+      BUILD_C_SHARP: ${{ matrix.os == 'windows-2022' && matrix.build_system == 'MSBuild' }}
       PYTEST_C_SHARP_ARGS: --run-c-sharp-samples --csharp-sample-dir=..\source\x64\${{ matrix.config }}
 
     steps:
@@ -94,13 +96,14 @@ jobs:
         with:
           target_os: windows
           target_arch: x64
-          cxx_compiler: ${{ matrix.runner }} # runner name will be transformed to MSVC name (e.g. windows-2022 -> msvc-2022)
+          cxx_compiler: ${{ matrix.os }} # os name will be transformed to MSVC name (e.g. windows-2022 -> msvc-2022)
           build_config: ${{ matrix.config }}
           build_system: ${{ matrix.build_system }}
 
       - name: Clean Vcpkg Directory
+        if: ${{ matrix.os == 'windows-2022' }}
         working-directory: C:\vcpkg
-        run: git clean -ffdx
+        run: git clean -ffdx 
 
       - name: Checkout & Update Vcpkg ${{ matrix.vcpkg-version }}
         working-directory: C:\vcpkg
@@ -135,17 +138,19 @@ jobs:
         run: C:\vcpkg\vcpkg.exe integrate install
 
       - name: Restore CUDA Cache
+        if: ${{ matrix.os == 'windows-2022' }}
         uses: actions/cache@v4
         id: cuda-cache
         with:
           key: cuda-${{matrix.CUDA-VERSION}}
           path: C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA*
 
       - name: Install CUDA
-        if: steps.cuda-cache.outputs.cache-hit != 'true'
+        if: ${{ steps.cuda-cache.outputs.cache-hit != 'true' && matrix.os == 'windows-2022' }}
         run: choco install cuda --version=${{matrix.CUDA-VERSION}} --confirm
 
       - name: Setup CUDA
+        if: ${{ matrix.os == 'windows-2022' }}
         shell: bash
         run: |
           echo "CUDA_PATH=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v${{ matrix.CUDA-MAJOR }}.${{ matrix.CUDA-MINOR }}" >> $GITHUB_ENV
@@ -154,6 +159,7 @@ jobs:
           echo "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v${{ matrix.CUDA-MAJOR }}.${{ matrix.CUDA-MINOR }}\\bin" >> $GITHUB_PATH
 
       - name: Install Visual Studio Integration
+        if: ${{ matrix.os == 'windows-2022' }}
         run: |
           $x = (dir $env:CUDA_PATH -dir -recurse -depth 2).where({$_.name -eq 'visual_studio_integration'}).fullname
           $y = (dir $x -dir -recurse).where({$_.name -eq 'MSBuildExtensions'}).fullname + '\*'
@@ -280,7 +286,7 @@ jobs:
           mrbind: ${{ inputs.mrbind }}
           pytest_args: "${{ env.BUILD_C_SHARP == 'true' && env.PYTEST_C_SHARP_ARGS || '' }} --run-cuda=negative"
           smoke: ${{ !inputs.full_config_build && matrix.config == 'Debug' }}
-          test_artifacts_path: windows/${{ matrix.runner }}/${{ matrix.config }}
+          test_artifacts_path: windows/${{ matrix.os }}/${{ matrix.config }}
           upload_test_artifacts: ${{ inputs.upload_test_artifacts }}
 
       - name: Delete unwanted files
@@ -291,35 +297,35 @@ jobs:
           if exist source\x64\Release\pybind11nonlimitedapi_meshlib_3*.dll del /Q source\x64\Release\pybind11nonlimitedapi_meshlib_3*.dll
 
       - name: Archive files # https://github.com/actions/download-artifact#maintaining-file-permissions-and-case-sensitive-files
-        if: ${{ inputs.upload_artifacts && matrix.runner == 'windows-2019' && matrix.build_system == 'MSBuild' }}
+        if: ${{ inputs.upload_artifacts && matrix.os == 'windows-2019' && matrix.build_system == 'MSBuild' }}
         run: tar -a -c -f MREDist_${{ matrix.config }}.zip ./source/x64/${{matrix.config}}
 
       - name: Upload Windows Binaries Archive
-        if: ${{ inputs.upload_artifacts && matrix.runner == 'windows-2019' && matrix.build_system == 'MSBuild' }}
+        if: ${{ inputs.upload_artifacts && matrix.os == 'windows-2019' && matrix.build_system == 'MSBuild' }}
         uses: actions/upload-artifact@v4
         with:
           name: WindowsArchive_${{matrix.config}}
           path: MREDist_${{matrix.config}}.zip
           retention-days: 1
 
       - name: Create and fix fake Wheel for NuGet
-        if: ${{ inputs.nuget_build && matrix.runner == 'windows-2022' && matrix.config == 'Release' && matrix.build_system == 'MSBuild' && env.BUILD_C_SHARP == 'true' }}
+        if: ${{ inputs.nuget_build && matrix.os == 'windows-2022' && matrix.config == 'Release' && matrix.build_system == 'MSBuild' && env.BUILD_C_SHARP == 'true' }}
         run: |
           py -3 -m venv wheel_venv
           wheel_venv\Scripts\Activate
           python -m pip install delvewheel
           python ./scripts/nuget_patch/patch_library_deps.py "./source/x64/Release/MRMeshC.dll" "./patched_content/"
 
       - name: Upload NuGet files to Artifacts
-        if: ${{ inputs.nuget_build && matrix.runner == 'windows-2022' && matrix.config == 'Release' && matrix.build_system == 'MSBuild' && env.BUILD_C_SHARP == 'true' }}
+        if: ${{ inputs.nuget_build && matrix.os == 'windows-2022' && matrix.config == 'Release' && matrix.build_system == 'MSBuild' && env.BUILD_C_SHARP == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: DotNetPatchArchiveWindows-x64
           path: ./patched_content/*
           retention-days: 1
 
       - name: Upload NuGet library DLL to Artifacts
-        if: ${{ inputs.nuget_build && matrix.runner == 'windows-2022' && matrix.config == 'Release' && matrix.build_system == 'MSBuild' && env.BUILD_C_SHARP == 'true' }}
+        if: ${{ inputs.nuget_build && matrix.os == 'windows-2022' && matrix.config == 'Release' && matrix.build_system == 'MSBuild' && env.BUILD_C_SHARP == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: DotNetDll

.github/workflows/pip-build.yml

@@ -182,7 +182,7 @@ jobs:
   windows-pip-build:
     needs: setup
     timeout-minutes: 90
-    runs-on: windows-2019
+    runs-on:  [self-hosted, windows, x64, vs-2019, meshinspector]
     strategy:
       fail-fast: false
     permissions:

.github/workflows/prepare-images.yml

@@ -145,12 +145,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [ windows-2022, windows-2019 ]
+        runner: [ windows-2022 ]
         include:
           - runner: windows-2022
             vcpkg-version: ${{ inputs.vs22_vcpkg_version }}
-          - runner: windows-2019
-            vcpkg-version: ${{ inputs.vs19_vcpkg_version }}
     steps:
       - name: Setup vcpkg
         working-directory: C:\vcpkg

.gitignore

@@ -34,3 +34,5 @@ source/MRDotNetTest/obj/*
 /include
 /out/build/
 .cache
+venv/*
+wheelhouse/*

.mailmap

@@ -1,39 +1 @@
-Alexandr Burakov <[email protected]>       Alexandr Burakov <[email protected]>
-Alexandr Burakov <[email protected]>       Aleksandr Burakov <[email protected]>
-Alexandr Burakov <[email protected]>       A.Burakov <[email protected]>
-Alexandr Burakov <[email protected]>       Aleksandr Burakov <[email protected]>
-Alexandr Burakov <[email protected]>       ABSitf <[email protected]>
-Alexandr Burakov <[email protected]>       A.Burakov <[email protected]>
-Alex Koksin <[email protected]>                 Alexey Koksin <[email protected]>
-Alex Koksin <[email protected]>                 Alex koksin <[email protected]>
-Alex Koksin <[email protected]>                 ADALISK\akoksin <[email protected]>
-Alex Koksin <[email protected]>                 ASTROCOMP\astro <[email protected]>
-Alex Koksin <[email protected]>                 theastrowander <[email protected]>
-Alex Koksin <[email protected]>                 Alex Koksin <[email protected]>
-Alex Koksin <[email protected]>                 Alexey Koksin <[email protected]>
-Anton Chernobrovkin <[email protected]> AntonChernobrovkin <[email protected]>
-Anton Chernobrovkin <[email protected]> Chernobrovkin-AD <[email protected]>
-Anton Chernobrovkin <[email protected]> Chernobrovkin-AD <[email protected]>
-Anton Chernobrovkin <[email protected]> AntonChernobrovkin <[email protected]>
-Artur Sharafutdinov <[email protected]> Artur Sharafutdinov <[email protected]>
-Bot <[email protected]>   dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-Daniil Antipov <[email protected]>                       Daniil <[email protected]>
-Daniil Antipov <[email protected]>                       ADniill <[email protected]>
-Egor Mikhaylov <[email protected]>           Egor Mikhaylov <[email protected]>
-Egor Mikhaylov <[email protected]>           Egor Mikhailov <[email protected]>
-Emil Peters <[email protected]>                           dwight <Emil Peters>
-Fedor Chelnokov <[email protected]>         Fedor Chelnokov <[email protected]>
-Fedor Chelnokov <[email protected]>         Fedr <[email protected]>
-Grant Karapetyan <[email protected]>       Grant Karapetyan <[email protected]>
-Grant Karapetyan <[email protected]>       grantim <[email protected]>
-Grant Karapetyan <[email protected]>       grantim <[email protected]>
-Maxim Rayskiy <[email protected]>               Maxim Rayskiy <[email protected]>
-Maxim Rayskiy <[email protected]>               MaxRayskiy <[email protected]>
-Maxim Rayskiy <[email protected]>               MaxRayskiy <[email protected]>
-Maxim Rayskiy <[email protected]>               max.rayskiy <[email protected]>
-Maxim Rayskiy <[email protected]>               Max <[email protected]>
-Maxim Rayskiy <[email protected]>               Max <[email protected]>
-Maxim Rayskiy <[email protected]>               MaxRayskiy <[email protected]>
-Maxim Rayskiy <[email protected]>               meshinspector-bot <[email protected]>
-Rodion Orlov <[email protected]>               Rodion Orlov <[email protected]>
-Rodion Orlov <[email protected]>                           Rodion Orlov <[email protected]>
+alpinebuster <[email protected]>

.vscode/launch.json

@@ -1,7 +1,31 @@
 {
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": []
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Run server.py",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/Debug/bin/server.py",
+            "console": "integratedTerminal",
+            "cwd": "${workspaceFolder}/build/Debug/bin"
+        },
+        {
+            "name": "Launch Chrome + WASM",
+            "type": "chrome",
+            "request": "launch",
+            // Keep the port and path the same as in server.py
+            "url": "http://localhost:9310/index_mrjs.html",
+            "webRoot": "${workspaceFolder}/build/Debug/bin",
+            "sourceMaps": true
+        }
+    ],
+    "compounds": [
+        {
+            "name": "Server + Chrome Debug",
+            "configurations": [
+                "Run server.py",
+                "Launch Chrome + WASM"
+            ]
+        }
+    ]
 }

.vscode/settings.json

@@ -108,6 +108,10 @@
 		"filesystem": "cpp",
 		"locale": "cpp",
 		"climits": "cpp",
-		"__verbose_abort": "cpp"
+		"__verbose_abort": "cpp",
+		"*.lxx": "cpp",
+		"adolcforward": "cpp",
+		"cassert": "cpp",
+		"sparsecholesky": "cpp"
 	}
 }