Skip to content

Commit 24a6fc3

Browse files
authoredJan 27, 2021
Merge pull request #12 from LCSB-BioCore/develop
Develop
2 parents 49e2ed7 + b9459bf commit 24a6fc3

12 files changed

+45
-44
lines changed
 

‎.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Documentation
44
on:
55
push:
66
branches:
7+
- master
78
- develop
89
tags: '*'
9-
pull_request:
1010
release:
1111
types: [published, created]
1212

‎Project.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
name = "DiDa"
1+
name = "DistributedData"
22
uuid = "f6a0035f-c5ac-4ad0-b410-ad102ced35df"
3-
authors = ["Mirek Kratochvil <exa.exa@gmail.com>"]
3+
authors = ["Mirek Kratochvil <miroslav.kratochvil@uni.lu>",
4+
"LCSB R3 team <lcsb-r3@uni.lu>"]
45
version = "0.1.0"
56

67
[deps]

‎README.md

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# <img src="docs/src/assets/logo.svg" alt="DiDa.jl logo" height="32px"> DiDa.jl
1+
# <img src="docs/src/assets/logo.svg" alt="DistributedData.jl logo" height="32px"> DistributedData.jl
22

33

44
| Build status | Documentation |
55
|:---:|:---:|
6-
| ![CI](https://github.com/LCSB-BioCore/DiDa.jl/workflows/CI/badge.svg?branch=develop) | [![doc](https://img.shields.io/badge/docs-stable-blue)](https://lcsb-biocore.github.io/DiDa.jl/stable/) [![doc](https://img.shields.io/badge/docs-dev-blue)](https://lcsb-biocore.github.io/DiDa.jl/dev/) |
6+
| ![CI](https://github.com/LCSB-BioCore/DistributedData.jl/workflows/CI/badge.svg?branch=develop) | [![doc](https://img.shields.io/badge/docs-stable-blue)](https://lcsb-biocore.github.io/DistributedData.jl/stable/) [![doc](https://img.shields.io/badge/docs-dev-blue)](https://lcsb-biocore.github.io/DistributedData.jl/dev/) |
77

88
Simple distributed data manipulation and processing routines for Julia.
99

1010
This was originally developed for
11-
[`GigaSOM.jl`](https://github.com/LCSB-BioCore/GigaSOM.jl); DiDa.jl package
11+
[`GigaSOM.jl`](https://github.com/LCSB-BioCore/GigaSOM.jl); DistributedData.jl package
1212
contains the separated-out lightweight distributed-processing framework that
1313
was used in `GigaSOM.jl`.
1414

1515
## Why?
1616

17-
DiDa.jl provides a very simple, imperative and straightforward way to move your
17+
DistributedData.jl provides a very simple, imperative and straightforward way to move your
1818
data around a cluster of Julia processes created by the
1919
[`Distributed`](https://docs.julialang.org/en/v1/stdlib/Distributed/) package,
2020
and run computation on the distributed data pieces. The main aim of the package
@@ -43,14 +43,14 @@ same way, but takes the data back from the worker.
4343
You can thus send some random array to a few distributed workers:
4444

4545
```julia
46-
julia> using Distributed, DiDa
46+
julia> using Distributed, DistributedData
4747

4848
julia> addprocs(2)
4949
2-element Array{Int64,1}:
5050
2
5151
3
5252

53-
julia> @everywhere using DiDa
53+
julia> @everywhere using DistributedData
5454

5555
julia> save_at(2, :x, randn(10,10))
5656
Future(2, 1, 4, nothing)
@@ -132,9 +132,3 @@ julia> gather_array(dataset) # download the data from workers to a sing
132132
0.610183 1.12165 0.722438
133133
134134
```
135-
136-
## What does the name `DiDa` mean?
137-
138-
**Di**stributed **Da**ta.
139-
140-
There is no consensus on how to pronounce the shortcut.

‎codecov.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
coverage:
2+
status:
3+
project:
4+
default:
5+
threshold: 15
6+
patch: off

‎docs/make.jl

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using Documenter, DiDa
1+
using Documenter, DistributedData
22

3-
makedocs(modules = [DiDa],
3+
makedocs(modules = [DistributedData],
44
clean = false,
55
format = Documenter.HTML(prettyurls = !("local" in ARGS)),
6-
sitename = "DiDa.jl",
7-
authors = "The developers of DiDa.jl",
6+
sitename = "DistributedData.jl",
7+
authors = "The developers of DistributedData.jl",
88
linkcheck = !("skiplinks" in ARGS),
99
pages = [
1010
"Documentation" => "index.md",
@@ -14,7 +14,7 @@ makedocs(modules = [DiDa],
1414
)
1515

1616
deploydocs(
17-
repo = "github.com/LCSB-BioCore/DiDa.jl.git",
17+
repo = "github.com/LCSB-BioCore/DistributedData.jl.git",
1818
target = "build",
1919
branch = "gh-pages",
2020
devbranch = "develop",

‎docs/src/functions.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
## Data structures
44

55
```@autodocs
6-
Modules = [DiDa]
6+
Modules = [DistributedData]
77
Pages = ["structs.jl"]
88
```
99

1010
## Base functions
1111

1212
```@autodocs
13-
Modules = [DiDa]
13+
Modules = [DistributedData]
1414
Pages = ["base.jl"]
1515
```
1616

1717
## Higher-level array operations
1818

1919
```@autodocs
20-
Modules = [DiDa]
20+
Modules = [DistributedData]
2121
Pages = ["tools.jl"]
2222
```
2323

2424
## Input/Output
2525

2626
```@autodocs
27-
Modules = [DiDa]
27+
Modules = [DistributedData]
2828
Pages = ["io.jl"]
2929
```

‎docs/src/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# DiDa.jl — simple work with distributed data
2+
# DistributedData.jl — simple work with distributed data
33

44
This packages provides simple Distributed Data manipulation and processing
55
routines for Julia.

‎docs/src/tutorial.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11

2-
# DiDa tutorial
2+
# DistributedData tutorial
33

4-
The primary purpose of this tutorial is to get a basic grasp of the main `DiDa`
4+
The primary purpose of this tutorial is to get a basic grasp of the main `DistributedData`
55
functions and methodology.
66

77
For starting up, let's create a few distributed workers and import the package:
88

99
```julia
10-
julia> using Distributed, DiDa
10+
julia> using Distributed, DistributedData
1111

1212
julia> addprocs(3)
1313
2-element Array{Int64,1}:
1414
2
1515
3
1616
4
1717

18-
julia> @everywhere using DiDa
18+
julia> @everywhere using DistributedData
1919
```
2020

2121
## Moving the data around
2222

23-
In `DiDa`, the storage of distributed data is done in the "native" Julia way --
23+
In `DistributedData`, the storage of distributed data is done in the "native" Julia way --
2424
the data is stored in normal named variables. Each node holds its own data in
2525
an arbitrary set of variables as "plain data"; content of these variables is
2626
completely independent among nodes.
@@ -52,7 +52,7 @@ UndefValError: x not defined
5252
5353
```
5454

55-
`DiDa` uses *quoting* to allow you to precisely specify the parts of the code
55+
`DistributedData` uses *quoting* to allow you to precisely specify the parts of the code
5656
that should be evaluated on the "main" Julia process (the one you interact
5757
with), and the code that should be evaluated on the remote workers. Basically,
5858
all quoted code is going to get to the workers without any evaluation; all
@@ -192,7 +192,7 @@ beneficial for implementing advanced parallel algorithms.
192192

193193
Remembering and managing the remote variable names and worker numbers is
194194
extremely impractical, especially if you need to maintain multiple variables on
195-
various subsets of all available workers at once. `DiDa` defines a small
195+
various subsets of all available workers at once. `DistributedData` defines a small
196196
[`Dinfo`](@ref) data structure that keeps that information for you. Many other
197197
functions are able to work with `Dinfo` transparently, instead of the "raw"
198198
symbols and worker lists.
@@ -354,7 +354,7 @@ julia> dmap(Vector(1:length(workers())),
354354

355355
## Persisting the data
356356

357-
`DiDa` provides support for storing the loaded dataset in each worker's local
357+
`DistributedData` provides support for storing the loaded dataset in each worker's local
358358
storage. This is quite beneficial for saving sub-results and various artifacts
359359
of the computation process for later use, without unnecessarily wasting
360360
main memory.
@@ -378,9 +378,9 @@ significant overhead.
378378

379379
## Miscellaneous functions
380380

381-
For convenience, `DiDa` also contains simple implementations of various common
381+
For convenience, `DistributedData` also contains simple implementations of various common
382382
utility operations for processing matrix data. These originated in
383-
flow-cytometry use-cases (which is what `DiDa` was originally built for), but
383+
flow-cytometry use-cases (which is what `DistributedData` was originally built for), but
384384
are applicable in many other areas of data analysis:
385385

386386
- [`dselect`](@ref) reduces a matrix to several selected columns (in a

‎src/DiDa.jl ‎src/DistributedData.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module DiDa
1+
module DistributedData
22

33
using Distributed
44
using Serialization

‎test/base.jl

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
end
1515

1616
addprocs(3)
17-
@everywhere using DiDa
17+
@everywhere using DistributedData
1818
W = workers()
1919

2020
@testset "Distributed data transfers -- with workers" begin
@@ -86,16 +86,16 @@
8686
end
8787

8888
@testset "Internal utilities" begin
89-
@test DiDa.tmp_symbol(:test) != :test
90-
@test DiDa.tmp_symbol(:test, prefix = "abc",
89+
@test DistributedData.tmp_symbol(:test) != :test
90+
@test DistributedData.tmp_symbol(:test, prefix = "abc",
9191
suffix = "def") == :abctestdef
92-
@test DiDa.tmp_symbol(Dinfo(:test, W)) != :test
92+
@test DistributedData.tmp_symbol(Dinfo(:test, W)) != :test
9393
end
9494

9595
@testset "Persistent distributed data" begin
9696
di = dtransform(:(), x -> rand(5), W, :test)
9797

98-
files = DiDa.defaultFiles(di.val, di.workers)
98+
files = DistributedData.defaultFiles(di.val, di.workers)
9999
@test allunique(files)
100100

101101
orig = gather_array(di)

‎test/runtests.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
using Test
3-
using DiDa, Distributed, Random
3+
using DistributedData, Distributed, Random
44

5-
@testset "DiDa tests" begin
5+
@testset "DistributedData tests" begin
66
include("base.jl")
77
include("tools.jl")
88
end

‎test/tools.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@testset "High-level tools" begin
33

44
W = addprocs(2)
5-
@everywhere using DiDa
5+
@everywhere using DistributedData
66

77
Random.seed!(1)
88
dd = rand(11111, 5)

0 commit comments

Comments
 (0)
Please sign in to comment.