Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4177d72
Update PyramidCompositorCPP
JesseMckinzie Nov 11, 2024
c2e2e87
Update c++ pyramid compositor
JesseMckinzie Jan 14, 2025
c9173a0
Update cpp PyramidCompositor
JesseMckinzie Jan 16, 2025
94e7feb
Merge branch 'main' into pyramid_composition_cpp_v2
JesseMckinzie Jan 16, 2025
b6f4074
Fix issues in cpp pyramid compositor
JesseMckinzie Jan 21, 2025
2cfee3d
Clean cpp pyramid composition
JesseMckinzie Jan 22, 2025
d1d5d55
Move error handling and cache to cpp compositor
JesseMckinzie Jan 22, 2025
abbd55c
Clear cache in set_composition
JesseMckinzie Jan 22, 2025
96ea861
Remove python compositor
JesseMckinzie Jan 22, 2025
cb47a72
Remove outdated files
JesseMckinzie Jan 22, 2025
3a8f289
Remove duplicate
JesseMckinzie Jan 22, 2025
50589e3
Remove unused variant
JesseMckinzie Jan 22, 2025
7b2a7e0
Update __init__.py
JesseMckinzie Jan 22, 2025
19a1e2a
Remove unused variant
JesseMckinzie Jan 22, 2025
a2904a2
Move TupleHash to utilities
JesseMckinzie Jan 22, 2025
4e3960d
Fix windows build error
JesseMckinzie Jan 22, 2025
50113a1
Add multithreading to write_zarr_chunk
JesseMckinzie Jan 23, 2025
8124eb7
Add multithreading for set_composition and store reader in unordered_map
JesseMckinzie Jan 23, 2025
a3c5805
Update to upload-artifact@v4
JesseMckinzie Jan 23, 2025
555e708
Update artifact names
JesseMckinzie Jan 24, 2025
0075b10
Update wheel_build.yml
JesseMckinzie Jan 24, 2025
42ecbe5
Merge branch 'main' into pyramid_compositor_cpp_v3
JesseMckinzie Jan 24, 2025
9e7c42d
Replace throw with logging
JesseMckinzie Feb 24, 2025
72978ce
Typo fix
JesseMckinzie Feb 24, 2025
e507212
Update wheel building workflow
sameeul Feb 25, 2025
cdf49e5
Use std::memcpy for copying buffer to assembled image
JesseMckinzie Feb 25, 2025
528ef1c
Merge branch 'pyramid_compositor_cpp_v3' of https://github.com/JesseM…
JesseMckinzie Feb 25, 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
18 changes: 9 additions & 9 deletions .github/workflows/wheel_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
os: [ubuntu-20.04, macos-13, windows-latest]
cibw_archs: ["auto64"]
cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"]

steps:
- uses: actions/checkout@v3
Expand All @@ -34,7 +34,7 @@ jobs:
- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.9'
python-version: '3.10'

- name: Install cibuildwheel
run: |
Expand All @@ -44,7 +44,7 @@ jobs:
run: |
python -m cibuildwheel --output-dir dist
env:
CIBW_BUILD: ${{ matrix.cibw_build }}
CIBW_BUILD: ${{ matrix.cibw_build }}-*
CIBW_BUILD_VERBOSITY: 3
CIBW_SKIP: "*musllinux*"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
Expand Down Expand Up @@ -78,9 +78,9 @@ jobs:
CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: argolid-wheels
name: argolid-wheels-${{ matrix.os }}-${{ matrix.cibw_archs }}-${{ matrix.cibw_build }}
path: dist/*.whl
retention-days: 1

Expand All @@ -93,7 +93,7 @@ jobs:
matrix:
os: [macos-13-xlarge]
cibw_archs: ["arm64"]
cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"]

steps:
- uses: actions/checkout@v3
Expand All @@ -112,7 +112,7 @@ jobs:
run: |
python -m cibuildwheel --output-dir dist
env:
CIBW_BUILD: ${{ matrix.cibw_build }}
CIBW_BUILD: ${{ matrix.cibw_build }}-*
CIBW_BUILD_VERBOSITY: 3
CIBW_ARCHS_MACOS: arm64
CIBW_BEFORE_ALL_MACOS: brew install nasm &&
Expand All @@ -130,8 +130,8 @@ jobs:
CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: argolid-wheels-apple-arm64
name: argolid-wheels-apple-arm64-${{ matrix.os }}-${{ matrix.cibw_archs }}-${{ matrix.cibw_build }}
path: dist/*.whl
retention-days: 1
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ set(SOURCE
src/cpp/core/chunked_pyramid_assembler.cpp
src/cpp/core/chunked_base_to_pyr_gen.cpp
src/cpp/core/ome_tiff_to_chunked_pyramid.cpp
src/cpp/core/pyramid_compositor.cpp
src/cpp/core/pyramid_view.cpp
src/cpp/utilities/utilities.cpp
)
Expand Down
Loading
Loading