Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
10c80da
Limit the public extension points to hardware plugins and Python proc…
curlh Nov 4, 2026
ad005e6
Move DAQ and PMT into drivers with a lossless stream ring and enforce…
curlh Nov 4, 2026
30c97d1
Show the signal sources on an oscilloscope screen and read the NI ana…
curlh Nov 4, 2026
b3e83ab
Bound the oscilloscope work per refresh with buckets and cheaper drawing
curlh Nov 5, 2026
951533f
Stop the signal sources when the Signal Monitor closes
curlh Nov 5, 2026
663c0a9
Build the drivers as a project of their own
curlh Nov 5, 2026
832bfd3
Run the Signal Monitor like a scope with a sample rate that follows t…
curlh Nov 5, 2026
ba23a9c
Keep the NI inputs running across timebase changes and rebuild their …
curlh Nov 5, 2026
77db856
Drag and turn the scope markers on the screen and trigger with a hyst…
curlh Nov 5, 2026
a263de8
List every tool directly in the Tools menu
curlh Nov 5, 2026
fabea2d
Build the CUDA and ONNX modules into Core, load only drivers and rele…
curlh Nov 5, 2026
928cb79
Return the result of QHash::remove directly
curlh Nov 5, 2026
b96a905
Set up a new Windows machine with one build command
curlh Nov 5, 2026
a513d66
Run build.ps1 with a bypassed execution policy instead of build.cmd
curlh Nov 5, 2026
b389b3a
Rename build-unix.sh to build.sh
curlh Nov 5, 2026
9668772
Keep the CUDA, ONNX and scan image code inside Core's internal namespace
curlh Nov 5, 2026
3e2d079
Build Core without CUDA when nvcc cannot build and report why a modul…
curlh Nov 5, 2026
bf85f65
Give DriverHost and the Core libraries an rpath on macOS and copy the…
curlh Nov 6, 2026
b550d9a
Offer the CUDA provider for ONNX inference only when ONNX Runtime has it
curlh Nov 6, 2026
3c1c094
Remove the drivers build and the Core install with --clean
curlh Nov 6, 2026
0ca78de
Download the ONNX Runtime package that matches the platform and CUDA …
curlh Nov 6, 2026
677a1ce
Build against an installed Qt 6.8 or later, simplify the build script…
curlh Nov 6, 2026
b29d731
Fetch the ScopeWriter submodule in build.ps1 and add measured build t…
curlh Nov 6, 2026
b11398d
Trim the developer guide
curlh Nov 6, 2026
30f6dab
Register every processing module in its own source file and make CUDA…
curlh Nov 6, 2026
3296fa9
Pick up Core sources from their folders so a new module needs no CMak…
curlh Nov 6, 2026
4330eef
Run every camera through one provider interface, put each camera of a…
curlh Nov 6, 2026
6c670a6
Fix the review findings and share frames through POSIX memory whose n…
curlh Nov 6, 2026
9002e9d
Include the system semaphore header on macOS, where semaphore.h found…
curlh Nov 6, 2026
2c781a3
Keep shared memory names within the 30 characters Qt allows on macOS,…
curlh Nov 6, 2026
450e45e
Make a new Local API frame memory on start, as macOS cannot resize th…
curlh Nov 6, 2026
d068dd5
Run autogen.sh and configure of Micro-Manager only on the first build…
curlh Nov 7, 2026
c2753ec
Draw the grid view labels in the system UI font instead of Segoe UI, …
curlh Nov 7, 2026
1ddc501
Model drivers as devices created by name with pre-init properties, an…
curlh Nov 7, 2026
cd903bc
Load native devices from ScopeOneDevice lines of the cfg through Scop…
curlh Nov 7, 2026
02a04c1
Merge ScopeOneConfigGroup presets with the Micro-Manager presets of t…
curlh Nov 7, 2026
3e25e1a
Add a serial driver that runs JSON device descriptions, starting with…
curlh Nov 7, 2026
d890d6c
Document native devices and serial descriptions, install a descriptio…
curlh Nov 7, 2026
c275752
Read VCPKG_ROOT from the user and system settings after entering the …
curlh Nov 7, 2026
90e1a17
Name the ScopeOne demo configurations with a ScopeOne prefix and leav…
curlh Nov 7, 2026
3e8a45b
Add a configuration for a Cobolt Jive on a serial port
curlh Nov 7, 2026
81c30cc
Log the output of a DriverHost that exits at start, force its Qt mess…
curlh Nov 7, 2026
17926ca
List the serial ports of the system when a serial device cannot open …
curlh Nov 7, 2026
37a1948
Leave out serial properties whose query the device answers with an er…
curlh Nov 7, 2026
b8c18fa
Add hardware configuration, presets and light source controls
curlh Nov 9, 2026
0303672
Describe drivers in Core, edit light sources under Roles and apply ro…
curlh Nov 10, 2026
79c880a
Run the CI and release builds through the build scripts, deploy Qt Se…
curlh Nov 11, 2026
1c332e4
Take a device without peripherals as one camera, stage, shutter or au…
curlh Nov 12, 2026
dd3d1a2
Name cuDNN and cuBLAS as requirements of ONNX inference on CUDA in th…
curlh Nov 12, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 63 additions & 32 deletions .github/workflows/compile-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,65 @@ jobs:

