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

Fix a couple of small errors in the setup process #281

Merged
merged 3 commits into from
Oct 11, 2024
Merged

Fix a couple of small errors in the setup process #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4886efc
Make default for `figsize` a Vector so it can be written to TOML
johnomotani Oct 11, 2024
2466dbc
Make Python venv setup more portable in machine setup scripts
johnomotani Oct 11, 2024
d8f43ed
Mention makie_post_processing.generate_example_input_file() in docs
johnomotani Oct 11, 2024
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
5 changes: 5 additions & 0 deletions docs/src/post_processing_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ julia> makie_post_process("runs/example-run1/", "runs/example-run2/", "runs/exam
What this function does is controlled by the settings in an input file, by
default `post_processing_input.toml`.

!!! note "Example input file"
You can generate an example input file, with all the options shown (with
their default values) but commented out, by running
`makie_post_processing.generate_example_input_file()`.

To run from the command line
```julia
julia --project run_makie_post_processing.jl dir1 [dir2 [dir3 ...]]
Expand Down
2 changes: 1 addition & 1 deletion machines/shared/machine_setup_stage_two.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ batch_system = mk_preferences["batch_system"]
if mk_preferences["use_plots"] == "y"
python_venv_path = joinpath(repo_dir, "machines", "artifacts", "mk_venv")
activate_path = joinpath(python_venv_path, "bin", "activate")
run(`bash -c "python -m venv --system-site-packages $python_venv_path; source $activate_path; PYTHONNOUSERSITE=1 pip install matplotlib"`)
run(`bash -c "/usr/bin/env python3 -m venv --system-site-packages $python_venv_path; source $activate_path; PYTHONNOUSERSITE=1 pip install matplotlib"`)
if batch_system
open("julia.env", "a") do io
println(io, "source $activate_path")
Expand Down
6 changes: 3 additions & 3 deletions makie_post_processing/makie_post_processing/src/makie_post_processing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ function _setup_single_input!(this_input_dict::OrderedDict{String,Any},
include_patterns=String[],
exclude_patterns=String[],
ranks=mk_int[],
figsize=(600,800)
figsize=[600,800]
)

# We allow top-level options in the post-processing input file
Expand Down Expand Up @@ -8492,7 +8492,7 @@ function timing_data(run_info::Tuple; plot_prefix=nothing, threshold=nothing,

if figsize === nothing
if input !== nothing
figsize = input.figsize
figsize = Tuple(input.figsize)
else
figsize = (600,800)
end
Expand Down Expand Up @@ -8602,7 +8602,7 @@ function timing_data(run_info; plot_prefix=nothing, threshold=nothing,

if figsize === nothing
if input !== nothing
figsize = input.figsize
figsize = Tuple(input.figsize)
else
figsize = (600,800)
end
Expand Down
Loading