Opensfm 370

.devcontainer/devcontainer.json

@@ -0,0 +1,26 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+{
+  "name": "ODM",
+  "build": {
+    "context": "..",
+    "dockerfile": "../Dockerfile",
+    "target": "dev"
+  },
+  "features": {
+    // https://github.com/devcontainers/features/blob/main/src/common-utils/main.sh
+    // Add `odm` user for consistency with the GPU image
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": "true",
+      "username": "odm",
+      "upgradePackages": "true"
+    }
+  },
+  "remoteUser": "odm",
+  "postCreateCommand": "pixi install --locked",
+  // Use the `code` directory for compatibility with direct Docker workflows
+  "workspaceMount": "source=${localWorkspaceFolder},target=/code,type=bind",
+  "workspaceFolder": "/code",
+  "mounts": [
+    "source=${localEnv:HOME}${localEnv:USERPROFILE},target=/home/odm,type=bind,consistency=cached"
+  ]
+}

.devcontainer/gpu/devcontainer.json

@@ -0,0 +1,29 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+{
+  "name": "ODM GPU",
+  "build": {
+    "context": "../..",
+    "dockerfile": "../../gpu.Dockerfile",
+    "target": "dev"
+  },
+  "features": {
+    // https://github.com/devcontainers/features/blob/main/src/common-utils/main.sh
+    // Add `odm` user for consistency with the CPU image
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": "true",
+      "username": "odm",
+      "upgradePackages": "true"
+    }
+  },
+  "remoteUser": "odm",
+  "postCreateCommand": "pixi install --locked -e gpu",
+  // Use the `code` directory for compatibility with direct Docker workflows
+  "workspaceMount": "source=${localWorkspaceFolder},target=/code,type=bind",
+  "workspaceFolder": "/code",
+  "mounts": [
+    "source=${localEnv:HOME}${localEnv:USERPROFILE},target=/home/odm,type=bind,consistency=cached"
+  ],
+  "hostRequirements": {
+    "gpu": "true"
+  }
+}

.dockerignore

@@ -1,23 +1,23 @@
-Dockerfile
-SuperBuild/build
-SuperBuild/download
-SuperBuild/install
-SuperBuild/src
-build
-opensfm
-odm_orthophoto
-odm_texturing
-odm_meshing
-odm_georeferencing
-images_resize
-.git
-
-/contrib
-/docs
-/hooks
-/img
-/license
-settings.yml
-code_of_conduct.md
-configure_18_04.sh
-index.html
+SuperBuild/build
+SuperBuild/download
+SuperBuild/install
+SuperBuild/src
+build
+opensfm
+odm_orthophoto
+odm_texturing
+odm_meshing
+odm_georeferencing
+images_resize
+.git
+venv
+.pixi
+scripts/pixi-shell-hook
+/contrib
+/docs
+/hooks
+/img
+/license
+settings.yml
+code_of_conduct.md
+index.html

.gitattributes

@@ -0,0 +1,2 @@
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff

.github/workflows/publish-docker.yaml

@@ -44,10 +44,12 @@ jobs:
       id: docker_build
       uses: docker/build-push-action@v2
       with:
-        file: ./portable.Dockerfile
+        file: ./Dockerfile
+        target: runtime
         platforms: linux/amd64,linux/arm64
         push: true
-        no-cache: true
+        cache-from: type=registry,ref=opendronemap/odm:buildcache
+        cache-to: type=registry,ref=opendronemap/odm:buildcache,mode=max
         build-args: |
           GIT_COMMIT=${{ github.sha }}
           BUILD_DATE=${{ steps.buildmeta.outputs.date }}

.github/workflows/publish-windows.yml

@@ -6,6 +6,7 @@ on:
     - master
     tags:
     - v*
+  workflow_dispatch:
 
 permissions:
   contents: write
@@ -23,31 +24,20 @@ jobs:
     environment: azuresigning
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/checkout@v6
+    - name: Setup pixi
+      uses: prefix-dev/setup-pixi@v0.9.3
       with:
-        python-version: '3.12.9'
-        architecture: 'x64'
-    - uses: Jimver/cuda-toolkit@v0.2.24
-      id: cuda-toolkit
-      with:
-        cuda: '12.8.1'
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.13
-      with:
-        cmake-version: '3.24.x'
-    - name: Install venv
-      run: |
-        python -m pip install virtualenv
-    - name: Build sources
-      run: |
-        python configure.py build
+        pixi-version: latest
+        locked: true
+        # The build env (gpu) and the shipped runtime env (gpu-prod) are both needed.
+        environments: >-
+          gpu
+          gpu-prod
+    - name: Build SuperBuild (with CUDA)
+      run: pixi run -e gpu build
     - name: Free up space
-      run: |
-        rmdir SuperBuild\download /s /q
-        rmdir SuperBuild\build /s /q
-      shell: cmd
+      run: cmd /c "rd /s /q SuperBuild\build 2>nul & rd /s /q SuperBuild\src 2>nul & exit /b 0"
     - name: Retrieve the metadata and decode it to a file
       env:
         AZURESIGNING_METADATA: ${{ secrets.AZURESIGNING_METADATA }}
