From a19108a1b235d5331344be3c2fb5207f1ea8761c Mon Sep 17 00:00:00 2001 From: Julia TagBot <50554310+JuliaTagBot@users.noreply.github.com> Date: Sat, 8 Feb 2020 19:58:13 +0700 Subject: [PATCH 1/6] Install TagBot as a GitHub Action --- .github/workflows/TagBot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/TagBot.yml diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml new file mode 100644 index 0000000..d77d3a0 --- /dev/null +++ b/.github/workflows/TagBot.yml @@ -0,0 +1,11 @@ +name: TagBot +on: + schedule: + - cron: 0 * * * * +jobs: + TagBot: + runs-on: ubuntu-latest + steps: + - uses: JuliaRegistries/TagBot@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} From 0b5f3cb080349b519787bce192da2fbee6070245 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 May 2020 13:00:12 +0200 Subject: [PATCH 2/6] Use mul! from LinearAlgebra instead of a local definition --- src/DistributedArrays.jl | 2 +- src/linalg.jl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DistributedArrays.jl b/src/DistributedArrays.jl index e26e6f5..916cce4 100644 --- a/src/DistributedArrays.jl +++ b/src/DistributedArrays.jl @@ -9,7 +9,7 @@ using Statistics import Base: +, -, *, div, mod, rem, &, |, xor import Base.Callable -import LinearAlgebra: axpy!, dot, norm +import LinearAlgebra: axpy!, dot, norm, mul! import Primes import Primes: factor diff --git a/src/linalg.jl b/src/linalg.jl index 4498aed..f597a01 100644 --- a/src/linalg.jl +++ b/src/linalg.jl @@ -80,7 +80,7 @@ function add!(dest, src, scale = one(dest[1])) return dest end -function mul!(y::DVector, A::DMatrix, x::AbstractVector, α::Number = 1, β::Number = 0) +function LinearAlgebra.mul!(y::DVector, A::DMatrix, x::AbstractVector, α::Number = 1, β::Number = 0) # error checks if size(A, 2) != length(x) @@ -127,7 +127,7 @@ function mul!(y::DVector, A::DMatrix, x::AbstractVector, α::Number = 1, β::Num return y end -function mul!(y::DVector, adjA::Adjoint{<:Number,<:DMatrix}, x::AbstractVector, α::Number = 1, β::Number = 0) +function LinearAlgebra.mul!(y::DVector, adjA::Adjoint{<:Number,<:DMatrix}, x::AbstractVector, α::Number = 1, β::Number = 0) A = parent(adjA) @@ -259,9 +259,9 @@ function _matmatmul!(C::DMatrix, A::DMatrix, B::AbstractMatrix, α::Number, β:: return C end -mul!(C::DMatrix, A::DMatrix, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, A, B, α, β, 'N') -mul!(C::DMatrix, A::Adjoint{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'C') -mul!(C::DMatrix, A::Transpose{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'T') +LinearAlgebra.mul!(C::DMatrix, A::DMatrix, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, A, B, α, β, 'N') +LinearAlgebra.mul!(C::DMatrix, A::Adjoint{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'C') +LinearAlgebra.mul!(C::DMatrix, A::Transpose{<:Number,<:DMatrix}, B::AbstractMatrix, α::Number = 1, β::Number = 0) = _matmatmul!(C, parent(A), B, α, β, 'T') _matmul_op = (t,s) -> t*s + t*s From 4933784363479ef327fdf45501683dfd680c7ba8 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 May 2020 13:38:06 +0200 Subject: [PATCH 3/6] test on latest stable julia --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9d870f7..b54fbf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ julia: - 1.1 - 1.2 - 1.3 + - 1 - nightly matrix: From fde323195bba11f21fb6793d3d86a83d26068541 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 May 2020 14:33:35 +0200 Subject: [PATCH 4/6] Bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index dc4dd33..37f7e5e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "DistributedArrays" uuid = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94" -version = "0.6.4" +version = "0.6.5" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" From 19291271006bbb0dc6ec943740d86ef766858549 Mon Sep 17 00:00:00 2001 From: Matt Bauman Date: Tue, 19 May 2020 11:04:59 -0500 Subject: [PATCH 5/6] Fix #216 This was extending an internal API that had changed. --- src/mapreduce.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mapreduce.jl b/src/mapreduce.jl index c11f992..36e1260 100644 --- a/src/mapreduce.jl +++ b/src/mapreduce.jl @@ -136,7 +136,7 @@ function Base.extrema(d::DArray) return reduce((t,s) -> (min(t[1], s[1]), max(t[2], s[2])), r) end -Statistics._mean(A::DArray, region) = sum(A, dims = region) ./ prod((size(A, i) for i in region)) +Statistics._mean(f, A::DArray, region) = sum(f, A, dims = region) ./ prod((size(A, i) for i in region)) # Unary vector functions (-)(D::DArray) = map(-, D) From 47597cdc947f51394f3d50f98d2732f34e13a1f6 Mon Sep 17 00:00:00 2001 From: Chris de Graaf Date: Tue, 19 May 2020 16:07:53 -0500 Subject: [PATCH 6/6] Add compat --- .gitignore | 1 + Project.toml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fb90eb1..8fe2f16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +Manifest.toml *.jl.cov *.jl.mem .DS_Store diff --git a/Project.toml b/Project.toml index 37f7e5e..b1f2f4c 100644 --- a/Project.toml +++ b/Project.toml @@ -13,10 +13,11 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [compat] julia = "1" +Primes = "0.4" [extras] -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] test = ["Test", "SpecialFunctions"]