merge

Author: meggart

Project.toml

@@ -1,7 +1,7 @@
 name = "DiskArrayEngine"
 uuid = "2d4b2e14-ccd6-4284-b8b0-2378ace7c126"
 authors = ["Fabian Gans <[email protected]> and contributors"]
-version = "0.2.3"
+version = "0.2.5"
 
 [deps]
 Dagger = "d58978e5-989f-55fb-8d15-ea34adc7bf54"
@@ -14,7 +14,6 @@ Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 OnlineStats = "a15396b6-48d5-5d58-9928-6d29437db91e"
 Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
-OptimizationMOI = "fd9f6733-72f4-499f-8506-86b2bdd0dea1"
 OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Primes = "27ebfcd6-29c5-5fa9-bf4b-fb8fc14df3ae"
@@ -24,15 +23,14 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Zarr = "0a941bbe-ad1d-11e8-39d9-ab76183a1d99"
 
 [compat]
-Dagger = "0.18"
-Graphs = "1"
-Interpolations = "0.14, 0.15"
+Dagger = "0.18, 0.19"
 DiskArrays = "0.3, 0.4.10"
+Graphs = "1"
+Interpolations = "0.14, 0.15, 0.16"
 Ipopt = "1"
 OffsetArrays = "1"
 OnlineStats = "1"
 Optimization = "3, 4"
-OptimizationMOI = "0.1, 0.2, 0.3, 0.4, 0.5"
 OptimizationOptimJL = "0.1, 0.2, 0.3, 0.4"
 OrderedCollections = "1"
 Primes = "0.5"

src/enginearrays.jl

@@ -133,7 +133,6 @@ function mapslices_engine(f,A...;dims,outchunks=nothing)
     nd = maximum(bcd)
     ia = map(A) do ar
         lw = map(bcdims(ar),size(ar)) do idim, sa
-            @show idim, sa, s
             sloop = s[idim]
             if idim in dims    
                 [1:sa]
@@ -206,4 +205,4 @@ function Base.copyto!(dest::AbstractArray, bc::Base.Broadcast.Broadcasted{Engine
     r = mapslices_engine(bcf.f,bcf.args...,dims=(),outchunks=DiskArrays.approx_chunksize(DiskArrays.eachchunk(dest)))
     compute!(dest,r)
     dest
-end
+end

src/executionplan.jl

@@ -1,5 +1,5 @@
 using Ipopt, Optimization
-import OptimizationMOI, OptimizationOptimJL
+import OptimizationOptimJL
 using DiskArrays: DiskArrays, eachchunk, arraysize_from_chunksize
 using Statistics: mean
 using StatsBase: mode