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.

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

Replace Distributed with Malt soon! #2240

Merged
merged 46 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
906838c
Format WorkspaceManager
savq Aug 1, 2022
b1463dd
Replace Distributed with Malt
savq Sep 3, 2022
ec8d989
Discard changes to test/Bonds.jl
fonsp Jul 9, 2023
a3ca342
Discard changes to test/Logging.jl
fonsp Jul 9, 2023
88cb7b4
Discard changes to test/ReloadFromFile.jl
fonsp Jul 9, 2023
1d34ff6
Discard changes to test/React.jl
fonsp Jul 9, 2023
8b1179b
Discard changes to test/RichOutput.jl
fonsp Jul 9, 2023
31e98ac
Discard changes to test/Notebook.jl
fonsp Jul 9, 2023
3fb2def
Discard changes to test/MacroAnalysis.jl
fonsp Jul 9, 2023
080bd40
Discard changes to test/cell_disabling.jl
fonsp Jul 9, 2023
00cc360
Discard changes to test/compiletimes.jl
fonsp Jul 9, 2023
bca2d58
Discard changes to test/webserver.jl
fonsp Jul 9, 2023
2afc06a
Discard changes to src/Configuration.jl
fonsp Jul 9, 2023
3d0e892
small updates
fonsp Jul 9, 2023
2195960
bring back workspace_use_distributed and workspace_use_distributed_st…
fonsp Jul 9, 2023
b2bb80b
fixiefix its broken but close
fonsp Jul 9, 2023
0e8f3b4
tiny fix
fonsp Jul 15, 2023
e329468
hmmmmm
fonsp Jul 15, 2023
4279352
fix: ref: https://github.com/esm-dev/esm.sh/issues/703
pankgeorg Aug 9, 2023
46544ec
Merge branch 'main' into pr/2240
fonsp Sep 12, 2023
d55c381
Merge branch 'malt' of https://github.com/savq/Pluto.jl into pr/2240
fonsp Sep 12, 2023
3525864
Merge branch 'main' into pr/2240
fonsp Sep 12, 2023
3ee93ac
small fixes
fonsp Sep 12, 2023
cabb52c
Merge branch 'main' into pr/2240
fonsp Sep 12, 2023
6cc8a54
fixiefix
fonsp Sep 12, 2023
8dba389
Malt 1.0 compat
fonsp Sep 12, 2023
c082c78
verify_no_running_processes
fonsp Sep 12, 2023
9fdebd6
enable Malt by default for testing this PR
fonsp Sep 12, 2023
aeeb191
nothing
fonsp Sep 12, 2023
8d5a0e7
huh
fonsp Sep 12, 2023
eb161b0
asdf
fonsp Sep 12, 2023
69569b9
asdf
fonsp Sep 12, 2023
abb0a79
Malt 1.0.2
fonsp Sep 12, 2023
92ed141
Merge branch 'main' into pr/2240
fonsp Sep 12, 2023
c4bb0e2
fix test
fonsp Sep 12, 2023
45e6e1b
Test setting OPENBLAS_NUM_THREADS=1 on windows for Malt.Worker
Pangoraw Sep 13, 2023
97deb81
Merge branch 'main' into malt
fonsp Sep 13, 2023
ed12abe
Merge branch 'main' into malt
fonsp Sep 13, 2023
82de248
trying JULIA_NUM_PRECOMPILE_TASKS=1
fonsp Sep 14, 2023
d542e4c
Revert "trying JULIA_NUM_PRECOMPILE_TASKS=1"
fonsp Sep 18, 2023
07101de
Revert "Test setting OPENBLAS_NUM_THREADS=1 on windows for Malt.Worker"
fonsp Sep 18, 2023
27307e3
Disable Malt by default
fonsp Sep 18, 2023
7b09e1d
Put back some workspace_use_distributed=false in tests
fonsp Sep 18, 2023
a37fd31
one more distributed test disable
fonsp Sep 18, 2023
fd8c68a
test Malt by default again...
fonsp Sep 18, 2023
0106663
Disable Malt by default again
fonsp Sep 18, 2023
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
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ version = "0.19.27"
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
Expand All @@ -17,6 +16,7 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
MIMEs = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
Malt = "36869731-bdee-424d-aa32-cab38c994e3b"
fonsp marked this conversation as resolved.
Show resolved Hide resolved
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Expand All @@ -38,6 +38,7 @@ HTTP = "^1.5.2"
HypertextLiteral = "0.7, 0.8, 0.9"
LoggingExtras = "0.4, 1"
MIMEs = "0.1"
Malt = "1.0.3"
MsgPack = "1.1"
PrecompileSignatures = "3"
PrecompileTools = "1"
Expand Down
5 changes: 5 additions & 0 deletions src/Configuration.jl
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ end

const RUN_NOTEBOOK_ON_LOAD_DEFAULT = true
const WORKSPACE_USE_DISTRIBUTED_DEFAULT = true
fonsp marked this conversation as resolved.
Show resolved Hide resolved
const WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT = nothing
const LAZY_WORKSPACE_CREATION_DEFAULT = false
const CAPTURE_STDOUT_DEFAULT = true
const WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT = nothing
Expand All @@ -152,13 +153,15 @@ These options are not intended to be changed during normal use.

- `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` Whether to evaluate a notebook on load.
- `workspace_use_distributed::Bool = $WORKSPACE_USE_DISTRIBUTED_DEFAULT` Whether to start notebooks in a separate process.
- `workspace_use_distributed_stdlib::Bool? = $WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT` Should we use the Distributed stdlib to run processes? Distributed will be replaced by Malt.jl, you can use this option to already get the old behaviour. `nothing` means: determine automatically (which is currently the same as `true`).
- `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
- `capture_stdout::Bool = $CAPTURE_STDOUT_DEFAULT`
- `workspace_custom_startup_expr::Union{Nothing,Expr} = $WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT` An expression to be evaluated in the workspace process before running notebook code.
"""
@option mutable struct EvaluationOptions
run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT
workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT
workspace_use_distributed_stdlib::Union{Bool,Nothing} = WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT
lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT
capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT
workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT
Expand Down Expand Up @@ -292,6 +295,7 @@ function from_flat_kwargs(;

run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT,
workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
workspace_use_distributed_stdlib::Union{Bool,Nothing} = WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT,
lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,
capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT,
workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT,
Expand Down Expand Up @@ -340,6 +344,7 @@ function from_flat_kwargs(;
evaluation = EvaluationOptions(;
run_notebook_on_load,
workspace_use_distributed,
workspace_use_distributed_stdlib,
lazy_workspace_creation,
capture_stdout,
workspace_custom_startup_expr,
Expand Down
Loading