Skip to content

Commit c181a10

Browse files
CarloLucibelloCarloLucibello
authored
introduce workspaces (#630)
* introduce workspace * more workspaces * update * update * fix Lux * fix Lux * buildkite * autotracker * unbrake * update * fix docs * exclude tests * fix gpu * docs * cleanup * cleanup
1 parent 5c241de commit c181a10

38 files changed

+153
-251
lines changed

‎.buildkite/pipeline.yml‎

Lines changed: 19 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,12 @@ steps:
33
plugins:
44
- JuliaCI/julia#v1:
55
version: "1"
6+
- JuliaCI/julia-test#v1:
7+
project: "GraphNeuralNetworks"
68
- JuliaCI/julia-coverage#v1:
79
dirs:
810
- GraphNeuralNetworks/src
9-
command: |
10-
julia --color=yes --depwarn=yes --project=GraphNeuralNetworks/test -e '
11-
import Pkg
12-
dev_pkgs = Pkg.PackageSpec[]
13-
for pkg in ("GNNGraphs", "GNNlib", "GraphNeuralNetworks")
14-
push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
15-
end
16-
Pkg.develop(dev_pkgs)
17-
Pkg.add(["CUDA", "cuDNN"])
18-
Pkg.test("GraphNeuralNetworks")'
11+
- GraphNeuralNetworks/ext
1912
agents:
2013
queue: "juliagpu"
2114
cuda: "*"
@@ -28,19 +21,12 @@ steps:
2821
plugins:
2922
- JuliaCI/julia#v1:
3023
version: "1"
24+
- JuliaCI/julia-test#v1:
25+
project: "GraphNeuralNetworks"
3126
- JuliaCI/julia-coverage#v1:
3227
dirs:
3328
- GraphNeuralNetworks/src
34-
command: |
35-
julia --color=yes --depwarn=yes --project=GraphNeuralNetworks/test -e '
36-
import Pkg
37-
dev_pkgs = Pkg.PackageSpec[]
38-
for pkg in ("GNNGraphs", "GNNlib", "GraphNeuralNetworks")
39-
push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
40-
end
41-
Pkg.develop(dev_pkgs)
42-
Pkg.add(["AMDGPU"])
43-
Pkg.test("GraphNeuralNetworks")'
29+
- GraphNeuralNetworks/ext
4430
agents:
4531
queue: "juliagpu"
4632
rocm: "*"
@@ -54,19 +40,12 @@ steps:
5440
plugins:
5541
- JuliaCI/julia#v1:
5642
version: "1"
43+
- JuliaCI/julia-test#v1:
44+
project: "GNNlib"
5745
- JuliaCI/julia-coverage#v1:
5846
dirs:
5947
- GNNlib/src
60-
command: |
61-
julia --color=yes --depwarn=yes --project=GNNlib/test -e '
62-
import Pkg
63-
dev_pkgs = Pkg.PackageSpec[]
64-
for pkg in ("GNNGraphs", "GNNlib")
65-
push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
66-
end
67-
Pkg.develop(dev_pkgs)
68-
Pkg.add(["CUDA", "cuDNN"])
69-
Pkg.test("GNNlib")'
48+
- GNNlib/ext
7049
agents:
7150
queue: "juliagpu"
7251
cuda: "*"
@@ -79,19 +58,12 @@ steps:
7958
plugins:
8059
- JuliaCI/julia#v1:
8160
version: "1"
61+
- JuliaCI/julia-test#v1:
62+
project: "GNNlib"
8263
- JuliaCI/julia-coverage#v1:
8364
dirs:
8465
- GNNlib/src
85-
command: |
86-
julia --color=yes --depwarn=yes --project=GNNlib/test -e '
87-
import Pkg
88-
dev_pkgs = Pkg.PackageSpec[]
89-
for pkg in ("GNNGraphs", "GNNlib")
90-
push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
91-
end
92-
Pkg.develop(dev_pkgs)
93-
Pkg.add(["AMDGPU"])
94-
Pkg.test("GNNlib")'
66+
- GNNlib/ext
9567
agents:
9668
queue: "juliagpu"
9769
rocm: "*"
@@ -105,19 +77,13 @@ steps:
10577
plugins:
10678
- JuliaCI/julia#v1:
10779
version: "1"
80+
- JuliaCI/julia-test#v1:
81+
project: "GNNGraphs"
10882
- JuliaCI/julia-coverage#v1:
83+
codecov: true
10984
dirs:
11085
- GNNGraphs/src
111-
command: |
112-
julia --color=yes --depwarn=yes --project=GNNGraphs/test -e '
113-
import Pkg
114-
dev_pkgs = Pkg.PackageSpec[]
115-
for pkg in ("GNNGraphs",)
116-
push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
117-
end
118-
Pkg.develop(dev_pkgs)
119-
Pkg.add(["CUDA", "cuDNN"])
120-
Pkg.test("GNNGraphs")'
86+
- GNNGraphs/ext
12187
agents:
12288
queue: "juliagpu"
12389
cuda: "*"
@@ -130,19 +96,12 @@ steps:
13096
plugins:
13197
- JuliaCI/julia#v1:
13298
version: "1"
99+
- JuliaCI/julia-test#v1:
100+
project: "GNNGraphs"
133101
- JuliaCI/julia-coverage#v1:
134102
dirs:
135103
- GNNGraphs/src
136-
command: |
137-
julia --color=yes --depwarn=yes --project=GNNGraphs/test -e '
138-
import Pkg
139-
dev_pkgs = Pkg.PackageSpec[]
140-
for pkg in ("GNNGraphs",)
141-
push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
142-
end
143-
Pkg.develop(dev_pkgs)
144-
Pkg.add(["AMDGPU"])
145-
Pkg.test("GNNGraphs")'
104+
- GNNGraphs/ext
146105
agents:
147106
queue: "juliagpu"
148107
rocm: "*"

‎.github/workflows/multidocs.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,18 @@ jobs:
2020
version: '1'
2121
- uses: julia-actions/cache@v2
2222
# Build individual docs
23-
- run: julia GNNGraphs/docs/make.jl
24-
- run: julia GNNlib/docs/make.jl
25-
- run: julia GNNLux/docs/make.jl
26-
- run: julia GraphNeuralNetworks/docs/make.jl
23+
- run: julia --project=GNNGraphs/docs/ -e 'using Pkg; Pkg.instantiate()'
24+
- run: julia --color=yes --project=GNNGraphs/docs/ GNNGraphs/docs/make.jl
25+
- run: julia --project=GNNlib/docs/ -e 'using Pkg; Pkg.instantiate()'
26+
- run: julia --color=yes --project=GNNlib/docs/ GNNlib/docs/make.jl
27+
- run: julia --project=GNNLux/docs/ -e 'using Pkg; Pkg.instantiate()'
28+
- run: julia --color=yes --project=GNNLux/docs/ GNNLux/docs/make.jl
29+
- run: julia --project=GraphNeuralNetworks/docs/ -e 'using Pkg; Pkg.instantiate()'
30+
- run: julia --color=yes --project=GraphNeuralNetworks/docs/ GraphNeuralNetworks/docs/make.jl
2731
# Compile multi docs
2832
- name: MultiDocs
2933
run: |
3034
git config user.name github-actions
3135
git config user.email github-actions@github.com
3236
julia --project=docs/ -e 'using Pkg; Pkg.instantiate()'
33-
julia --project=docs/ docs/make-multi.jl
37+
julia --color=yes --project=docs/ docs/make-multi.jl

‎.github/workflows/test_GNNGraphs.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ jobs:
1515
matrix:
1616
version:
1717
- '1.10' # Replace this with the minimum Julia version that your package supports.
18-
# - '1' # '1' will automatically expand to the latest stable 1.x release of Julia.
18+
- '1' # '1' will automatically expand to the latest stable 1.x release of Julia.
1919
# - 'pre'
2020
os:
2121
- ubuntu-latest
22+
# - windows-latest
23+
# - macos-latest
2224
arch:
2325
- x64
2426

‎.github/workflows/test_GNNLux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
version:
1717
- '1.10' # Replace this with the minimum Julia version that your package supports.
18-
# - '1' # '1' will automatically expand to the latest stable 1.x release of Julia.
18+
- '1' # '1' will automatically expand to the latest stable 1.x release of Julia.
1919
# - 'pre'
2020
os:
2121
- ubuntu-latest

‎.github/workflows/test_GNNlib.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ jobs:
1515
matrix:
1616
version:
1717
- '1.10' # Replace this with the minimum Julia version that your package supports.
18-
# - '1' # '1' will automatically expand to the latest stable 1.x release of Julia.
18+
- '1' # '1' will automatically expand to the latest stable 1.x release of Julia.
1919
# - 'pre'
2020
os:
2121
- ubuntu-latest
22+
# - windows-latest
23+
# - macos-latest
2224
arch:
2325
- x64
2426

‎GNNGraphs/Project.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
name = "GNNGraphs"
22
uuid = "aed8fd31-079b-4b5a-b342-a13352159b8c"
3-
authors = ["Carlo Lucibello and contributors"]
43
version = "1.4.2"
4+
authors = ["Carlo Lucibello and contributors"]
5+
6+
[workspace]
7+
projects = ["test", "docs"]
58

69
[deps]
710
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
@@ -10,7 +13,6 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
1013
KrylovKit = "0b1a1467-8014-51b9-945f-bf0ae24f4b77"
1114
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1215
MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
13-
MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458"
1416
MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
1517
NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
1618
NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
@@ -35,7 +37,6 @@ Graphs = "1.4"
3537
KrylovKit = "0.8, 0.9"
3638
LinearAlgebra = "1"
3739
MLDataDevices = "1.0"
38-
MLDatasets = "0.7.18"
3940
MLUtils = "0.4"
4041
NNlib = "0.9"
4142
NearestNeighbors = "0.4"

‎GNNGraphs/docs/Project.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
66
MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458"
77
MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
88
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
9+
10+
[sources]
11+
GNNGraphs = {path = ".."}

‎GNNGraphs/docs/make.jl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
using Pkg
2-
Pkg.activate(@__DIR__)
3-
Pkg.develop(path=joinpath(@__DIR__, ".."))
4-
Pkg.instantiate()
5-
61
using Documenter
72
using DocumenterInterLinks
83
using GNNGraphs

‎GNNGraphs/test/Project.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1919
TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
2020
TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe"
2121
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
22+
23+
[sources]
24+
GNNGraphs = {path = ".."}

‎GNNGraphs/test/gnngraph.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ end
112112
@test get_device(mat_gpu)isa AbstractGPUDevice
113113
@test Array(mat_gpu) == mat
114114
end
115-
end
115+
end
116116

117117
@testset "scaled_laplacian" begin
118118
if TEST_GPU && !(dev isa MetalDevice) && GRAPH_T != :sparse && GRAPH_T != :coo

0 commit comments

Comments
 (0)