Merge pull request #266 from JuliaArrays/core

Make ArrayInterfaceCore lean

Author: ChrisRackauckas

.ci/test.jl

@@ -3,12 +3,12 @@ import Pkg
 const GROUP = get(ENV, "GROUP", "All")
 
 function dev_subpkg(subpkg)
-    subpkg_path = joinpath(dirname(@__DIR__), "lib", subpkg)
+    subpkg_path = joinpath("lib", subpkg)
     Pkg.develop(Pkg.PackageSpec(path=subpkg_path))
 end
 
 function activate_subpkg_env(subpkg)
-    subpkg_path = joinpath(dirname(@__DIR__), "lib", subpkg)
+    subpkg_path = joinpath("lib", subpkg)
     Pkg.activate(subpkg_path)
     Pkg.develop(Pkg.PackageSpec(path=subpkg_path))
     Pkg.instantiate()

.github/workflows/Downstream.yml

@@ -39,7 +39,7 @@ jobs:
         run: |
           using Pkg
           function dev_subpkg(subpkg)
-              subpkg_path = joinpath(".","ArrayInterface", "lib", subpkg)
+              subpkg_path = joinpath("lib", subpkg)
               Pkg.develop(Pkg.PackageSpec(path=subpkg_path))
           end
           dev_subpkg("ArrayInterfaceCore")

.github/workflows/ci.yml

@@ -13,6 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         group:
+          - ArrayInterface
           - ArrayInterfaceCore
           - ArrayInterfaceBandedMatrices
           - ArrayInterfaceBlockBandedMatrices

Project.toml

@@ -1,13 +1,24 @@
 name = "ArrayInterface"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "5.0.8"
+version = "5.1.0"
 
 [deps]
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 
 [compat]
 ArrayInterfaceCore = "0.1"
+Compat = "3"
+IfElse = "0.1"
 Static = "0.6"
 julia = "1.6"
 
+[extras]
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Pkg", "Test"]

lib/ArrayInterfaceBandedMatrices/Project.toml

@@ -1,6 +1,6 @@
 name = "ArrayInterfaceBandedMatrices"
 uuid = "2e50d22c-5be1-4042-81b1-c572ed69783d"
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
@@ -12,9 +12,7 @@ BandedMatrices = "0.17"
 julia = "1.6"
 
 [extras]
-ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
-BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["ArrayInterfaceCore","BandedMatrices","Test"]
+test = ["Test"]

lib/ArrayInterfaceBlockBandedMatrices/Project.toml

