Skip to content

Commit 1ce78b4

Browse files
felixcremerrafaqzlwhitefox
authored
Implementing broadcast using Flatten (#56)
This adds broadcast using Flatten, so that we can also broadcast with a single scalar. Broadcast between a pyramid and an array throw an error at the moment. This also bumps the versions of DD to 0.28 and 0.29 * Add DD 0.28 and 0.29 * Load DD in test * Use YAB.backendlist to update YAB * Add BroadcastStyle dispatch as in DD * Change to gdal keyword in YAB.backendlist * Add broadcast using Flatten This enables to use broadcasting with scalars as well. It will error on AbstractArrays to hint, that the array should be converted to a Pyramid before. Co-authored-by: Rafael Schouten <[email protected]> * Add DD.modify for Pyramid * Add broadcast test * Add tests * Add broadcast example to docs * Remove tif saving tests for now We can enable them later on main, when we have the interface to add the maximal size of the coarsest level, so that the depth of the pyramid is the same from in memory and from gdal. * Test tif loading with artificial data * Fix buildpyramids * Remove Rasters from deps * Fix tests * Allow failure on nightly --------- Co-authored-by: Rafael Schouten <[email protected]> Co-authored-by: Richard Gibson <[email protected]>
1 parent 64add1b commit 1ce78b4

File tree

10 files changed

+1057
-547
lines changed

10 files changed

+1057
-547
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
1111
runs-on: ${{ matrix.os }}
1212
strategy:
13-
fail-fast: true
13+
fail-fast: false
1414
matrix:
1515
version:
1616
- '1'
@@ -30,6 +30,7 @@ jobs:
3030
with:
3131
version: ${{ matrix.version }}
3232
arch: ${{ matrix.arch }}
33+
continue-on-error: ${{ matrix.version == 'nightly' }}
3334
- uses: julia-actions/julia-buildpkg@latest
3435
- uses: julia-actions/julia-runtest@latest
3536
- uses: julia-actions/julia-processcoverage@v1

Project.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ DiskArrayTools = "fcd2136c-9f69-4db6-97e5-f31981721d63"
1111
DiskArrays = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
1212
Extents = "411431e0-e8b7-467b-b5e0-f676ba4f2910"
1313
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
14+
Flatten = "4c728ea3-d9ee-5c9a-9642-b6f7d7dc04fa"
1415
GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
1516
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
1617
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
@@ -33,20 +34,22 @@ Aqua = "0.8"
3334
ArchGDAL = "0.10.4"
3435
CairoMakie = "0.12"
3536
Colors = "0.12"
36-
DimensionalData = "0.27.3"
37+
DimensionalData = "0.28, 0.29"
3738
DiskArrayEngine = "0.1.2"
3839
DiskArrayTools = "0.1.10"
3940
DiskArrays = "0.4.2"
4041
Extents = "0.1.3"
4142
FillArrays = "1.11"
43+
Flatten = "0.4.3"
4244
GeoInterface = "1.3.4"
4345
Makie = "0.21.2"
4446
OffsetArrays = "1.14"
4547
Proj = "1.7.1"
48+
Rasters = "0.11.8, 0.12, 0.13"
4649
Statistics = "1.10"
4750
Test = "1.10"
4851
TestItemRunner = "0.2.3"
49-
YAXArrayBase = "0.6.1"
52+
YAXArrayBase = "0.6.1, 0.7"
5053
YAXArrays = "0.5.6"
5154
Zarr = "0.9.3"
5255
julia = "1.9"
@@ -57,10 +60,11 @@ ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
5760
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
5861
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
5962
Extents = "411431e0-e8b7-467b-b5e0-f676ba4f2910"
63+
Rasters = "a3a2b9e3-a471-40c9-b274-f788e487c689"
6064
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
6165
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
6266
TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
6367
YAXArrayBase = "90b8fcef-0c2d-428d-9c56-5f86629e9d14"
6468

6569
[targets]
66-
test = ["Aqua", "ArchGDAL", "Colors", "Extents", "CairoMakie", "Statistics", "Test", "TestItemRunner", "YAXArrayBase"]
70+
test = ["Aqua", "ArchGDAL", "Colors", "Extents", "CairoMakie", "Rasters", "Statistics", "Test", "TestItemRunner", "YAXArrayBase"]

0 commit comments

Comments
 (0)