Skip to content

WIP: K2IS support #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sk1p wants to merge 61 commits into
base: main
Choose a base branch
from
Open

WIP: K2IS support #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
e4fafd3
Initial import of k2o & libertem_k2is
sk1p Apr 18, 2023
a5a900a
k2is: make hdf5 dependency optional
sk1p Apr 23, 2023
7de1724
Update README.md
sk1p Apr 23, 2023
7e86917
WIP
sk1p Apr 25, 2023
d132db0
WIP
sk1p May 12, 2023
4c4afa6
WIP: libertem_k2is: compiles!
sk1p Jun 1, 2023
fbfd260
Update k2is_live for new LiberTEM-live API
sk1p Jun 5, 2023
f0c7b85
Add missing files from src/bin/; update for new internal APIs
sk1p Jun 5, 2023
d57e790
WIP
sk1p Jul 28, 2023
6c61131
WIP: realtime, memory leak issues, tiling depth
sk1p Jul 28, 2023
c342c0f
tweak timestamp recorder tool
sk1p Aug 3, 2023
0529b32
WIP: logging; non-IS support
sk1p Nov 11, 2023
9d3b9d2
WIP: small fixes
sk1p Nov 11, 2023
e80e3ec
Work towards K2 summit (counted/linear) mode
sk1p Nov 11, 2023
a19bade
Split block module into base and is/summit impls
sk1p Nov 12, 2023
78c4dff
More updates for IS/Summit switching support
sk1p Nov 14, 2023
0707d63
WIP: work on fast multi-acquisition
sk1p Nov 15, 2023
812c8b0
Fix event pump to recv both channels at once
sk1p Nov 16, 2023
0521aac
Don't accidentally drop the first block of an acquisition
sk1p Nov 17, 2023
451b270
Some debugging; remember dropped frame IDs and don't count only once
sk1p Nov 19, 2023
ae2a8d9
Don't compile Python code in `get_py_span_context`
sk1p Nov 19, 2023
3d89222
Move `AcquisitionRuntime` to `k2o` crate
sk1p Nov 19, 2023
4808644
Adapt k2is_live.py for new API; tweaks for reliability etc.
sk1p Nov 19, 2023
e198b21
Synchronize to first block received before going to Idle state
sk1p Nov 21, 2023
51dfaeb
Make realtime for recv/asm a runtime configuration
sk1p Nov 22, 2023
478e5c6
Update ordering test cases
sk1p Nov 22, 2023
8793f54
WIP: trying out some function multiversioning
sk1p Apr 2, 2024
08614a6
Remove unused dependencies and config
sk1p Apr 30, 2024
15fbc84
Clean up dependencies
sk1p Apr 30, 2024
bf92d82
PyAcquisitionParams: non-ambiguous parameter order
sk1p Apr 30, 2024
88db4ec
Fix some occurrences of k2opy
sk1p Apr 30, 2024
ec58c79
fix duplicate
sk1p Sep 17, 2024
ae1c112
update lockfile
sk1p Sep 21, 2024
6b42f18
Remove writer support for k2is
sk1p Sep 22, 2024
99337c8
WIP
sk1p Sep 22, 2024
8d7c8a6
WIP - integration into generic infra
sk1p Sep 23, 2024
b663fa4
WIP K2 summit; in `ReceiverMsg::Finished`, make the `frame_stack` opt…
sk1p Sep 24, 2024
3c0668e
Further work on k2 integration; acquisition size etc.
sk1p Sep 24, 2024
293dbe3
WIP
sk1p Sep 26, 2024
70c5768
k2is: in summit mode, fix height crop
sk1p Oct 1, 2024
93e101b
Fix merge error in Cargo.lock
sk1p Oct 1, 2024
3be7da7
Fix `main` binary of `k2o` for real-world usage
sk1p Apr 14, 2025
1b4dc30
Updated simple example
sk1p Apr 14, 2025
ec703ec
Add `K2Connection.get_frame_shape` method
sk1p Apr 14, 2025
2a9f11b
recv: handle and propagate errors
sk1p May 22, 2025
42b4d67
Update `k2is_live` to work in the happy case
sk1p May 22, 2025
409b356
Changes to make it work in non-IS mode
sk1p May 27, 2025
644457d
Read frame shape from K2Connection object
sk1p May 27, 2025
8fbc73f
Bump MSRV
sk1p May 27, 2025
435c98b
Bump rust version in CI too
sk1p May 27, 2025
8788b9e
Enable `crop_to_image_data`
sk1p Jun 25, 2025
c141287
Try to build/test `libertem_k2is` in CI
sk1p Jul 28, 2025
a33675b
Install req. lib for `libertem_k2is`
sk1p Jul 28, 2025
daf6bbf
typo
sk1p Jul 28, 2025
6a5f708
Use the vendored feature of the dbus crate
sk1p Jul 29, 2025
7c98708
Require minimum Python 3.9 for all crates
sk1p Jul 29, 2025
b84b825
Switch to abi-py39
sk1p Jul 29, 2025
a69be1a
Try to disable cdylib
sk1p Jul 29, 2025
d374c76
Fix module name
sk1p Jul 30, 2025
2218827
k2is: version bump & more metadata; enable extension module feature
sk1p Jul 30, 2025
a566cff
k2is: add README
sk1p Jul 30, 2025
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
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
crate: [libertem_dectris, libertem_asi_tpx3, libertem_qd_mpx]
crate: [libertem_dectris, libertem_asi_tpx3, libertem_qd_mpx, libertem_k2is]
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -45,8 +45,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
crate: [libertem_dectris, libertem_asi_tpx3, libertem_asi_mpx3, libertem_qd_mpx, ipc_test, common]
toolchain: ["stable", "1.71"]
crate: [libertem_dectris, libertem_asi_tpx3, libertem_asi_mpx3, libertem_qd_mpx, libertem_k2is, ipc_test, common]
toolchain: ["stable", "1.74"]
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
release:
name: Release
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/')"
if: startsWith(github.ref, 'refs/tags/')
needs: [ macos, windows, linux, linux-test, windows-test, macos-test ]
steps:
- uses: actions/download-artifact@v4
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ __pycache__/
.Python
.venv/
env/
bin/
build/
develop-eggs/
dist/
Expand Down
Loading
Loading