introduce workspaces

.buildkite/pipeline.yml

@@ -3,19 +3,12 @@ steps:
     plugins:
       - JuliaCI/julia#v1:
           version: "1"
+      - JuliaCI/julia-test#v1:
+            project: "GraphNeuralNetworks"
       - JuliaCI/julia-coverage#v1:
           dirs:
             - GraphNeuralNetworks/src
-    command: |
-      julia --color=yes --depwarn=yes --project=GraphNeuralNetworks/test -e '
-        import Pkg
-        dev_pkgs = Pkg.PackageSpec[]
-        for pkg in ("GNNGraphs", "GNNlib", "GraphNeuralNetworks")
-          push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-        end
-        Pkg.develop(dev_pkgs)
-        Pkg.add(["CUDA", "cuDNN"])
-        Pkg.test("GraphNeuralNetworks")'
+            - GraphNeuralNetworks/ext
     agents:
       queue: "juliagpu"
       cuda: "*"
@@ -28,19 +21,12 @@ steps:
     plugins:
       - JuliaCI/julia#v1:
           version: "1"
+      - JuliaCI/julia-test#v1:
+            project: "GraphNeuralNetworks"
       - JuliaCI/julia-coverage#v1:
           dirs:
             - GraphNeuralNetworks/src
-    command: |
-      julia --color=yes --depwarn=yes --project=GraphNeuralNetworks/test -e '
-        import Pkg
-        dev_pkgs = Pkg.PackageSpec[]
-        for pkg in ("GNNGraphs", "GNNlib", "GraphNeuralNetworks")
-          push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-        end
-        Pkg.develop(dev_pkgs)
-        Pkg.add(["AMDGPU"])
-        Pkg.test("GraphNeuralNetworks")'
+            - GraphNeuralNetworks/ext
     agents:
       queue: "juliagpu"
       rocm: "*"
@@ -54,19 +40,12 @@ steps:
     plugins:
       - JuliaCI/julia#v1:
           version: "1"
+      - JuliaCI/julia-test#v1:
+            project: "GNNlib"
       - JuliaCI/julia-coverage#v1:
           dirs:
             - GNNlib/src
-    command: |
-      julia --color=yes --depwarn=yes --project=GNNlib/test -e '
-        import Pkg
-        dev_pkgs = Pkg.PackageSpec[]
-        for pkg in ("GNNGraphs", "GNNlib")
-          push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-        end
-        Pkg.develop(dev_pkgs)
-        Pkg.add(["CUDA", "cuDNN"])
-        Pkg.test("GNNlib")'
+            - GNNlib/ext
     agents:
       queue: "juliagpu"
       cuda: "*"
@@ -79,19 +58,12 @@ steps:
     plugins:
       - JuliaCI/julia#v1:
           version: "1"
+      - JuliaCI/julia-test#v1:
+            project: "GNNlib"
       - JuliaCI/julia-coverage#v1:
           dirs:
             - GNNlib/src
-    command: |
-      julia --color=yes --depwarn=yes --project=GNNlib/test -e '
-        import Pkg
-        dev_pkgs = Pkg.PackageSpec[]
-        for pkg in ("GNNGraphs", "GNNlib")
-          push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-        end
-        Pkg.develop(dev_pkgs)
-        Pkg.add(["AMDGPU"])
-        Pkg.test("GNNlib")'
+            - GNNlib/ext
     agents:
       queue: "juliagpu"
       rocm: "*"
@@ -105,19 +77,13 @@ steps:
     plugins:
       - JuliaCI/julia#v1:
           version: "1"
+      - JuliaCI/julia-test#v1:
+            project: "GNNGraphs"
       - JuliaCI/julia-coverage#v1:
+          codecov: true
           dirs:
             - GNNGraphs/src
-    command: |
-      julia --color=yes --depwarn=yes --project=GNNGraphs/test -e '
-        import Pkg
-        dev_pkgs = Pkg.PackageSpec[]
-        for pkg in ("GNNGraphs",)
-          push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-        end
-        Pkg.develop(dev_pkgs)
-        Pkg.add(["CUDA", "cuDNN"])
-        Pkg.test("GNNGraphs")'
+            - GNNGraphs/ext
     agents:
       queue: "juliagpu"
       cuda: "*"
@@ -130,19 +96,12 @@ steps:
     plugins:
       - JuliaCI/julia#v1:
           version: "1"
+      - JuliaCI/julia-test#v1:
+            project: "GNNGraphs"
       - JuliaCI/julia-coverage#v1:
           dirs:
             - GNNGraphs/src
