diff --git a/docs/run_single_tutorial.jl b/docs/run_single_tutorial.jl index f5e88ad97..b91f23a96 100644 --- a/docs/run_single_tutorial.jl +++ b/docs/run_single_tutorial.jl @@ -8,6 +8,7 @@ name = ARGS[1] pkg_log_path = joinpath(storage_dir, "$(name)_pkg.log") output_directory = ARGS[2] path = ARGS[3] +push!(LOAD_PATH, "@literate") # Should have the Literate and InteractiveUtils packages io = open(pkg_log_path, "w") warn_old_version = try @@ -16,7 +17,7 @@ warn_old_version = try catch err err isa Pkg.Resolve.ResolverError || rethrow() @warn "Failed to install the latest version of Lux.jl. This is possible when the \ - downstream packages haven't been updated to support latest releases yet." + downstream packages haven't been updated to support latest releases yet." err=err true end Pkg.instantiate(; io) @@ -26,7 +27,7 @@ using Literate function preprocess(path, str) if warn_old_version - st = """ + str = """ !!! danger "Using older version of Lux.jl" This tutorial cannot be run on the latest Lux.jl release due to downstream diff --git a/docs/tutorials.jl b/docs/tutorials.jl index 5fd125db4..d9dad6510 100644 --- a/docs/tutorials.jl +++ b/docs/tutorials.jl @@ -55,6 +55,8 @@ const NTASKS = min( @info "Starting Lux Tutorial Build with $(NTASKS) tasks." +run(`$(Base.julia_cmd()) --startup=no --code-coverage=user --threads=$(Threads.nthreads()) --project=@literate -e 'import Pkg; Pkg.add(["Literate", "InteractiveUtils"])'`) + asyncmap(TUTORIALS_BUILDING; ntasks=NTASKS) do (i, (d, p)) @info "Running Tutorial $(i): $(p) on task $(current_task())" path = joinpath(@__DIR__, "..", "examples", p) @@ -66,8 +68,7 @@ asyncmap(TUTORIALS_BUILDING; ntasks=NTASKS) do (i, (d, p)) withenv("JULIA_NUM_THREADS" => "$(Threads.nthreads())", "JULIA_CUDA_HARD_MEMORY_LIMIT" => "$(100 รท NTASKS)%", "JULIA_PKG_PRECOMPILE_AUTO" => "0", "JULIA_DEBUG" => "Literate") do - cmd = `$(Base.julia_cmd()) --code-coverage=user --threads=$(Threads.nthreads()) --project=$(tutorial_proj) "$(file)" "$(name)" "$(output_directory)" "$(path)"` - run(cmd) + run(`$(Base.julia_cmd()) --startup=no --code-coverage=user --threads=$(Threads.nthreads()) --project=$(tutorial_proj) "$(file)" "$(name)" "$(output_directory)" "$(path)"`) end return diff --git a/examples/Basics/Project.toml b/examples/Basics/Project.toml index 94d87b370..19564b45e 100644 --- a/examples/Basics/Project.toml +++ b/examples/Basics/Project.toml @@ -1,8 +1,6 @@ [deps] ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda" Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2" @@ -14,7 +12,6 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" CUDA_Driver_jll = "0.9, 0.10" ComponentArrays = "0.15" ForwardDiff = "0.10" -Literate = "2" Lux = "1" LuxCUDA = "0.3" Optimisers = "0.3" diff --git a/examples/BayesianNN/Project.toml b/examples/BayesianNN/Project.toml index 8d6c24c2e..7027f53c0 100644 --- a/examples/BayesianNN/Project.toml +++ b/examples/BayesianNN/Project.toml @@ -1,9 +1,7 @@ [deps] CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" @@ -14,7 +12,6 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" CairoMakie = "0.12" Functors = "0.4" LinearAlgebra = "1" -Literate = "2" Lux = "1" Random = "1" Tracker = "0.2" diff --git a/examples/GravitationalWaveForm/Project.toml b/examples/GravitationalWaveForm/Project.toml index 004c9f661..1604f96ba 100644 --- a/examples/GravitationalWaveForm/Project.toml +++ b/examples/GravitationalWaveForm/Project.toml @@ -1,9 +1,7 @@ [deps] CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" LineSearches = "d3d80556-e9d4-5f37-9878-2ab0fcc64255" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba" OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e" @@ -16,7 +14,6 @@ SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1" CairoMakie = "0.12" ComponentArrays = "0.15" LineSearches = "7" -Literate = "2" Lux = "1" Optimization = "4" OptimizationOptimJL = "0.4" diff --git a/examples/HyperNet/Project.toml b/examples/HyperNet/Project.toml index 28adca488..6a33107fe 100644 --- a/examples/HyperNet/Project.toml +++ b/examples/HyperNet/Project.toml @@ -1,8 +1,6 @@ [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda" MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458" @@ -18,7 +16,6 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] ADTypes = "1" ComponentArrays = "0.15" -Literate = "2" Lux = "1" LuxCUDA = "0.3" MLDatasets = "0.7" diff --git a/examples/NeuralODE/Project.toml b/examples/NeuralODE/Project.toml index f19001a36..6ee61e610 100644 --- a/examples/NeuralODE/Project.toml +++ b/examples/NeuralODE/Project.toml @@ -1,7 +1,6 @@ [deps] ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda" MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458" @@ -17,7 +16,6 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] ComponentArrays = "0.15" -Literate = "2" Lux = "1" LuxCUDA = "0.2, 0.3" MLDatasets = "0.5, 0.7" diff --git a/examples/OptimizationIntegration/Project.toml b/examples/OptimizationIntegration/Project.toml index b02d58686..9a4fdfec0 100644 --- a/examples/OptimizationIntegration/Project.toml +++ b/examples/OptimizationIntegration/Project.toml @@ -1,9 +1,7 @@ [deps] CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda" MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" @@ -18,9 +16,7 @@ SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1" [compat] CairoMakie = "0.12.10" ComponentArrays = "0.15.17" -InteractiveUtils = "<0.0.1, 1" IterTools = "1.10" -Literate = "2.19" Lux = "1" LuxCUDA = "0.3.3" MLUtils = "0.4.4" diff --git a/examples/PINN2DPDE/Project.toml b/examples/PINN2DPDE/Project.toml index 67ab84399..7c293da6b 100644 --- a/examples/PINN2DPDE/Project.toml +++ b/examples/PINN2DPDE/Project.toml @@ -1,8 +1,6 @@ [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda" MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" @@ -14,10 +12,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] -ADTypes = "1.7.1" +ADTypes = "1.8.1" CairoMakie = "0.12.10" -InteractiveUtils = "<0.0.1, 1" -Literate = "2" Lux = "1" LuxCUDA = "0.3.3" MLUtils = "0.4.4" diff --git a/examples/PolynomialFitting/Project.toml b/examples/PolynomialFitting/Project.toml index cc6b579bf..5006310a3 100644 --- a/examples/PolynomialFitting/Project.toml +++ b/examples/PolynomialFitting/Project.toml @@ -1,8 +1,6 @@ [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda" Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2" @@ -14,7 +12,6 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] ADTypes = "1" CairoMakie = "0.12" -Literate = "2" Lux = "1" LuxCUDA = "0.3" Optimisers = "0.3" diff --git a/examples/SimpleChains/Project.toml b/examples/SimpleChains/Project.toml index 009fd8dca..8d504559f 100644 --- a/examples/SimpleChains/Project.toml +++ b/examples/SimpleChains/Project.toml @@ -1,7 +1,5 @@ [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458" MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" @@ -14,7 +12,6 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] ADTypes = "1" -Literate = "2" Lux = "1" MLDatasets = "0.7.14" MLUtils = "0.4" diff --git a/examples/SimpleRNN/Project.toml b/examples/SimpleRNN/Project.toml index e7bfee18b..a353dcb64 100644 --- a/examples/SimpleRNN/Project.toml +++ b/examples/SimpleRNN/Project.toml @@ -1,8 +1,6 @@ [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" Lux = "b2108857-7c20-44ae-9111-449ecde12c47" LuxCUDA = "d0bbae9a-e099-4d5b-a835-1c6931763bda" MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54" @@ -14,8 +12,7 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] ADTypes = "1" -JLD2 = "0.4, 0.5" -Literate = "2" +JLD2 = "0.5" Lux = "1" LuxCUDA = "0.3" MLUtils = "0.4"