- name: Compile mmCoreAndDevices and ScopeOne
shell: bash
run: ./scripts/build-unix.sh
run: ./scripts/build.sh

compile-installed-qt:
name: Compile (Linux, installed Qt 6.8)
runs-on: ubuntu-24.04
timeout-minutes: 180

steps:
- name: Check out ScopeOne
uses: actions/checkout@v7

- name: Install build dependencies
shell: bash
run: |
sudo apt-get update
sudo apt-get install -y \
git \
build-essential \
cmake \
autoconf \
automake \
libtool \
autoconf-archive \
pkg-config \
libboost-all-dev \
ninja-build curl zip unzip \
libegl-dev libopengl-dev libx11-xcb-dev libxrender-dev \
libxcb-cursor-dev libxcb-icccm4-dev libxcb-util-dev libxcb-keysyms1-dev \
libxcb-randr0-dev libxcb-sync-dev libxcb-xinput-dev libxcb-glx0-dev \
libxkbcommon-x11-dev

- name: Set up vcpkg
shell: bash
run: |
git clone https://github.com/microsoft/vcpkg.git "$RUNNER_TEMP/scopeone-vcpkg"
git -C "$RUNNER_TEMP/scopeone-vcpkg" checkout "$(jq -r '."builtin-baseline"' vcpkg.json)"
"$RUNNER_TEMP/scopeone-vcpkg/bootstrap-vcpkg.sh" -disableMetrics
mkdir -p "$RUNNER_TEMP/vcpkg-binary-cache"
echo "VCPKG_ROOT=$RUNNER_TEMP/scopeone-vcpkg" >> "$GITHUB_ENV"
echo "VCPKG_DEFAULT_BINARY_CACHE=$RUNNER_TEMP/vcpkg-binary-cache" >> "$GITHUB_ENV"

- name: Cache vcpkg binaries
uses: actions/cache@v6
with:
path: ${{ runner.temp }}/vcpkg-binary-cache
key: vcpkg-scopeone-ubuntu-24.04-installed-qt-${{ hashFiles('vcpkg.json') }}
restore-keys: vcpkg-scopeone-ubuntu-24.04-installed-qt-

# The oldest Qt that ScopeOne supports, so a newer Qt API used by mistake fails here
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: 6.8.0
modules: qtserialport
cache: true

- name: Compile mmCoreAndDevices and ScopeOne
shell: bash
run: ./scripts/build.sh --qt "$QT_ROOT_DIR"

