chore: use [sources] in Project.toml (#1090)

LuxDL · Nov 17, 2024 · 2331c99 · 2331c99 · github-actions · Nov 17, 2024
1 parent cf8fd61
commit 2331c99
Show file tree

Hide file tree

Showing 15 changed files with 101 additions and 138 deletions.
diff --git a/.buildkite/testing.yml b/.buildkite/testing.yml
@@ -25,11 +25,6 @@ steps:
         command: |
           julia --color=yes --code-coverage=user --depwarn=yes --project=. -e '
             import Pkg;
-            dev_pkgs = Pkg.PackageSpec[];
-            for pkg in ("lib/LuxCore", "lib/MLDataDevices", "lib/WeightInitializers", "lib/LuxLib",)
-              push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-            end
-            Pkg.develop(dev_pkgs);
             Pkg.Registry.update();
             Pkg.instantiate();
             Pkg.activate("test");
@@ -39,10 +34,10 @@ steps:
             end
             Pkg.develop(dev_pkgs);
             Pkg.instantiate();'
-            julia --color=yes --code-coverage=user --depwarn=yes --project=test -e '
-              import Pkg, Lux;
-              dir = dirname(pathof(Lux));
-              include(joinpath(dir, "../test/runtests.jl"))'
+          julia --color=yes --code-coverage=user --depwarn=yes --project=test -e '
+            import Pkg, Lux;
+            dir = dirname(pathof(Lux));
+            include(joinpath(dir, "../test/runtests.jl"))'
         env:
           BACKEND_GROUP: "CUDA"
           LUX_TEST_GROUP: "{{matrix.group}}"
@@ -79,11 +74,6 @@ steps:
         command: |
           julia --color=yes --code-coverage=user --depwarn=yes --project=. -e '
             import Pkg;
-            dev_pkgs = Pkg.PackageSpec[];
-            for pkg in ("lib/LuxCore", "lib/MLDataDevices", "lib/WeightInitializers", "lib/LuxLib",)
-              push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-            end
-            Pkg.develop(dev_pkgs);
             Pkg.Registry.update();
             Pkg.instantiate();
             Pkg.activate("test");
@@ -93,10 +83,10 @@ steps:
             end
             Pkg.develop(dev_pkgs);
             Pkg.instantiate();'
-            julia --color=yes --code-coverage=user --depwarn=yes --project=test -e '
-              import Pkg, Lux;
-              dir = dirname(pathof(Lux));
-              include(joinpath(dir, "../test/runtests.jl"))'
+          julia --color=yes --code-coverage=user --depwarn=yes --project=test -e '
+            import Pkg, Lux;
+            dir = dirname(pathof(Lux));
+            include(joinpath(dir, "../test/runtests.jl"))'
         env:
           BACKEND_GROUP: "AMDGPU"
         agents:

diff --git a/.buildkite/testing_luxlib.yml b/.buildkite/testing_luxlib.yml
@@ -19,11 +19,6 @@ steps:
           julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxLib -e '
             import Pkg;
             Pkg.Registry.update();
-            dev_pkgs = Pkg.PackageSpec[];
-            for pkg in ("lib/LuxCore", "lib/MLDataDevices")
-              push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-            end;
-            Pkg.develop(dev_pkgs);
             Pkg.instantiate();
             Pkg.activate("lib/LuxLib/test");
             dev_pkgs = Pkg.PackageSpec[];
@@ -67,11 +62,6 @@ steps:
           julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxLib -e '
             import Pkg;
             Pkg.Registry.update();
-            dev_pkgs = Pkg.PackageSpec[];
-            for pkg in ("lib/LuxCore", "lib/MLDataDevices")
-              push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-            end;
-            Pkg.develop(dev_pkgs);
             Pkg.instantiate();
             Pkg.activate("lib/LuxLib/test");
             dev_pkgs = Pkg.PackageSpec[];

diff --git a/.buildkite/testing_luxtestutils.yml b/.buildkite/testing_luxtestutils.yml
@@ -15,11 +15,6 @@ steps:
           julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxTestUtils -e '
             import Pkg;
             Pkg.Registry.update();
-            dev_pkgs = Pkg.PackageSpec[];
-            for pkg in ("lib/MLDataDevices",)
-              push!(dev_pkgs, Pkg.PackageSpec(path=pkg));
-            end;
-            Pkg.develop(dev_pkgs);
             Pkg.instantiate();
             Pkg.test(; coverage="user")'
         agents:

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -44,10 +44,10 @@ jobs:
           - "misc"
           - "reactant"
         include:
-          - version: "1.10"
+          - version: "1"
             os: "macos-latest"
             test_group: "all"
-          - version: "1.10"
+          - version: "1"
             os: "windows-latest"
             test_group: "all"
     steps:
@@ -65,24 +65,18 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - name: "Install Dependencies"
+      - uses: julia-actions/julia-buildpkg@v1
+      - name: "Dev Test Dependencies"
         run: |
           import Pkg
-          dev_pkgs = Pkg.PackageSpec[]
-          for pkg in ("lib/LuxCore", "lib/MLDataDevices", "lib/WeightInitializers", "lib/LuxLib",)
-            push!(dev_pkgs, Pkg.PackageSpec(path=pkg))
-          end
-          Pkg.develop(dev_pkgs)
           Pkg.Registry.update()
-          Pkg.instantiate()
-          Pkg.activate("test")
           dev_pkgs = Pkg.PackageSpec[]
           for pkg in ("lib/LuxTestUtils", "lib/LuxLib", "lib/MLDataDevices", "lib/LuxCore", ".")
             push!(dev_pkgs, Pkg.PackageSpec(path=pkg))
           end
           Pkg.develop(dev_pkgs)
           Pkg.instantiate()
-        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=. {0}
+        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=test {0}
       - name: "Run Tests"
         run: |
           import Pkg, Lux
@@ -99,7 +93,7 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
   downgrade:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') && github.base_ref == github.event.repository.default_branch }}
@@ -112,24 +106,18 @@ jobs:
       - uses: julia-actions/julia-downgrade-compat@v1
         with:
           skip: "LuxCore,MLDataDevices,WeightInitializers,LuxLib"
-      - name: "Install Dependencies"
+      - uses: julia-actions/julia-buildpkg@v1
+      - name: "Dev Test Dependencies"
         run: |
           import Pkg
-          dev_pkgs = Pkg.PackageSpec[]
-          for pkg in ("lib/LuxCore", "lib/MLDataDevices", "lib/WeightInitializers", "lib/LuxLib",)
-            push!(dev_pkgs, Pkg.PackageSpec(path=pkg))
-          end
-          Pkg.develop(dev_pkgs)
           Pkg.Registry.update()
-          Pkg.instantiate()
-          Pkg.activate("test")
           dev_pkgs = Pkg.PackageSpec[]
           for pkg in ("lib/LuxTestUtils", "lib/LuxLib", "lib/MLDataDevices", "lib/LuxCore", ".")
             push!(dev_pkgs, Pkg.PackageSpec(path=pkg))
           end
           Pkg.develop(dev_pkgs)
           Pkg.instantiate()
-        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=. {0}
+        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=test {0}
       - name: "Run Tests"
         run: |
           import Pkg, Lux
@@ -144,7 +132,7 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
 env:
   BACKEND_GROUP: "CPU"
diff --git a/.github/workflows/CIPreRelease.yml b/.github/workflows/CIPreRelease.yml
@@ -92,4 +92,4 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: false
diff --git a/.github/workflows/CI_LuxCUDA.yml b/.github/workflows/CI_LuxCUDA.yml
@@ -39,11 +39,12 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - name: "Install Dependencies and Run Tests"
+      - uses: julia-actions/julia-buildpkg@v1
+        with:
+          project: "lib/LuxCUDA"
+      - name: "Run Tests"
         run: |
           import Pkg
-          Pkg.Registry.update()
-          Pkg.instantiate()
           Pkg.test(; coverage="user")
         shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxCUDA {0}
       - uses: julia-actions/julia-processcoverage@v1
@@ -54,7 +55,7 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
   downgrade:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') && github.base_ref == github.event.repository.default_branch }}
@@ -65,11 +66,12 @@ jobs:
         with:
           version: "1.10"
       - uses: julia-actions/julia-downgrade-compat@v1
-      - name: "Install Dependencies and Run Tests"
+      - uses: julia-actions/julia-buildpkg@v1
+        with:
+          project: "lib/LuxCUDA"
+      - name: "Run Tests"
         run: |
           import Pkg
-          Pkg.Registry.update()
-          Pkg.instantiate()
           Pkg.test(; coverage="user")
         shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxCUDA {0}
       - uses: julia-actions/julia-processcoverage@v1
@@ -80,7 +82,7 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
 env:
   BACKEND_GROUP: "CPU"
diff --git a/.github/workflows/CI_LuxCore.yml b/.github/workflows/CI_LuxCore.yml
@@ -43,18 +43,18 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - name: "Install Dependencies"
+      - uses: julia-actions/julia-buildpkg@v1
+        with:
+          project: "lib/LuxCore"
+      - name: "Dev Test Dependencies"
         run: |
           import Pkg
-          Pkg.Registry.update()
-          Pkg.instantiate()
-          Pkg.activate("lib/LuxCore/test")
           dev_pkgs = Pkg.PackageSpec[]
           for pkg in ("lib/LuxCore", "lib/MLDataDevices")
             push!(dev_pkgs, Pkg.PackageSpec(path=pkg))
           end
           Pkg.develop(dev_pkgs)
-        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxCore {0}
+        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxCore/test {0}
       - name: "Run Tests"
         run: |
           import Pkg, LuxCore
@@ -69,7 +69,7 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
   downgrade:
     if: ${{ !contains(github.event.head_commit.message, '[skip tests]') && github.base_ref == github.event.repository.default_branch }}
@@ -84,18 +84,18 @@ jobs:
         with:
           version: ${{ matrix.version }}
       - uses: julia-actions/julia-downgrade-compat@v1
-      - name: "Install Dependencies"
+      - uses: julia-actions/julia-buildpkg@v1
+        with:
+          project: "lib/LuxCore"
+      - name: "Dev Test Dependencies"
         run: |
           import Pkg
-          Pkg.Registry.update()
-          Pkg.instantiate()
-          Pkg.activate("lib/LuxCore/test")
           dev_pkgs = Pkg.PackageSpec[]
           for pkg in ("lib/LuxCore", "lib/MLDataDevices")
             push!(dev_pkgs, Pkg.PackageSpec(path=pkg))
           end
           Pkg.develop(dev_pkgs)
-        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxCore {0}
+        shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxCore/test {0}
       - name: "Run Tests"
         run: |
           import Pkg, LuxCore
@@ -110,7 +110,7 @@ jobs:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-          fail_ci_if_error: true
+          fail_ci_if_error: false
 
 env:
   BACKEND_GROUP: "CPU"