From b38175b9f22047e4275c59fd205c6afd6419a506 Mon Sep 17 00:00:00 2001 From: Matt Bauman Date: Mon, 1 Jun 2020 11:03:07 -0500 Subject: [PATCH 01/12] Fix internal uses of reindex for Julia 1.5 support --- src/darray.jl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/darray.jl b/src/darray.jl index c4b12b1..0d14521 100644 --- a/src/darray.jl +++ b/src/darray.jl @@ -597,10 +597,17 @@ function Base.copyto!(a::Array, s::SubDArray) return a end +VERSION < v"1.2" + # This is an internal API that has changed + reindex(A, I, J) = Base.reindex(A, I, J) +else + reindex(A, I, J) = Base.reindex(I, J) +end + function DArray(SD::SubArray{T,N}) where {T,N} D = SD.parent DArray(size(SD), procs(D)) do I - lindices = Base.reindex(SD, SD.indices, I) + lindices = reindex(SD, SD.indices, I) convert(Array, D[lindices...]) end end From fec43afda8d2bf67154f9befcafa898f7db7d3aa Mon Sep 17 00:00:00 2001 From: Matt Bauman Date: Mon, 1 Jun 2020 11:08:34 -0500 Subject: [PATCH 02/12] Version-guard Statistics._mean's extension Without this, the change in #218 was a performance regression on Julia 1.0-1.2. --- src/mapreduce.jl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mapreduce.jl b/src/mapreduce.jl index 36e1260..f8fcb9e 100644 --- a/src/mapreduce.jl +++ b/src/mapreduce.jl @@ -136,7 +136,11 @@ function Base.extrema(d::DArray) return reduce((t,s) -> (min(t[1], s[1]), max(t[2], s[2])), r) end -Statistics._mean(f, A::DArray, region) = sum(f, A, dims = region) ./ prod((size(A, i) for i in region)) +if VERSION < v"1.3" + Statistics._mean(A::DArray, region) = sum(A, dims = region) ./ prod((size(A, i) for i in region)) +else + Statistics._mean(f, A::DArray, region) = sum(f, A, dims = region) ./ prod((size(A, i) for i in region)) +end # Unary vector functions (-)(D::DArray) = map(-, D) From dcae31fd7a7b345c053bb8b84339209e988a0e59 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 5 Oct 2020 14:37:16 +0200 Subject: [PATCH 03/12] Create CompatHelper.yml --- .github/workflows/CompatHelper.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/CompatHelper.yml diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml new file mode 100644 index 0000000..bcdb51a --- /dev/null +++ b/.github/workflows/CompatHelper.yml @@ -0,0 +1,16 @@ +name: CompatHelper +on: + schedule: + - cron: '00 00 * * *' + workflow_dispatch: +jobs: + CompatHelper: + runs-on: ubuntu-latest + steps: + - name: Pkg.add("CompatHelper") + run: julia -e 'using Pkg; Pkg.add("CompatHelper")' + - name: CompatHelper.main() + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }} # optional + run: julia -e 'using CompatHelper; CompatHelper.main()' From 2bd0a69984492eec1a54c71d11d42a7ea5791801 Mon Sep 17 00:00:00 2001 From: Albin Severinson Date: Tue, 20 Oct 2020 12:38:32 +0000 Subject: [PATCH 04/12] Update index.md - Changed "the the" to "the" - Changed "which is not probably what we want" to "which is probably not what we want" --- docs/src/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/index.md b/docs/src/index.md index d9ebfc8..fef2699 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -405,7 +405,7 @@ on the node that created it. Nested `spmd` calls ------------------- -As `spmd` executes the the specified function on all participating nodes, we need to be careful with nesting `spmd` calls. +As `spmd` executes the specified function on all participating nodes, we need to be careful with nesting `spmd` calls. An example of an unsafe(wrong) way: ```julia @@ -451,6 +451,6 @@ function foo(d::DArray) end spmd(foo,....) ``` -Without the `myid()` check, the `spmd` call to `foo` would execute `map!` from all nodes, which is not what we probably want. +Without the `myid()` check, the `spmd` call to `foo` would execute `map!` from all nodes, which is probably not what we want. Similarly `@everywhere` from within a SPMD run should also be driven from the master node only. From fd670d7a6c61f92f7abc7b54ed1a9f368dd9650f Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 16 Aug 2021 14:26:40 +0200 Subject: [PATCH 05/12] Update CompatHelper.yml --- .github/workflows/CompatHelper.yml | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index bcdb51a..d94b38d 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -1,16 +1,32 @@ name: CompatHelper on: schedule: - - cron: '00 00 * * *' + - cron: 0 0 * * * workflow_dispatch: jobs: CompatHelper: runs-on: ubuntu-latest steps: - - name: Pkg.add("CompatHelper") - run: julia -e 'using Pkg; Pkg.add("CompatHelper")' - - name: CompatHelper.main() + - name: "Add the General registry via Git" + run: | + import Pkg + ENV["JULIA_PKG_SERVER"] = "" + Pkg.Registry.add("General") + shell: julia --color=yes {0} + - name: "Install CompatHelper" + run: | + import Pkg + name = "CompatHelper" + uuid = "aa819f21-2bde-4658-8897-bab36330d9b7" + version = "3" + Pkg.add(; name, uuid, version) + shell: julia --color=yes {0} + - name: "Run CompatHelper" + run: | + import CompatHelper + CompatHelper.main() + shell: julia --color=yes {0} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }} # optional - run: julia -e 'using CompatHelper; CompatHelper.main()' + COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} + # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }} From ee096b67821aa44539b9eb5f7366209b60fe2e7a Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 16 Aug 2021 14:32:42 +0200 Subject: [PATCH 06/12] Update TagBot.yml --- .github/workflows/TagBot.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml index d77d3a0..f49313b 100644 --- a/.github/workflows/TagBot.yml +++ b/.github/workflows/TagBot.yml @@ -1,11 +1,15 @@ name: TagBot on: - schedule: - - cron: 0 * * * * + issue_comment: + types: + - created + workflow_dispatch: jobs: TagBot: + if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot' runs-on: ubuntu-latest steps: - uses: JuliaRegistries/TagBot@v1 with: token: ${{ secrets.GITHUB_TOKEN }} + ssh: ${{ secrets.DOCUMENTER_KEY }} From 50e4983c36f4c49f0cc12164755a19f91ebf1f37 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 16 Aug 2021 20:46:30 +0200 Subject: [PATCH 07/12] Update CompatHelper.yml Comment out the documenter token --- .github/workflows/CompatHelper.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index d94b38d..14fd628 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -28,5 +28,5 @@ jobs: shell: julia --color=yes {0} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} - # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }} +# COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} +# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }} From bfbe7758e6878e11b0507548953f61076ce9666d Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Mon, 16 Aug 2021 18:49:09 +0000 Subject: [PATCH 08/12] CompatHelper: bump compat for Primes to 0.5, (keep existing compat) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index b1f2f4c..25edbae 100644 --- a/Project.toml +++ b/Project.toml @@ -12,8 +12,8 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [compat] +Primes = "0.4, 0.5" julia = "1" -Primes = "0.4" [extras] SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" From f6adb4e31f5f0a70c019884d86c1274822f6da80 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 16 Aug 2021 21:18:25 +0200 Subject: [PATCH 09/12] Create CI.yml --- .github/workflows/CI.yml | 69 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .github/workflows/CI.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 0000000..fe9330b --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,69 @@ +name: CI +on: + pull_request: + branches: + - master + push: + branches: + - master + tags: '*' +jobs: + test: + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + version: + - '1.0' + - '1.6' + - '1' + - 'nightly' + os: + - ubuntu-latest + arch: + - x64 + steps: + - uses: actions/checkout@v2 + - uses: julia-actions/setup-julia@v1 + with: + version: ${{ matrix.version }} + arch: ${{ matrix.arch }} + - uses: actions/cache@v1 + env: + cache-name: cache-artifacts + with: + path: ~/.julia/artifacts + key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }} + restore-keys: | + ${{ runner.os }}-test-${{ env.cache-name }}- + ${{ runner.os }}-test- + ${{ runner.os }}- + - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-runtest@v1 + - uses: julia-actions/julia-processcoverage@v1 + - uses: codecov/codecov-action@v1 + with: + file: lcov.info + docs: + name: Documentation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: julia-actions/setup-julia@v1 + with: + version: '1' + - run: | + julia --project=docs -e ' + using Pkg + Pkg.develop(PackageSpec(path=pwd())) + Pkg.instantiate()' + - run: | + julia --project=docs -e ' + using Documenter: doctest + using DistributedArrays + doctest(DistributedArrays)' + - run: julia --project=docs docs/make.jl + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} From 1f688524425a6caf4699606c4b2fdf4b26a5d419 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 16 Aug 2021 21:52:48 +0200 Subject: [PATCH 10/12] Add missing if --- src/darray.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/darray.jl b/src/darray.jl index 0d14521..7633be7 100644 --- a/src/darray.jl +++ b/src/darray.jl @@ -597,7 +597,7 @@ function Base.copyto!(a::Array, s::SubDArray) return a end -VERSION < v"1.2" +if VERSION < v"1.2" # This is an internal API that has changed reindex(A, I, J) = Base.reindex(A, I, J) else From 9c7ad5cbc57c1212379f791c66e23c571021ce55 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 16 Aug 2021 22:01:27 +0200 Subject: [PATCH 11/12] Delete .travis.yml --- .travis.yml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b54fbf1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +0,0 @@ -language: julia -os: - - linux - - osx - -julia: - - 1.0 - - 1.1 - - 1.2 - - 1.3 - - 1 - - nightly - -matrix: - allow_failures: - - julia: nightly - -branches: - only: - - master - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ - -notifications: - email: false - -jobs: - include: - - stage: "Documentation" - julia: 1.0 - os: linux - script: - - export DOCUMENTER_DEBUG="true" - - julia --color=yes --project=docs/ -e 'using Pkg; - Pkg.instantiate(); - Pkg.develop(PackageSpec(path=pwd())); - Pkg.build()' - - julia --color=yes --project=docs/ docs/make.jl - after_success: skip - - stage: "Coverage" - julia: 1.0 - os: linux - after_success: # Intentionally rerun tests - - julia -e 'using Pkg; Pkg.add("Coverage")' - - julia -e 'using Coverage; Coveralls.submit(Coveralls.process_folder())' - - julia -e 'using Coverage; Codecov.submit(Codecov.process_folder())' From 58235e944e59a2ac4adff383bbfb164b671807a6 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Mon, 16 Aug 2021 22:01:49 +0200 Subject: [PATCH 12/12] Release 0.6.6 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 25edbae..62bea94 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "DistributedArrays" uuid = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94" -version = "0.6.5" +version = "0.6.6" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"