compile-macos:
name: Compile (macOS)
Expand Down Expand Up @@ -100,33 +158,19 @@ jobs:

- name: Compile mmCoreAndDevices and ScopeOne
shell: bash
run: ./scripts/build-unix.sh
run: ./scripts/build.sh

compile-windows:
name: Compile (Windows)
runs-on: windows-2022
timeout-minutes: 180

env:
# Keep in sync with windows-release.yml
MMCORE_COMMIT: 212cc416eec291634c916078a31efd4c5f914c64

steps:
- name: Check out ScopeOne
uses: actions/checkout@v7
with:
submodules: recursive

- name: Set up MSVC
shell: pwsh
run: |
$vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
cmd /c "`"$vsPath\VC\Auxiliary\Build\vcvars64.bat`" >nul && set" | ForEach-Object {
if ($_ -match '^([^=]+)=(.*)$' -and [Environment]::GetEnvironmentVariable($Matches[1]) -ne $Matches[2]) {
"$($Matches[1])=$($Matches[2])" >> $env:GITHUB_ENV
}
}

- name: Set up vcpkg
shell: pwsh
run: |
Expand All @@ -147,20 +191,7 @@ jobs:
key: vcpkg-scopeone-x64-windows-${{ hashFiles('vcpkg.json') }}
restore-keys: vcpkg-scopeone-x64-windows-

- name: Build MMCore
# build.ps1 clones the latest mmCoreAndDevices and builds MMCore, and the runner has no CUDA
- name: Compile MMCore, Core, drivers and GUI
shell: pwsh
run: |
$mm = "$env:GITHUB_WORKSPACE\ScopeOneCore\external\mmCoreAndDevices"
git init $mm
git -C $mm fetch --depth 1 https://github.com/micro-manager/mmCoreAndDevices.git $env:MMCORE_COMMIT
git -C $mm checkout FETCH_HEAD
msbuild "$mm\MMCore\MMCore.vcxproj" /p:Configuration=Release /p:Platform=x64 "/p:SolutionDir=$mm\" /m /nologo /v:minimal
if ($LASTEXITCODE -ne 0) { throw "Building MMCore failed." }
if (-not (Test-Path "$mm\build\Release\x64\MMCore.lib")) { throw "MMCore.lib was not produced." }

- name: Compile Core, plugins and GUI
shell: pwsh
run: |
.\scripts\build.ps1 --configure `
--pluginConfigureOption -DSCOPEONE_ENABLE_CUDA=OFF `
--pluginConfigureOption -DSCOPEONE_ENABLE_INFERENCE=OFF
run: .\scripts\build.ps1
104 changes: 10 additions & 94 deletions .github/workflows/windows-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ concurrency:
cancel-in-progress: false

env:
MMCORE_COMMIT: 212cc416eec291634c916078a31efd4c5f914c64
BOOST_VERSION: 1.86.0
CUDA_VERSION: 12.8.1
ONNXRUNTIME_PACKAGE: onnxruntime-win-x64-gpu_cuda12-1.30.0
ONNXRUNTIME_VERSION: 1.30.0

jobs:
package:
Expand Down Expand Up @@ -65,16 +61,6 @@ jobs:
}
exit 0

- name: Set up MSVC
shell: pwsh
run: |
$vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
cmd /c "`"$vsPath\VC\Auxiliary\Build\vcvars64.bat`" >nul && set" | ForEach-Object {
if ($_ -match '^([^=]+)=(.*)$' -and [Environment]::GetEnvironmentVariable($Matches[1]) -ne $Matches[2]) {
"$($Matches[1])=$($Matches[2])" >> $env:GITHUB_ENV
}
}

- name: Set up vcpkg
shell: pwsh
run: |
Expand All @@ -95,61 +81,6 @@ jobs:
key: vcpkg-scopeone-x64-windows-${{ hashFiles('vcpkg.json') }}
restore-keys: vcpkg-scopeone-x64-windows-

