From 94843c1e8a004303017951895fcb8f1eaa7bf109 Mon Sep 17 00:00:00 2001 From: Anton Oresten Date: Fri, 29 Nov 2024 18:53:00 +0100 Subject: [PATCH 1/6] Add deps to CI --- .github/workflows/CI.yml | 18 +++++++++++++++++- Lux.jl | 1 + Reactant.jl | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) create mode 160000 Lux.jl create mode 160000 Reactant.jl diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 54f66c6..9933571 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -37,6 +37,14 @@ jobs: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - uses: julia-actions/cache@v2 + - name: Install dependencies + shell: julia --project --color=yes {0} + run: | + using Pkg + Pkg.add("JSON3") + Pkg.add(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl") + Pkg.add(url="https://github.com/MurrellGroup/LowRankLayers.jl") + Pkg.add(url="https://github.com/MurrellGroup/LogitSamplers.jl") - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 @@ -64,6 +72,14 @@ jobs: using Pkg Pkg.develop(PackageSpec(path=pwd())) Pkg.instantiate() + - name: Install additional dependencies + shell: julia --project=docs --color=yes {0} + run: | + using Pkg + Pkg.add("JSON3") + Pkg.add(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl") + Pkg.add(url="https://github.com/MurrellGroup/LowRankLayers.jl") + Pkg.add(url="https://github.com/MurrellGroup/LogitSamplers.jl") - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-docdeploy@v1 env: @@ -75,4 +91,4 @@ jobs: using Documenter: DocMeta, doctest using Jjama3 DocMeta.setdocmeta!(Jjama3, :DocTestSetup, :(using Jjama3); recursive=true) - doctest(Jjama3) + doctest(Jjama3) \ No newline at end of file diff --git a/Lux.jl b/Lux.jl new file mode 160000 index 0000000..9b97721 --- /dev/null +++ b/Lux.jl @@ -0,0 +1 @@ +Subproject commit 9b9772181499f3a6b6e38f541cce7427ca2182eb diff --git a/Reactant.jl b/Reactant.jl new file mode 160000 index 0000000..4981557 --- /dev/null +++ b/Reactant.jl @@ -0,0 +1 @@ +Subproject commit 4981557ba0a4e5d20e9c4dc770af85d488908925 From 666b2e5fbd2e58449757a85caa18a493dc1b9045 Mon Sep 17 00:00:00 2001 From: Anton Oresten Date: Fri, 29 Nov 2024 18:58:33 +0100 Subject: [PATCH 2/6] testing --- .github/workflows/CI.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9933571..e83d2a3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,13 +38,14 @@ jobs: arch: ${{ matrix.arch }} - uses: julia-actions/cache@v2 - name: Install dependencies - shell: julia --project --color=yes {0} run: | - using Pkg - Pkg.add("JSON3") - Pkg.add(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl") - Pkg.add(url="https://github.com/MurrellGroup/LowRankLayers.jl") - Pkg.add(url="https://github.com/MurrellGroup/LogitSamplers.jl") + julia -e ' + using Pkg + Pkg.add("JSON3") + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) + ' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 @@ -72,14 +73,15 @@ jobs: using Pkg Pkg.develop(PackageSpec(path=pwd())) Pkg.instantiate() - - name: Install additional dependencies - shell: julia --project=docs --color=yes {0} + - name: Install dependencies run: | - using Pkg - Pkg.add("JSON3") - Pkg.add(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl") - Pkg.add(url="https://github.com/MurrellGroup/LowRankLayers.jl") - Pkg.add(url="https://github.com/MurrellGroup/LogitSamplers.jl") + julia -e ' + using Pkg + Pkg.add("JSON3") + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) + ' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-docdeploy@v1 env: From 216ecce1c000a0599e49460b7a31a7d5f7d05c4b Mon Sep 17 00:00:00 2001 From: Anton Oresten Date: Fri, 29 Nov 2024 19:02:59 +0100 Subject: [PATCH 3/6] testing2 --- .github/workflows/CI.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e83d2a3..1475db6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,7 +39,7 @@ jobs: - uses: julia-actions/cache@v2 - name: Install dependencies run: | - julia -e ' + julia --project -e ' using Pkg Pkg.add("JSON3") Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) @@ -71,17 +71,12 @@ jobs: shell: julia --project=docs --color=yes {0} run: | using Pkg + Pkg.add("JSON3") + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) Pkg.develop(PackageSpec(path=pwd())) Pkg.instantiate() - - name: Install dependencies - run: | - julia -e ' - using Pkg - Pkg.add("JSON3") - Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) - Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) - Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) - ' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-docdeploy@v1 env: From 5ede483983d964b2cc947186a182d31d4b678bcb Mon Sep 17 00:00:00 2001 From: Anton Oresten Date: Fri, 29 Nov 2024 19:09:44 +0100 Subject: [PATCH 4/6] testing3 --- .github/workflows/CI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1475db6..0b83d8a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,12 +39,15 @@ jobs: - uses: julia-actions/cache@v2 - name: Install dependencies run: | - julia --project -e ' + julia -e ' using Pkg + Pkg.activate(temp=true) Pkg.add("JSON3") Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) + Pkg.activate(".") + Pkg.develop(["HuggingFaceTokenizers", "LowRankLayers", "LogitSamplers"]) ' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 @@ -72,9 +75,6 @@ jobs: run: | using Pkg Pkg.add("JSON3") - Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) - Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) - Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) Pkg.develop(PackageSpec(path=pwd())) Pkg.instantiate() - uses: julia-actions/julia-buildpkg@v1 From 42f9f343658d742abe8f9429c2007e648cb3b33d Mon Sep 17 00:00:00 2001 From: Anton Oresten Date: Fri, 29 Nov 2024 19:34:07 +0100 Subject: [PATCH 5/6] testing4 --- .github/workflows/CI.yml | 15 ++++++++++++--- Lux.jl | 1 - Project.toml | 2 +- Reactant.jl | 1 - 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 160000 Lux.jl delete mode 160000 Reactant.jl diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0b83d8a..db351f6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -24,7 +24,6 @@ jobs: matrix: version: - '1.10' - - '1.9' - 'pre' os: - ubuntu-latest @@ -42,12 +41,14 @@ jobs: julia -e ' using Pkg Pkg.activate(temp=true) - Pkg.add("JSON3") Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) Pkg.activate(".") - Pkg.develop(["HuggingFaceTokenizers", "LowRankLayers", "LogitSamplers"]) + Pkg.add("JSON3") + Pkg.develop("HuggingFaceTokenizers") + Pkg.develop("LowRankLayers") + Pkg.develop("LogitSamplers") ' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 @@ -74,7 +75,15 @@ jobs: shell: julia --project=docs --color=yes {0} run: | using Pkg + Pkg.activate(temp=true) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/HuggingFaceTokenizers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) + Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) + Pkg.activate(".") Pkg.add("JSON3") + Pkg.develop("HuggingFaceTokenizers") + Pkg.develop("LowRankLayers") + Pkg.develop("LogitSamplers") Pkg.develop(PackageSpec(path=pwd())) Pkg.instantiate() - uses: julia-actions/julia-buildpkg@v1 diff --git a/Lux.jl b/Lux.jl deleted file mode 160000 index 9b97721..0000000 --- a/Lux.jl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9b9772181499f3a6b6e38f541cce7427ca2182eb diff --git a/Project.toml b/Project.toml index d169abf..7800c90 100644 --- a/Project.toml +++ b/Project.toml @@ -35,7 +35,7 @@ Metal = "1" NNlib = "0.9" SafeTensors = "1" StatsBase = "0.34" -julia = "1.9" +julia = "1.10" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/Reactant.jl b/Reactant.jl deleted file mode 160000 index 4981557..0000000 --- a/Reactant.jl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4981557ba0a4e5d20e9c4dc770af85d488908925 From 689ea31c1d370dfbdbc5696bb57972ca3b9def2f Mon Sep 17 00:00:00 2001 From: Anton Oresten Date: Fri, 29 Nov 2024 19:36:06 +0100 Subject: [PATCH 6/6] testing5 --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index db351f6..c1848e8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -45,10 +45,10 @@ jobs: Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) Pkg.activate(".") - Pkg.add("JSON3") Pkg.develop("HuggingFaceTokenizers") Pkg.develop("LowRankLayers") Pkg.develop("LogitSamplers") + Pkg.add("JSON3") ' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 @@ -80,10 +80,10 @@ jobs: Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LowRankLayers.jl")) Pkg.develop(PackageSpec(url="https://github.com/MurrellGroup/LogitSamplers.jl")) Pkg.activate(".") - Pkg.add("JSON3") Pkg.develop("HuggingFaceTokenizers") Pkg.develop("LowRankLayers") Pkg.develop("LogitSamplers") + Pkg.add("JSON3") Pkg.develop(PackageSpec(path=pwd())) Pkg.instantiate() - uses: julia-actions/julia-buildpkg@v1