-    command: |
-      julia --color=yes --depwarn=yes --project=GNNGraphs/test -e '
-        import Pkg
-        dev_pkgs = Pkg.PackageSpec[]
-        for pkg in ("GNNGraphs",)
-          push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-        end
-        Pkg.develop(dev_pkgs)
-        Pkg.add(["AMDGPU"])
-        Pkg.test("GNNGraphs")'
+            - GNNGraphs/ext
     agents:
       queue: "juliagpu"
       rocm: "*"

.github/workflows/multidocs.yml

@@ -20,14 +20,18 @@ jobs:
           version: '1'
       - uses: julia-actions/cache@v2
       # Build individual docs
-      - run: julia GNNGraphs/docs/make.jl
-      - run: julia GNNlib/docs/make.jl
-      - run: julia GNNLux/docs/make.jl
-      - run: julia GraphNeuralNetworks/docs/make.jl
+      - run: julia --project=GNNGraphs/docs/ -e 'using Pkg; Pkg.instantiate()'
+      - run: julia --color=yes --project=GNNGraphs/docs/ GNNGraphs/docs/make.jl
+      - run: julia --project=GNNlib/docs/ -e 'using Pkg; Pkg.instantiate()'
+      - run: julia --color=yes --project=GNNlib/docs/ GNNlib/docs/make.jl
+      - run: julia --project=GNNLux/docs/ -e 'using Pkg; Pkg.instantiate()'
+      - run: julia --color=yes --project=GNNLux/docs/ GNNLux/docs/make.jl
+      - run: julia --project=GraphNeuralNetworks/docs/ -e 'using Pkg; Pkg.instantiate()'
+      - run: julia --color=yes --project=GraphNeuralNetworks/docs/ GraphNeuralNetworks/docs/make.jl
       # Compile multi docs
       - name: MultiDocs
         run: |
           git config user.name github-actions
           git config user.email github-actions@github.com
           julia --project=docs/ -e 'using Pkg; Pkg.instantiate()'
-          julia --project=docs/ docs/make-multi.jl
+          julia --color=yes --project=docs/ docs/make-multi.jl

.github/workflows/test_GNNGraphs.yml

@@ -15,10 +15,12 @@ jobs:
       matrix:
         version:
           - '1.10' # Replace this with the minimum Julia version that your package supports.
-          # - '1' #  '1' will automatically expand to the latest stable 1.x release of Julia.
+          - '1' #  '1' will automatically expand to the latest stable 1.x release of Julia.
           # - 'pre'
         os:
           - ubuntu-latest
+          # - windows-latest
+          # - macos-latest
         arch:
           - x64
 

.github/workflows/test_GNNLux.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         version:
           - '1.10' # Replace this with the minimum Julia version that your package supports.
-          # - '1' #  '1' will automatically expand to the latest stable 1.x release of Julia.
+          - '1' #  '1' will automatically expand to the latest stable 1.x release of Julia.
           # - 'pre'
         os:
           - ubuntu-latest

.github/workflows/test_GNNlib.yml

@@ -15,10 +15,12 @@ jobs:
       matrix:
         version:
           - '1.10' # Replace this with the minimum Julia version that your package supports.
-          # - '1' #  '1' will automatically expand to the latest stable 1.x release of Julia.
+          - '1' #  '1' will automatically expand to the latest stable 1.x release of Julia.
           # - 'pre'
         os:
           - ubuntu-latest
+          # - windows-latest
+          # - macos-latest
         arch:
           - x64
 

GNNGraphs/Project.toml

@@ -1,7 +1,10 @@
 name = "GNNGraphs"
 uuid = "aed8fd31-079b-4b5a-b342-a13352159b8c"
-authors = ["Carlo Lucibello and contributors"]
 version = "1.4.2"
+authors = ["Carlo Lucibello and contributors"]
+
+[workspace]
+projects = ["test", "docs"]
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
@@ -10,7 +13,6 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 KrylovKit = "0b1a1467-8014-51b9-945f-bf0ae24f4b77"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
-MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458"
 MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
 NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
 NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
@@ -35,7 +37,6 @@ Graphs = "1.4"
 KrylovKit = "0.8, 0.9"
 LinearAlgebra = "1"
 MLDataDevices = "1.0"
-MLDatasets = "0.7.18"
 MLUtils = "0.4"
 NNlib = "0.9"
 NearestNeighbors = "0.4"

GNNGraphs/docs/Project.toml

@@ -6,3 +6,6 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458"
 MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[sources]
+GNNGraphs = {path = ".."}

GNNGraphs/docs/make.jl

@@ -1,8 +1,3 @@
-using Pkg
-Pkg.activate(@__DIR__)
-Pkg.develop(path=joinpath(@__DIR__, ".."))
-Pkg.instantiate()
-
 using Documenter
 using DocumenterInterLinks
 using GNNGraphs