- name: Cache Boost
id: boost-cache
uses: actions/cache@v6
with:
path: ${{ runner.temp }}\boost
key: boost-${{ env.BOOST_VERSION }}-vc143-x64

- name: Build Boost for SerialManager
if: steps.boost-cache.outputs.cache-hit != 'true'
shell: pwsh
run: |
$name = "boost_$($env:BOOST_VERSION -replace '\.', '_')"
$archive = "$env:RUNNER_TEMP\$name.7z"
Invoke-WebRequest "https://archives.boost.io/release/$env:BOOST_VERSION/source/$name.7z" -OutFile $archive
7z x $archive "-o$env:RUNNER_TEMP" -y | Out-Null
Push-Location "$env:RUNNER_TEMP\$name"
.\bootstrap.bat
if ($LASTEXITCODE -ne 0) { throw "Boost bootstrap failed." }
.\b2 --with-thread --with-chrono --with-date_time --with-system toolset=msvc-14.3 address-model=64 architecture=x86 link=static runtime-link=shared threading=multi variant=release -j4 stage
if ($LASTEXITCODE -ne 0) { throw "Boost build failed." }
Pop-Location
$boostRoot = "$env:RUNNER_TEMP\boost"
New-Item -ItemType Directory -Force -Path $boostRoot | Out-Null
Move-Item "$env:RUNNER_TEMP\$name\boost" "$boostRoot\boost"
Move-Item "$env:RUNNER_TEMP\$name\stage\lib" "$boostRoot\lib"

- name: Build Micro-Manager core and adapters
shell: pwsh
run: |
$mm = "$env:GITHUB_WORKSPACE\ScopeOneCore\external\mmCoreAndDevices"
git init $mm
git -C $mm fetch --depth 1 https://github.com/micro-manager/mmCoreAndDevices.git $env:MMCORE_COMMIT
git -C $mm checkout FETCH_HEAD
$boostRoot = "$env:RUNNER_TEMP\boost"
$properties = @(
"/p:Configuration=Release",
"/p:Platform=x64",
"/p:SolutionDir=$mm\",
"/p:MM_BOOST_INCLUDEDIR=$boostRoot",
"/p:MM_BOOST_LIBDIR=$boostRoot\lib",
"/m",
"/nologo",
"/v:minimal"
)
foreach ($project in @(
"MMCore\MMCore.vcxproj",
"DeviceAdapters\DemoCamera\DemoCamera.vcxproj",
"DeviceAdapters\Utilities\Utilities.vcxproj",
"DeviceAdapters\SerialManager\SerialManager.vcxproj"
)) {
msbuild "$mm\$project" @properties
if ($LASTEXITCODE -ne 0) { throw "Building $project failed." }
}
Get-ChildItem "$mm\build\Release\x64" -File | Select-Object Name, Length

- name: Install CUDA
if: matrix.gpu
shell: pwsh
Expand All @@ -174,14 +105,6 @@ jobs:
"CUDA_PATH_V$($short -replace '\.', '_')=$cudaPath" >> $env:GITHUB_ENV
"$cudaPath\bin" >> $env:GITHUB_PATH

- name: Download ONNX Runtime
if: matrix.gpu
shell: pwsh
run: |
$archive = "$env:RUNNER_TEMP\$env:ONNXRUNTIME_PACKAGE.zip"
Invoke-WebRequest "https://github.com/microsoft/onnxruntime/releases/download/v$env:ONNXRUNTIME_VERSION/$env:ONNXRUNTIME_PACKAGE.zip" -OutFile $archive
Expand-Archive $archive -DestinationPath "$env:GITHUB_WORKSPACE\ScopeOneCore\external"

- name: Set up NSIS
shell: pwsh
run: |
Expand All @@ -190,20 +113,11 @@ jobs:
choco install nsis -y --no-progress
}