@@ -61,15 +51,25 @@ jobs:
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
     - name: Create setup
-      run: |
-        python configure.py dist --signtool-path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe" --azure-signing-metadata "%RUNNER_TEMP%\metadata.json"
+      run: pixi run -e gpu dist -- --signtool-path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe" --azure-signing-metadata "%RUNNER_TEMP%\metadata.json"
       shell: cmd
     - name: Upload Setup File
       if: always()
       uses: actions/upload-artifact@v4
       with:
         name: Setup
         path: dist\*.exe
+    # Silent-install to a path different from the build dir and run the CLI in a
+    # shell with no inherited CONDA_PREFIX. This is the real test that the bundled
+    # conda env relocates: it fails here if activate.d doesn't honor %CONDA_PREFIX%.
+    - name: Verify relocated install
+      shell: cmd
+      run: |
+        for %%f in (dist\ODM_Setup_*.exe) do start /wait "" "%%f" /SILENT /SUPPRESSMSGBOXES /DIR=C:\ODMtest /LOG=C:\install.log
+        if not exist C:\ODMtest\run.py exit /b 1
+        cd /d C:\ODMtest
+        call win32env.bat
+        python -X utf8 run.py --help
     - name: Upload Setup to Release
       uses: svenstaro/upload-release-action@v2
       if: startsWith(github.ref, 'refs/tags/')
@@ -79,4 +79,3 @@ jobs:
         file_glob: true
         tag: ${{ github.ref }}
         overwrite: true
-

.github/workflows/test-build-prs.yaml

@@ -2,86 +2,51 @@ name: Build PRs
 
 on:
   pull_request:
+  workflow_dispatch:
 
 jobs:
+  pixi:
+    strategy:
+      matrix:
+        platform:
+          - ubuntu-latest
+          - windows-2022
+          - macos-latest
+          - ubuntu-24.04-arm
+    runs-on: ${{ matrix.platform }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+    - name: Setup pixi
+      uses: prefix-dev/setup-pixi@v0.9.3
+      with:
+        pixi-version: latest
+    - name: Install environment
+      run: pixi install --locked
+    - name: Build SuperBuild
+      run: pixi run build
+    - name: Test
+      run: pixi run test
+    - name: Smoke
+      run: pixi run smoke
+    - name: Install prod environment
+      run: pixi install --locked -e prod
+    - name: Prod smoke
+      run: pixi run -e prod smoke
+
   docker:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set Swap Space
-      uses: pierotofy/set-swap-space@master
-      with:
-        swap-size-gb: 12
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: actions/checkout@v6
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - name: Build
-      uses: docker/build-push-action@v2
+      uses: docker/setup-buildx-action@v3
+    - name: Build runtime image
+      uses: docker/build-push-action@v6
       with:
-        file: ./portable.Dockerfile
+        file: ./Dockerfile
+        target: runtime
         platforms: linux/amd64
         push: false
-
-  # snapcraft:
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       architecture:
-  #       - amd64
-  #   steps:
-  #   - name: Checkout
-  #     uses: actions/checkout@v2
-  #   - name: Set Swap Space
-  #     uses: pierotofy/set-swap-space@master
-  #     with:
-  #       swap-size-gb: 12
-  #   - name: Build
-  #     id: build
-  #     uses: diddlesnaps/snapcraft-multiarch-action@v1
-  #     with:
-  #       architecture: ${{ matrix.architecture }}
-  #   - name: Review
-  #     uses: diddlesnaps/snapcraft-review-tools-action@v1
-  #     with:
-  #       snap: ${{ steps.build.outputs.snap }}
-  #       isClassic: 'false'
-
-  windows:
-    runs-on: windows-2022
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.12.9'
-        architecture: 'x64'
-    - uses: Jimver/cuda-toolkit@v0.2.24
-      id: cuda-toolkit
-      with:
-        cuda: '12.8.1'
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.13
-      with:
-        cmake-version: '3.24.x'
-    - name: Install venv
-      run: |
-        python -m pip install virtualenv
-    - name: Build sources
-      run: |
-        python configure.py build
-    - name: Free up space
-      run: |
-        rmdir SuperBuild\download /s /q
-        rmdir SuperBuild\build /s /q
-      shell: cmd
-    - name: Create setup
-      run: |
-        python configure.py dist
-    - name: Upload Setup File
-      uses: actions/upload-artifact@v4
-      with:
-        name: Setup
-        path: dist\*.exe
+        cache-from: type=gha
+        cache-to: type=gha,mode=max

.gitignore

@@ -4,8 +4,6 @@ include/
 lib/
 logs/
 share/
-
-
 src/
 
 !modules/*
@@ -29,11 +27,11 @@ __pycache__
 *.snap
 storage/
 
-
-vcpkg/
-venv/
-python312/
+scripts/pixi-shell-hook
 dist/
-innosetup/
 azuresigning/
 .DS_Store
+
+# pixi environments
+.pixi/*
+!.pixi/config.toml