Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions .buildkite/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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}}"
Expand Down Expand Up @@ -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");
Expand All @@ -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:
Expand Down
10 changes: 0 additions & 10 deletions .buildkite/testing_luxlib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
Expand Down Expand Up @@ -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[];
Expand Down
5 changes: 0 additions & 5 deletions .buildkite/testing_luxtestutils.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
32 changes: 10 additions & 22 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/CIPreRelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ jobs:
files: lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
fail_ci_if_error: true
fail_ci_if_error: false
18 changes: 10 additions & 8 deletions .github/workflows/CI_LuxCUDA.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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"
24 changes: 12 additions & 12 deletions .github/workflows/CI_LuxCore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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"
Loading
Loading