# build.ps1 clones the latest mmCoreAndDevices and builds MMCore, and Core is built with CUDA
# when the step above put nvcc on the path
- name: Build and package
shell: pwsh
run: |
$options = @()
if ("${{ matrix.gpu }}" -eq "true") {
$options += @("--guiConfigureOption", "-DSCOPEONE_PACKAGE_VARIANT=gpu")
}
else {
$options += @(
"--pluginConfigureOption", "-DSCOPEONE_ENABLE_CUDA=OFF",
"--pluginConfigureOption", "-DSCOPEONE_ENABLE_INFERENCE=OFF"
)
}
.\scripts\build.ps1 --configure --package @options
run: .\scripts\build.ps1 --package

- name: Check packages
shell: pwsh
Expand All @@ -214,9 +128,11 @@ jobs:
Get-Item $file | Select-Object Name, Length
}
$listing = 7z l "build\$name.zip"
$hasGpuFiles = [bool]($listing | Select-String -Pattern "cufft64|onnxruntime|ScopeOneInference")
if ("${{ matrix.gpu }}" -eq "true" -and -not $hasGpuFiles) { throw "The GPU package has no CUDA or ONNX Runtime files." }
if ("${{ matrix.gpu }}" -ne "true" -and $hasGpuFiles) { throw "The standard package must not contain CUDA or ONNX Runtime files." }
# Both packages carry ONNX Runtime, and only the GPU one its CUDA provider and cuFFT
if (-not ($listing | Select-String -Pattern "onnxruntime\.dll")) { throw "The package has no ONNX Runtime." }
$hasGpuFiles = [bool]($listing | Select-String -Pattern "cufft64|onnxruntime_providers_cuda")
if ("${{ matrix.gpu }}" -eq "true" -and -not $hasGpuFiles) { throw "The GPU package has no CUDA files." }
if ("${{ matrix.gpu }}" -ne "true" -and $hasGpuFiles) { throw "The standard package must not contain CUDA files." }

- name: Upload packages
uses: actions/upload-artifact@v7
Expand Down Expand Up @@ -257,8 +173,8 @@ jobs:
run: |
ls -l packages
cat > notes.md <<'NOTES'
- **Standard** (`win-x64`): live imaging, recording and image processing on CPU.
- **GPU** (`win-x64-gpu`): adds CUDA processing and ONNX inference. Needs an NVIDIA GPU.
- **Standard** (`win-x64`): live imaging, recording, image processing and inference on CPU.
- **GPU** (`win-x64-gpu`): adds CUDA processing and ONNX inference on CUDA. Needs an NVIDIA GPU. ONNX inference on CUDA also needs cuDNN 9 and the cuBLAS of CUDA 12 on the `PATH`, which the package does not include.
NOTES
gh release create "v${{ steps.version.outputs.version }}" packages/* \
--target "$GITHUB_SHA" \
Expand Down
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@
!/src/**
!/ScopeOneCore/
!/ScopeOneCore/**
!/plugins/
!/plugins/**
!/ScopeOneCuda/
!/ScopeOneCuda/**
!/ScopeOneInference/
!/ScopeOneInference/**
!/drivers/
!/drivers/**
/ScopeOneCore/install/
/ScopeOneCore/build/
/drivers/build/
/ScopeOneCore/external/*
!/ScopeOneCore/external/ScopeWriter/
!/ScopeOneCore/external/ScopeWriter/**
Expand All @@ -29,6 +26,9 @@
!/config/MMConfig_demo.cfg
!/config/dual_hamamatsu_897D.cfg
!/config/MMConfig_demo_dual.cfg
!/config/ScopeOne_MM_demo.cfg
!/config/ScopeOne_demo.cfg
!/config/ScopeOne_Cobolt_Jive.cfg

!/CMakeLists.txt
!/README.md
Expand Down
Loading
Loading