@@ -1,7 +1,7 @@
 name = "ArrayInterfaceBlockBandedMatrices"
 uuid = "5331f1e9-51c7-46b0-a9b0-df4434785e0a"
 authors = ["Zachary P. Christensen <[email protected]>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
@@ -17,10 +17,7 @@ BlockArrays = "0.16"
 julia = "1.6"
 
 [extras]
-ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
-BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
-BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["ArrayInterfaceCore","BlockArrays","BlockBandedMatrices","Test"]
+test = ["Test"]

lib/ArrayInterfaceBlockBandedMatrices/src/ArrayInterfaceBlockBandedMatrices.jl

@@ -19,9 +19,9 @@ function BlockBandedMatrixIndex(nrowblock, ncolblock, rowsizes, colsizes, l, u)
     blockcolind = ArrayInterfaceBandedMatrices.BandedMatrixIndex(nrowblock, ncolblock, l, u, false)
     sortedinds = sort(
         [(blockrowind[i], blockcolind[i]) for i = 1:length(blockrowind)],
-        by = x -> x[1],
+        by=x -> x[1],
     )
-    sort!(sortedinds, by = x -> x[2], alg = InsertionSort)# stable sort keeps the second index in order
+    sort!(sortedinds, by=x -> x[2], alg=InsertionSort)# stable sort keeps the second index in order
     refinds = Array{Int,1}()
     refrowcoords = Array{Int,1}()
     refcolcoords = Array{Int,1}()
@@ -132,9 +132,9 @@ function BandedBlockBandedMatrixIndex(
     blockcolind = ArrayInterfaceBandedMatrices.BandedMatrixIndex(nrowblock, ncolblock, l, u, false)
     sortedinds = sort(
         [(blockrowind[i], blockcolind[i]) for i = 1:length(blockrowind)],
-        by = x -> x[1],
+        by=x -> x[1],
     )
-    sort!(sortedinds, by = x -> x[2], alg = InsertionSort)# stable sort keeps the second index in order
+    sort!(sortedinds, by=x -> x[2], alg=InsertionSort)# stable sort keeps the second index in order
     rowheights = pushfirst!(copy(rowsizes), 1)
     cumsum!(rowheights, rowheights)
     colwidths = pushfirst!(copy(colsizes), 1)
@@ -218,7 +218,7 @@ function ArrayInterfaceCore.matrix_colors(A::BlockBandedMatrices.BlockBandedMatr
         (startinds[blockcolors[i]]:endinds[blockcolors[i]])[1:cols[i]]
         for i = 1:nblock
     ]
-    return reduce(vcat,colors)
+    return reduce(vcat, colors)
 end
 
 function ArrayInterfaceCore.matrix_colors(A::BlockBandedMatrices.BandedBlockBandedMatrix)

lib/ArrayInterfaceCUDA/Project.toml

@@ -1,16 +1,16 @@
 name = "ArrayInterfaceCUDA"
 uuid = "3e6d3b71-936e-4b08-8b74-7853fb4a8432"
 authors = ["Zachary P. Christensen <[email protected]>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
-ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
+ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 
 [compat]
 Adapt = "3"
-ArrayInterfaceCore = "0.1"
+ArrayInterface = "5"
 CUDA = "3.9"
 julia = "1.6"
 

lib/ArrayInterfaceCUDA/src/ArrayInterfaceCUDA.jl

@@ -1,26 +1,26 @@
 module ArrayInterfaceCUDA
 
 using Adapt
-using ArrayInterfaceCore
+using ArrayInterface
 using CUDA
 
-ArrayInterfaceCore.fast_scalar_indexing(::Type{<:CUDA.CuArray}) = false
-@inline ArrayInterfaceCore.allowed_getindex(x::CUDA.CuArray, i...) = CUDA.@allowscalar(x[i...])
-@inline ArrayInterfaceCore.allowed_setindex!(x::CUDA.CuArray, v, i...) = (CUDA.@allowscalar(x[i...] = v))
+ArrayInterface.fast_scalar_indexing(::Type{<:CUDA.CuArray}) = false
+@inline ArrayInterface.allowed_getindex(x::CUDA.CuArray, i...) = CUDA.@allowscalar(x[i...])
+@inline ArrayInterface.allowed_setindex!(x::CUDA.CuArray, v, i...) = (CUDA.@allowscalar(x[i...] = v))
 
 function Base.setindex(x::CUDA.CuArray, v, i::Int)
     _x = copy(x)
-    ArrayInterfaceCore.allowed_setindex!(_x, v, i)
+    ArrayInterface.allowed_setindex!(_x, v, i)
     return _x
 end
 
-function ArrayInterfaceCore.restructure(x::CUDA.CuArray, y)
-    reshape(Adapt.adapt(ArrayInterfaceCore.parameterless_type(x), y), Base.size(x)...)
+function ArrayInterface.restructure(x::CUDA.CuArray, y)
+    reshape(Adapt.adapt(ArrayInterface.parameterless_type(x), y), Base.size(x)...)
 end
 
-ArrayInterfaceCore.device(::Type{<:CUDA.CuArray}) = ArrayInterfaceCore.GPU()
+ArrayInterface.device(::Type{<:CUDA.CuArray}) = ArrayInterface.GPU()
 
-function ArrayInterfaceCore.lu_instance(A::CuMatrix{T}) where {T}
+function ArrayInterface.lu_instance(A::CuMatrix{T}) where {T}
     CUDA.CUSOLVER.CuQR(similar(A, 0, 0), similar(A, 0))
 end
 

lib/ArrayInterfaceCore/Project.toml

@@ -1,18 +1,12 @@
 name = "ArrayInterfaceCore"
 uuid = "30b0a656-2188-435a-8636-2ec0e6a096e2"
 authors = ["Zachary P. Christensen <[email protected]>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
-Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
-IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 SuiteSparse = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
 
 [compat]
-Compat = "3.37"
-IfElse = "0.1"
-Static = "0.6"
 julia = "1.6"