GNNGraphs/test/Project.toml

@@ -19,3 +19,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
+
+[sources]
+GNNGraphs = {path = ".."}

GNNGraphs/test/gnngraph.jl

@@ -112,7 +112,7 @@ end
                 @test get_device(mat_gpu)isa AbstractGPUDevice
                 @test Array(mat_gpu) == mat
             end
-        end
+        end 
 
         @testset "scaled_laplacian" begin 
             if TEST_GPU && !(dev isa MetalDevice) && GRAPH_T != :sparse && GRAPH_T != :coo

GNNGraphs/test/runtests.jl

@@ -1,16 +1,10 @@
-## The test environment is instantiated as follows:
-# using Pkg
-# Pkg.activate(@__DIR__)
-# Pkg.develop(path=joinpath(@__DIR__, ".."))
-# Pkg.instantiate()
-
 using TestItemRunner
 
 ## See https://www.julia-vscode.org/docs/stable/userguide/testitems/
 ## for how to run the tests within VS Code.
 ## See test_module.jl for the test infrastructure.
 
-## Uncomment below and in test_module.jl to change the default test settings
+## Uncomment below to change the default test settings
 # ENV["GNN_TEST_CPU"] = "false"
 # ENV["GNN_TEST_CUDA"] = "true"
 # ENV["GNN_TEST_AMDGPU"] = "true"

GNNGraphs/test/test_module.jl

@@ -2,11 +2,6 @@
 
 using Pkg
 
-## Uncomment below to change the default test settings
-# ENV["GNN_TEST_CUDA"] = "true"
-# ENV["GNN_TEST_AMDGPU"] = "true"
-# ENV["GNN_TEST_Metal"] = "true"
-
 to_test(backend) = get(ENV, "GNN_TEST_$(backend)", "false") == "true"
 has_dependecies(pkgs) = all(pkg -> haskey(Pkg.project().dependencies, pkg), pkgs)
 deps_dict = Dict(:CUDA => ["CUDA", "cuDNN"], :AMDGPU => ["AMDGPU"], :Metal => ["Metal"])

GNNLux/Project.toml

@@ -1,7 +1,10 @@
 name = "GNNLux"
 uuid = "e8545f4d-a905-48ac-a8c4-ca114b98986d"
-authors = ["Carlo Lucibello and contributors"]
 version = "0.2.0-DEV"
+authors = ["Carlo Lucibello and contributors"]
+
+[workspace]
+projects = ["test", "docs"]
 
 [deps]
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
@@ -15,6 +18,10 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[sources]
+GNNGraphs = {path = "../GNNGraphs"}
+GNNlib = {path = "../GNNlib"}
+
 [compat]
 ConcreteStructs = "0.2.3"
 GNNGraphs = "1.4"

GNNLux/docs/Project.toml

@@ -16,3 +16,8 @@ OneHotArrays = "0b1bfda6-eb8a-41d2-88d8-f5af5cad476f"
 Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
 TSne = "24678dba-d5e9-5843-a4c6-250288b04835"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
+
+[sources]
+GNNGraphs = {path = "../../GNNGraphs"}
+GNNLux = {path = ".."}
+GNNlib = {path = "../../GNNlib"}

GNNLux/docs/make.jl

@@ -1,12 +1,3 @@
-using Pkg
-Pkg.activate(@__DIR__)
-Pkg.develop([
-    PackageSpec(path=joinpath(@__DIR__, "..", "..", "GNNGraphs")), 
-    PackageSpec(path=joinpath(@__DIR__, "..", "..", "GNNlib")), 
-    PackageSpec(path=joinpath(@__DIR__, "..")),
-])
-Pkg.instantiate()
-
 using Documenter
 using GNNLux
 using Lux, GNNGraphs, GNNlib, Graphs

GNNLux/src/layers/basic.jl

@@ -34,8 +34,8 @@ julia> rng = Random.default_rng();
 julia> m = GNNChain(GCNConv(2 => 5, relu), Dense(5 => 4))
 GNNChain(
     layers = NamedTuple(
-        layer_1 = GCNConv(2 => 5, relu),  # 15 parameters
-        layer_2 = Dense(5 => 4),        # 24 parameters
+        layer_1 = GCNConv(2 => 5, relu),          # 15 parameters
+        layer_2 = Dense(5 => 4),                  # 24 parameters
     ),
 )         # Total: 39 parameters,
           #        plus 0 states.

GNNLux/test/Project.toml

@@ -21,5 +21,7 @@ TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
-[compat]
-LuxTestUtils = "1"
+[sources]
+GNNGraphs = {path = "../../GNNGraphs"}
+GNNLux = {path = ".."}
+GNNlib = {path = "../../GNNlib"}