From 30df310d99f191512d3f68cb9a9919a81b869f5c Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 2 Jan 2025 13:56:40 -0500 Subject: [PATCH 1/2] More reproducibility fixes Update reproducibility_tests/test_mse.jl Fix Fix hopefully last edge case --- reproducibility_tests/mse_summary.jl | 1 - .../reproducibility_tools.jl | 38 +- .../reproducibility_utils.jl | 96 ++-- reproducibility_tests/test_mse.jl | 19 +- test/unit_reproducibility_infra.jl | 489 ++++++++++++++---- 5 files changed, 478 insertions(+), 165 deletions(-) diff --git a/reproducibility_tests/mse_summary.jl b/reproducibility_tests/mse_summary.jl index a07592b675..29d0ace7b2 100644 --- a/reproducibility_tests/mse_summary.jl +++ b/reproducibility_tests/mse_summary.jl @@ -1,5 +1,4 @@ import OrderedCollections -import JSON # Get cases from JobIDs in mse_tables file: include(joinpath(@__DIR__, "reproducibility_utils.jl")) diff --git a/reproducibility_tests/reproducibility_tools.jl b/reproducibility_tests/reproducibility_tools.jl index 0ecb8844b5..76a690674c 100644 --- a/reproducibility_tests/reproducibility_tools.jl +++ b/reproducibility_tests/reproducibility_tools.jl @@ -1,7 +1,6 @@ import ClimaReproducibilityTests as CRT import ClimaCore: InputOutput, Fields import ClimaComms -import JSON include("reproducibility_utils.jl") @@ -180,7 +179,8 @@ function reproducibility_results( :no_comparable_dirs, ) - data_file_references = map(p -> joinpath(p, reference_filename), dirs) + data_file_references = + map(p -> joinpath(p, job_id, reference_filename), dirs) # foreach(x->maybe_extract(x), data_file_references) @@ -203,6 +203,11 @@ function reproducibility_results( dict_reference = dict_reference_solution, ) end + if debug_reproducibility() + println("------ end of reproducibility_results") + @show computed_mses + println("------") + end return (dirs, computed_mses, :successful_comparison) end @@ -235,7 +240,7 @@ This function returns: - exports the results from field-vector `field_vec`, and saves it into the reproducibility folder - Compares the computed results against comparable references - - Writes the dictionary of comparisons to json files in the reproducibility + - Writes the dictionary of comparisons to mse files in the reproducibility folder """ function export_reproducibility_results( @@ -275,18 +280,27 @@ function export_reproducibility_results( skip, ) + commit_shas = readdir(save_dir) for (computed_mse, dir) in zip(computed_mses, dirs) - commit_hash = basename(dirname(dir)) - computed_mse_file = - joinpath(repro_dir, "computed_mse_$commit_hash.json") + commit_hash = commit_sha_from_dir(commit_shas, dir) + computed_mse_file = joinpath(repro_dir, "computed_mse_$commit_hash.dat") open(computed_mse_file, "w") do io - JSON.print(io, computed_mse) + print(io, computed_mse) end end return (data_file_computed, computed_mses, dirs, how) end +function commit_sha_from_mse_file(file) + filename = basename(file) + if startswith(filename, "computed_mse_") && endswith(filename, ".dat") + return replace(filename, "computed_mse_" => "", ".dat" => "") + else + error("File $file does not follow correct format.") + end +end + import ClimaReproducibilityTests as CRT using Test import PrettyTables @@ -367,6 +381,11 @@ function report_reproducibility_results( for computed_mse in computed_mses all_reproducible = true + if debug_reproducibility() + println("---- in report_reproducibility_results") + @show computed_mse + println("----") + end for (var, reproducible) in CRT.test_mse(; computed_mse) if !reproducible all_reproducible = false @@ -420,8 +439,9 @@ function report_reproducibility_results( table_data = hcat(sources, summary_statuses) PrettyTables.pretty_table(io, table_data; header, crop = :none) + n_comparisons = length(computed_mses) println(io, "Summary:") - println(io, " n_comparisons = $(length(computed_mses))") + println(io, " n_comparisons = $n_comparisons") println(io, " n_times_reproducible = $n_times_reproducible") println(io, " n_times_not_reproducible = $n_times_not_reproducible") println(io, " n_passes = $n_passes") @@ -440,7 +460,7 @@ function report_reproducibility_results( elseif test_broken_report_flakiness return :not_yet_reproducible else - if n_passes ≥ n_pass_limit + if n_passes ≥ n_pass_limit || n_passes == n_comparisons return :reproducible else return :not_reproducible diff --git a/reproducibility_tests/reproducibility_utils.jl b/reproducibility_tests/reproducibility_utils.jl index 3e08beb0bc..215504cdb2 100644 --- a/reproducibility_tests/reproducibility_utils.jl +++ b/reproducibility_tests/reproducibility_utils.jl @@ -51,10 +51,9 @@ assist our understanding and reasoning, we let's assume that there are two state ## state 2: data is saved for future reference - - `commit_hash/job_id/output_dir/` - - `commit_hash/job_id/output_dir/reproducibility_bundle/` - - `commit_hash/job_id/output_dir/reproducibility_bundle/ref_counter.jl` - - `commit_hash/job_id/output_dir/reproducibility_bundle/prog_state.hdf5` + - `commit_hash/job_id/reproducibility_bundle/` + - `commit_hash/job_id/reproducibility_bundle/ref_counter.jl` + - `commit_hash/job_id/reproducibility_bundle/prog_state.hdf5` - `commit_hash/reproducibility_bundle/ref_counter.jl` - `commit_hash/reproducibility_bundle/job_id/` @@ -458,12 +457,12 @@ print_dir_tree(dir) = print_dir_tree(stdout, dir) print_dir_tree(io::IO, dir) = println(io, string_dir_tree(dir)) function string_dir_tree(dir) - s = "Files in `$dir`\n:" + s = "Files in `$dir`:\n" for (root, _, files) in walkdir(dir) for file in files f = joinpath(root, file) isfile(f) || continue # rm symlink folders (included but not files) - s *= " $f\n" + s *= " $(replace(f, dir => ""))\n" end end return s @@ -480,8 +479,7 @@ end ref_counter_PR = read_ref_counter(ref_counter_file_PR), skip = get(ENV, "BUILDKITE_PIPELINE_SLUG", nothing) != "climaatmos-ci", dest_root = "/central/scratch/esm/slurm-buildkite/climaatmos-main", - commit = get(ENV, "BUILDKITE_COMMIT", nothing), - n_hash_characters = 7, + commit = get_commit_sha(), repro_folder = "reproducibility_bundle", strip_folder = strip_output_active_path, ) @@ -519,8 +517,7 @@ function move_data_to_save_dir(; ref_counter_PR = read_ref_counter(ref_counter_file_PR), skip = get(ENV, "BUILDKITE_PIPELINE_SLUG", nothing) != "climaatmos-ci", dest_root = "/central/scratch/esm/slurm-buildkite/climaatmos-main", - commit = get(ENV, "BUILDKITE_COMMIT", nothing), - n_hash_characters = 7, + commit = get_commit_sha(), repro_folder = "reproducibility_bundle", strip_folder = strip_output_active_path, ) @@ -541,36 +538,20 @@ function move_data_to_save_dir(; dirs_src, dest_root, commit, - n_hash_characters, repro_folder, strip_folder, ) if debug_reproducibility() - @show repro_folder - @show dirs_src - @show dest_root - @show files_dest - @show files_src - @show isfile.(files_src) println("******") foreach(print_dir_tree, dirs_src) println("******") - print_dir_tree(dest_root) - println("******") end for (src, dest) in zip(files_src, files_dest) - @show src - @show dest @assert isfile(src) mkpath(dirname(dest)) mv(src, dest; force = true) end - dest_repro = destination_directory(; - dest_root, - commit, - n_hash_characters, - repro_folder, - ) + dest_repro = destination_directory(; dest_root, commit, repro_folder) ref_counter_file_main = joinpath(dest_repro, "ref_counter.jl") debug_reproducibility() && @info "Repro: moving $ref_counter_file_PR to $ref_counter_file_main" @@ -590,14 +571,40 @@ function move_data_to_save_dir(; end end +""" + get_commit_sha(; + n_hash_characters = 7, + commit = get(ENV, "BUILDKITE_COMMIT", nothing) + ) + +Returns a string of the commit hash. +""" +get_commit_sha(; + n_hash_characters = 7, + commit = get(ENV, "BUILDKITE_COMMIT", nothing), +) = return commit[1:min(n_hash_characters, length(commit))] + +function commit_sha_from_dir(commit_shas, dir) + while true + if isempty(dir) + error("Unfound commit sha.") + else + b = basename(dir) + if b in commit_shas || any(x -> occursin(b, x), commit_shas) + return b + else + dir = dirname(dir) + end + end + end +end """ save_dir_transform( src; job_id, dest_root = "/central/scratch/esm/slurm-buildkite/climaatmos-main", - commit = get(ENV, "BUILDKITE_COMMIT", nothing), - n_hash_characters = 7, + commit = get_commit_sha(), repro_folder = "reproducibility_bundle", strip_folder = strip_output_active_path, ) @@ -607,7 +614,6 @@ Returns the output file, to be saved, given: - `job_id` the job ID - `dest_root` the destination root directory - `commit` the commit hash - - `n_hash_characters` truncates the commit hash to given number of characters - `repro_folder` reproducibility folder - `strip_folder` function to strip folders in output path """ @@ -615,17 +621,11 @@ function save_dir_transform( src; job_id, dest_root = "/central/scratch/esm/slurm-buildkite/climaatmos-main", - commit = get(ENV, "BUILDKITE_COMMIT", nothing), - n_hash_characters = 7, + commit = get_commit_sha(), repro_folder = "reproducibility_bundle", strip_folder = strip_output_active_path, ) - dest_repro = destination_directory(; - dest_root, - commit, - n_hash_characters, - repro_folder, - ) + dest_repro = destination_directory(; dest_root, commit, repro_folder) src_filename = basename(src) dst = joinpath(dest_repro, job_id, src_filename) return strip_output_active_path(dst) @@ -634,8 +634,7 @@ end """ destination_directory(; dest_root = "/central/scratch/esm/slurm-buildkite/climaatmos-main", - commit = get(ENV, "BUILDKITE_COMMIT", nothing), - n_hash_characters = 7, + commit = get_commit_sha(), repro_folder = "reproducibility_bundle", ) @@ -643,17 +642,14 @@ Return the reproducibility destination directory: `root/commit_sha/repro_folder`, given: - `dest_root` the destination root directory - `commit` the commit hash - - `n_hash_characters` truncates the commit hash to given number of characters - `repro_folder` reproducibility folder """ function destination_directory(; dest_root = "/central/scratch/esm/slurm-buildkite/climaatmos-main", - commit = get(ENV, "BUILDKITE_COMMIT", nothing), - n_hash_characters = 7, + commit = get_commit_sha(), repro_folder = "reproducibility_bundle", ) - commit_sha = commit[1:min(n_hash_characters, length(commit))] - return joinpath(dest_root, commit_sha, repro_folder) + return joinpath(dest_root, commit, repro_folder) end """ @@ -683,9 +679,6 @@ function save_dir_in_out_list(; dirs_src, kwargs...) end parse_file(file) = eval(Meta.parse(join(readlines(file)))) -# parse_file(file) = parse_file_json(file) # doesn't work for some reason -parse_file_json(file) = - JSON.parsefile(file; dicttype = OrderedCollections.OrderedDict) ##### @@ -701,7 +694,7 @@ expected filename prefix `expected_filename_prefix`. """ default_is_mse_file(file, expected_filename_prefix::String = "computed_mse") = startswith(basename(file), expected_filename_prefix) && - endswith(file, ".json") + endswith(file, ".dat") """ get_computed_mses(; @@ -717,12 +710,12 @@ Returns Dict containing either a `Dict` of Dicts containing Mean-Squared-Errors given: - `job_ids` vector of job IDs - - `subfolder` sub-folder to find json files + - `subfolder` sub-folder to find mse files - `is_mse_file` a function to determine if a given file is an MSE file. See `default_is_mse_file` for the used criteria. It is expected that files exist in the form: `joinpath(job_ids[1], subfolder, -json_filename)` +mse_filename)` where `is_mse_file` is `true`. @@ -789,7 +782,6 @@ function print_skipped_jobs(io::IO = stdout; mses::AbstractDict) end import OrderedCollections -import JSON import ArgParse function reproducibility_test_params() diff --git a/reproducibility_tests/test_mse.jl b/reproducibility_tests/test_mse.jl index 7e586b2059..06ec3be6f8 100644 --- a/reproducibility_tests/test_mse.jl +++ b/reproducibility_tests/test_mse.jl @@ -12,11 +12,10 @@ include(joinpath(@__DIR__, "reproducibility_tools.jl")) debug = true repro_dir = joinpath(out_dir, "reproducibility_bundle") -computed_mse_filenames = - map(filter(default_is_mse_file, readdir(repro_dir))) do x - joinpath(repro_dir, x) - end -if isempty(computed_mse_filenames) +computed_mse_files = map(filter(default_is_mse_file, readdir(repro_dir))) do x + joinpath(repro_dir, x) +end +if isempty(computed_mse_files) @warn "No reproducibility tests performed, due to non-existent comparable data." debug && @show readdir(out_dir) debug && @show readdir(repro_dir) @@ -61,10 +60,16 @@ if isempty(computed_mse_filenames) else @testset "Reproducibility tests" begin commit_hashes = - map(x -> basename(dirname(dirname(x))), computed_mse_filenames) + map(x -> commit_sha_from_mse_file(x), computed_mse_files) + computed_mses = map(x -> parse_file(x), computed_mse_files) + if debug_reproducibility() + println("------ in test_mse.jl") + @show computed_mses + println("------") + end results = report_reproducibility_results( commit_hashes, - computed_mse_filenames; + computed_mses; test_broken_report_flakiness, ) diff --git a/test/unit_reproducibility_infra.jl b/test/unit_reproducibility_infra.jl index 5afe803d3d..e13e40145f 100644 --- a/test/unit_reproducibility_infra.jl +++ b/test/unit_reproducibility_infra.jl @@ -34,14 +34,14 @@ function make_ref_file_counter(i, dir...) return d end -function make_json( +function make_mse( i, dir...; subfolder = "output_active", - jsonfile = "computed_mse.json", + mse_file = "computed_mse.dat", ) d = mkpath(joinpath(dir..., subfolder)) - open(io -> println(io, i), joinpath(d, jsonfile), "w") + open(io -> println(io, i), joinpath(d, mse_file), "w") return d end rbundle(p) = joinpath(p, "reproducibility_bundle") @@ -445,19 +445,18 @@ end import OrderedCollections: OrderedDict -import JSON @testset "Reproducibility infrastructure: report_reproducibility_results - filename" begin make_and_cd() do dir mses1 = OrderedDict("a" => 0, "b" => 0) mses2 = OrderedDict("a" => 1, "b" => 1) mses3 = OrderedDict("a" => 0, "b" => 0) - d1 = make_json(mses1, dir, "d1") - d2 = make_json(mses2, dir, "d2") - d3 = make_json(mses3, dir, "d3") + d1 = make_mse(mses1, dir, "d1") + d2 = make_mse(mses2, dir, "d2") + d3 = make_mse(mses3, dir, "d3") paths = [d1, d2, d3] computed_mse_filenames = map(paths) do p - joinpath(p, "computed_mse.json") + joinpath(p, "computed_mse.dat") end io = IOBuffer() @test report_reproducibility_results( @@ -606,9 +605,9 @@ end mses1 = OrderedDict("a" => 1, "b" => 1) mses2 = OrderedDict("a" => 2, "b" => 2) mses3 = OrderedDict("a" => 3, "b" => 3) - d1 = make_json(mses1, dir, "d1") - d2 = make_json(mses2, dir, "d2") - d3 = make_json(mses3, dir, "d3") + d1 = make_mse(mses1, dir, "d1") + d2 = make_mse(mses2, dir, "d2") + d3 = make_mse(mses3, dir, "d3") job_ids = ["d1", "d2", "d3"] computed_mses = get_computed_mses(; @@ -639,9 +638,9 @@ end mses1 = OrderedDict("a" => 1, "b" => 1) mses2 = OrderedDict("a" => 2, "b" => 2) mses3 = OrderedDict("a" => 3, "b" => 3) - d1 = make_json(mses1, dir, "d1") - d2 = make_json(mses2, dir, "d2"; jsonfile = "comuted_mse.json") # intentional typo - d3 = make_json(mses3, dir, "d3") + d1 = make_mse(mses1, dir, "d1") + d2 = make_mse(mses2, dir, "d2"; mse_file = "comuted_mse.dat") # intentional typo + d3 = make_mse(mses3, dir, "d3") job_ids = ["d1", "d2", "d3"] computed_mses = get_computed_mses(; @@ -687,7 +686,6 @@ end make_and_cd() do dir job_id = "job_id" commit = "commit_sha" - n_hash_characters = 10 output = "output_active" strip_folder = output repro_folder = "rbundle" @@ -698,14 +696,12 @@ end dest_root = dir, job_id, commit, - n_hash_characters, repro_folder, strip_folder, ) == joinpath(dir, dst) job_id = "job_id" commit = "commit_sha" - n_hash_characters = 10 output = "output_active" strip_folder = output repro_folder = "rbundle" @@ -716,7 +712,6 @@ end dest_root = dir, job_id, commit, - n_hash_characters, repro_folder, strip_folder, ) == joinpath(dir, dst) @@ -734,6 +729,15 @@ end joinpath("a", "output_1A34", "c") end +@testset "Reproducibility infrastructure: commit_sha_from_mse_file" begin + @test_throws ErrorException commit_sha_from_mse_file( + joinpath("a", "b", "c"), + ) + @test commit_sha_from_mse_file( + joinpath("a", "b", "computed_mse_H123.dat"), + ) == "H123" +end + @testset "Reproducibility infrastructure: save_dir_in_out_list" begin mktempdir2_cd_computed() do (save_dir, computed_dir) hash1 = joinpath(save_dir, "hash1") @@ -772,7 +776,6 @@ end dirs_src = [job_id_1, job_id_2], dest_root = save_dir, commit = "commit_sha", - n_hash_characters = 10, repro_folder, strip_folder = "output_active", ) @@ -847,7 +850,6 @@ end dest_root = save_dir, buildkite_ci = true, commit = "hash_new", - n_hash_characters = length("hash_new"), branch = "unit_test_move_data_to_save_dir", in_merge_queue = true, dirs_src = [job_id_1, job_id_2], @@ -905,7 +907,6 @@ end dest_root = save_dir, buildkite_ci = true, commit = "hash_new", - n_hash_characters = length("hash_new"), branch = "unit_test_move_data_to_save_dir", in_merge_queue = true, dirs_src = [job_id_1, job_id_2], @@ -964,7 +965,6 @@ end dest_root = save_dir, buildkite_ci = true, commit = "hash_new", - n_hash_characters = length("hash_new"), branch = "unit_test_move_data_to_save_dir", in_merge_queue = true, dirs_src = [job_id_1, job_id_2], @@ -982,6 +982,41 @@ end @test isfile(joinpath(repro_dir, "ref_counter.jl")) end end +@testset "Reproducibility infrastructure: commit_sha_from_dir" begin + @test commit_sha_from_dir( + ["CH1", "CH2", "CH3"], + joinpath("a", "b", "c", "CH1", "e", "f"), + ) == "CH1" + @test commit_sha_from_dir( + ["CH1", "CH2", "CH3"], + joinpath("a", "b", "c", "CH2", "e", "f"), + ) == "CH2" + @test commit_sha_from_dir( + ["CH1", "CH2", "CH3"], + joinpath("a", "b", "c", "e", "f", "CH2"), + ) == "CH2" + @test commit_sha_from_dir( + ["CH1", "CH2", "CH3"], + joinpath("CH2", "a", "b", "c", "e", "f"), + ) == "CH2" + + @test commit_sha_from_dir( + ["CH1_xyz", "CH2_xyz", "CH3_xyz"], + joinpath("a", "b", "c", "CH1", "e", "f"), + ) == "CH1" + @test commit_sha_from_dir( + ["CH1_xyz", "CH2_xyz", "CH3_xyz"], + joinpath("a", "b", "c", "CH2", "e", "f"), + ) == "CH2" + @test commit_sha_from_dir( + ["CH1_xyz", "CH2_xyz", "CH3_xyz"], + joinpath("a", "b", "c", "e", "f", "CH2"), + ) == "CH2" + @test commit_sha_from_dir( + ["CH1_xyz", "CH2_xyz", "CH3_xyz"], + joinpath("CH2", "a", "b", "c", "e", "f"), + ) == "CH2" +end using ClimaComms using ClimaCore: Spaces, Fields, Grids, InputOutput @@ -1019,8 +1054,18 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" end end + # ## state 1: end of simulation, folder structure + # - `job_id/output_dir/` + # - `job_id/output_dir/reproducibility_bundle/` + # - `job_id/output_dir/reproducibility_bundle/ref_counter.jl` + # - `job_id/output_dir/reproducibility_bundle/prog_state.hdf5` + # ## state 2: data is saved for future reference + # - `commit_hash/job_id/reproducibility_bundle/` + # - `commit_hash/job_id/reproducibility_bundle/ref_counter.jl` + # - `commit_hash/job_id/reproducibility_bundle/prog_state.hdf5` + @testset "Reproducibility infrastructure: reproducibility_results - legacy folder structure" begin - make_and_cd() do dir + mktempdir2_cd_computed() do (save_dir, computed_dir) grid = ExtrudedCubedSphereGrid(; z_elem = 5, z_min = 0, @@ -1033,19 +1078,25 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" Spaces.ExtrudedFiniteDifferenceSpace(grid, Grids.CellCenter()) comms_ctx = ClimaComms.context(space) + # Folder structure: + job_id = "unit_test" + rfolder = "rbundle" + output = "output_active" + repro_dir = joinpath(computed_dir, job_id, output, rfolder) + mkpath(repro_dir) + fv = Fields.FieldVector(; x = ones(space), y = ones(space)) - file = joinpath(dir, "my_prog_state.hdf5") + file = joinpath(repro_dir, "my_prog_state.hdf5") hdfwriter = InputOutput.HDF5Writer(file, comms_ctx) InputOutput.write!(hdfwriter, fv, "Y") Base.close(hdfwriter) # Not on buildkite - job_id = "unit_test" (d, v, how) = reproducibility_results( comms_ctx; job_id, name = "Y", - save_dir = dir, + save_dir = save_dir, ref_counter_PR = 1, reference_filename = "my_prog_state.hdf5", data_file_computed = file, @@ -1066,7 +1117,7 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" comms_ctx; job_id, name = "Y", - save_dir = dir, + save_dir = save_dir, reference_filename = "my_prog_state.hdf5", ref_counter_PR = 1, data_file_computed = file, @@ -1083,26 +1134,111 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" # Successful comparison - d01 = make_ref_file_counter(1, dir, "01") - d02 = make_ref_file_counter(2, dir, "02") - d03 = make_ref_file_counter(3, dir, "03") - d04 = make_ref_file_counter(3, dir, "04") - d05 = make_ref_file_counter(3, dir, "05") - - put_data_file(d01, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d02, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d03, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d04, fv, comms_ctx; filename = "ref_prog_state.hdf5") + commit_sha_01 = "commit_hash_01" + commit_sha_02 = "commit_hash_02" + commit_sha_03 = "commit_hash_03" + commit_sha_04 = "commit_hash_04" + commit_sha_05 = "commit_hash_05" + d01 = make_ref_file_counter(1, save_dir, commit_sha_01, rfolder) + d02 = make_ref_file_counter(2, save_dir, commit_sha_02, rfolder) + d03 = make_ref_file_counter(3, save_dir, commit_sha_03, rfolder) + d04 = make_ref_file_counter(3, save_dir, commit_sha_04, rfolder) + d05 = make_ref_file_counter(3, save_dir, commit_sha_05, rfolder) + + put_data_file( + joinpath(d01, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d02, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d03, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d04, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) fv.x .= 200 fv.y .= 300 - put_data_file(d05, fv, comms_ctx; filename = "ref_prog_state.hdf5") + put_data_file( + joinpath(d05, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + + # Test folder structure + @test isfile( + joinpath( + computed_dir, + job_id, + output, + rfolder, + "my_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_01, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_02, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_03, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_04, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_05, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) - job_id = "unit_test" (d, v, how) = reproducibility_results( comms_ctx; job_id, name = "Y", - save_dir = dir, + save_dir = save_dir, ref_counter_PR = 3, reference_filename = "ref_prog_state.hdf5", data_file_computed = file, @@ -1138,18 +1274,21 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" comms_ctx = ClimaComms.context(space) fv = Fields.FieldVector(; x = ones(space), y = ones(space)) - file = joinpath( - computed_dir, - "reproducibility_bundle", - "computed_prog_state.hdf5", - ) - mkpath(dirname(file)) + + # Folder structure: + job_id = "unit_test" + rfolder = "rbundle" + output = "output_active" + repro_dir = joinpath(computed_dir, job_id, output, rfolder) + mkpath(repro_dir) + + file = joinpath(repro_dir, "computed_prog_state.hdf5") + mkpath(repro_dir) hdfwriter = InputOutput.HDF5Writer(file, comms_ctx) InputOutput.write!(hdfwriter, fv, "Y") Base.close(hdfwriter) # Not on buildkite - job_id = "unit_test" (d, v, how) = reproducibility_results( comms_ctx; job_id, @@ -1170,7 +1309,6 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" @test how == :skipped # Empty comparable dirs - job_id = "unit_test" (d, v, how) = reproducibility_results( comms_ctx; job_id, @@ -1192,19 +1330,49 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" # Successful comparison - d01 = make_ref_file_counter(1, save_dir, rbundle("01")) - d02 = make_ref_file_counter(2, save_dir, rbundle("02")) - d03 = make_ref_file_counter(3, save_dir, rbundle("03")) - d04 = make_ref_file_counter(3, save_dir, rbundle("04")) - d05 = make_ref_file_counter(3, save_dir, rbundle("05")) - - put_data_file(d01, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d02, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d03, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d04, fv, comms_ctx; filename = "ref_prog_state.hdf5") + commit_sha_01 = "commit_hash_01" + commit_sha_02 = "commit_hash_02" + commit_sha_03 = "commit_hash_03" + commit_sha_04 = "commit_hash_04" + commit_sha_05 = "commit_hash_05" + d01 = make_ref_file_counter(1, save_dir, commit_sha_01, rfolder) + d02 = make_ref_file_counter(2, save_dir, commit_sha_02, rfolder) + d03 = make_ref_file_counter(3, save_dir, commit_sha_03, rfolder) + d04 = make_ref_file_counter(3, save_dir, commit_sha_04, rfolder) + d05 = make_ref_file_counter(3, save_dir, commit_sha_05, rfolder) + + put_data_file( + joinpath(d01, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d02, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d03, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d04, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) fv.x .= 200 fv.y .= 300 - put_data_file(d05, fv, comms_ctx; filename = "ref_prog_state.hdf5") + put_data_file( + joinpath(d05, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) job_id = "unit_test" (d, v, how) = reproducibility_results( @@ -1229,6 +1397,62 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" @test d == [d05, d04, d03] @test how == :successful_comparison + + # Test folder structure + @test isfile( + joinpath( + computed_dir, + job_id, + output, + rfolder, + "computed_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_01, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_02, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_03, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_04, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) + @test isfile( + joinpath( + save_dir, + commit_sha_05, + rfolder, + job_id, + "ref_prog_state.hdf5", + ), + ) end end @@ -1246,7 +1470,12 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" Spaces.ExtrudedFiniteDifferenceSpace(grid, Grids.CellCenter()) comms_ctx = ClimaComms.context(space) + # Folder structure: job_id = "unit_test_export_reproducibility_results" + rfolder = "rbundle" + output = "output_active" + repro_dir = joinpath(computed_dir, job_id, output, rfolder) + mkpath(repro_dir) fv = Fields.FieldVector(; x = ones(space), y = ones(space)) @@ -1283,25 +1512,55 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" @test isempty(dirs) # Successful comparisons, legacy path configuration - d01 = make_ref_file_counter(1, save_dir, "01") - d02 = make_ref_file_counter(2, save_dir, "02") - d03 = make_ref_file_counter(3, save_dir, "03") - d04 = make_ref_file_counter(3, save_dir, "04") - d05 = make_ref_file_counter(3, save_dir, "05") - - put_data_file(d01, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d02, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d03, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d04, fv, comms_ctx; filename = "ref_prog_state.hdf5") + commit_sha_01 = "commit_hash_01" + commit_sha_02 = "commit_hash_02" + commit_sha_03 = "commit_hash_03" + commit_sha_04 = "commit_hash_04" + commit_sha_05 = "commit_hash_05" + d01 = make_ref_file_counter(1, save_dir, commit_sha_01) + d02 = make_ref_file_counter(2, save_dir, commit_sha_02) + d03 = make_ref_file_counter(3, save_dir, commit_sha_03) + d04 = make_ref_file_counter(3, save_dir, commit_sha_04) + d05 = make_ref_file_counter(3, save_dir, commit_sha_05) + + put_data_file( + joinpath(d01, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d02, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d03, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d04, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) fv.x .= 200 fv.y .= 300 - put_data_file(d05, fv, comms_ctx; filename = "ref_prog_state.hdf5") + put_data_file( + joinpath(d05, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) - @test isfile(joinpath(d01, "ref_prog_state.hdf5")) - @test isfile(joinpath(d02, "ref_prog_state.hdf5")) - @test isfile(joinpath(d03, "ref_prog_state.hdf5")) - @test isfile(joinpath(d04, "ref_prog_state.hdf5")) - @test isfile(joinpath(d05, "ref_prog_state.hdf5")) + @test isfile(joinpath(d01, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d02, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d03, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d04, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d05, job_id, "ref_prog_state.hdf5")) @test isfile(joinpath(d01, "ref_counter.jl")) @test isfile(joinpath(d02, "ref_counter.jl")) @test isfile(joinpath(d03, "ref_counter.jl")) @@ -1341,7 +1600,12 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" Spaces.ExtrudedFiniteDifferenceSpace(grid, Grids.CellCenter()) comms_ctx = ClimaComms.context(space) + # Folder structure: job_id = "unit_test_export_reproducibility_results" + rfolder = "rbundle" + output = "output_active" + repro_dir = joinpath(computed_dir, job_id, output, rfolder) + mkpath(repro_dir) fv = Fields.FieldVector(; x = ones(space), y = ones(space)) @@ -1359,6 +1623,7 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" n = 10, ref_counter_PR = 1, skip = true, + repro_folder = rfolder, ) @test how == :skipped @test isempty(dirs) @@ -1377,30 +1642,61 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" n = 10, ref_counter_PR = 1, skip = false, + repro_folder = rfolder, ) @test how == :no_comparable_dirs @test isempty(dirs) - # Successful comparisons, legacy path configuration - d01 = make_ref_file_counter(1, save_dir, rbundle("CH01")) - d02 = make_ref_file_counter(2, save_dir, rbundle("CH02")) - d03 = make_ref_file_counter(3, save_dir, rbundle("CH03")) - d04 = make_ref_file_counter(3, save_dir, rbundle("CH04")) - d05 = make_ref_file_counter(3, save_dir, rbundle("CH05")) - - put_data_file(d01, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d02, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d03, fv, comms_ctx; filename = "ref_prog_state.hdf5") - put_data_file(d04, fv, comms_ctx; filename = "ref_prog_state.hdf5") + # Successful comparisons, legacy path configuration (no repro folder) + commit_sha_01 = "sha_01" + commit_sha_02 = "sha_02" + commit_sha_03 = "sha_03" + commit_sha_04 = "sha_04" + commit_sha_05 = "sha_05" + d01 = make_ref_file_counter(1, save_dir, commit_sha_01) + d02 = make_ref_file_counter(2, save_dir, commit_sha_02) + d03 = make_ref_file_counter(3, save_dir, commit_sha_03) + d04 = make_ref_file_counter(3, save_dir, commit_sha_04) + d05 = make_ref_file_counter(3, save_dir, commit_sha_05) + + put_data_file( + joinpath(d01, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d02, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d03, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) + put_data_file( + joinpath(d04, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) fv.x .= 200 fv.y .= 300 - put_data_file(d05, fv, comms_ctx; filename = "ref_prog_state.hdf5") + put_data_file( + joinpath(d05, job_id), + fv, + comms_ctx; + filename = "ref_prog_state.hdf5", + ) - @test isfile(joinpath(d01, "ref_prog_state.hdf5")) - @test isfile(joinpath(d02, "ref_prog_state.hdf5")) - @test isfile(joinpath(d03, "ref_prog_state.hdf5")) - @test isfile(joinpath(d04, "ref_prog_state.hdf5")) - @test isfile(joinpath(d05, "ref_prog_state.hdf5")) + @test isfile(joinpath(d01, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d02, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d03, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d04, job_id, "ref_prog_state.hdf5")) + @test isfile(joinpath(d05, job_id, "ref_prog_state.hdf5")) @test isfile(joinpath(d01, "ref_counter.jl")) @test isfile(joinpath(d02, "ref_counter.jl")) @test isfile(joinpath(d03, "ref_counter.jl")) @@ -1420,14 +1716,15 @@ if pkgversion(ClimaCore) ≥ v"0.14.18" n = 10, ref_counter_PR = 3, skip = false, + repro_folder = rfolder, ) @test how == :successful_comparison @test dirs == [d05, d04, d03] - repro_dir = joinpath(computed_dir, "reproducibility_bundle") + repro_dir = joinpath(computed_dir, rfolder) @test isfile(joinpath(repro_dir, "computed_prog_state.hdf5")) - @test isfile(joinpath(repro_dir, "computed_mse_CH05.json")) - @test isfile(joinpath(repro_dir, "computed_mse_CH04.json")) - @test isfile(joinpath(repro_dir, "computed_mse_CH03.json")) + @test isfile(joinpath(repro_dir, "computed_mse_$commit_sha_05.dat")) + @test isfile(joinpath(repro_dir, "computed_mse_$commit_sha_04.dat")) + @test isfile(joinpath(repro_dir, "computed_mse_$commit_sha_03.dat")) end end end From c75520b2f5aa7c485e06a040deeed891a91e1ea5 Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Fri, 3 Jan 2025 10:54:45 -0500 Subject: [PATCH 2/2] Update dependencies --- docs/Manifest.toml | 118 +++++++++++++++++++------------------- examples/Manifest.toml | 126 ++++++++++++++++++++--------------------- perf/Manifest.toml | 118 +++++++++++++++++++------------------- 3 files changed, 181 insertions(+), 181 deletions(-) diff --git a/docs/Manifest.toml b/docs/Manifest.toml index 98230bdef7..6dab032418 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -240,13 +240,13 @@ weakdeps = ["BandedMatrices"] deps = ["Artifacts", "JLLWrappers", "Libdl", "Lz4_jll", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "ef12cdd1c7fb7e1dfd6fa8fd60d4db6bc61d2f23" uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" -version = "1.21.6+0" +version = "1.21.6+2" [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "8873e196c2eb87962a2048b3b8e08946535864a1" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.8+2" +version = "1.0.8+4" [[deps.CEnum]] git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc" @@ -300,9 +300,9 @@ version = "1.18.2+1" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] -git-tree-sha1 = "3e4b134270b372f2ed4d4d0e936aabaefc1802bc" +git-tree-sha1 = "1713c74e00545bfe14605d2a2be1712de8fbcb58" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.25.0" +version = "1.25.1" weakdeps = ["SparseArrays"] [deps.ChainRulesCore.extensions] @@ -701,7 +701,7 @@ version = "2.2.5" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "e51db81749b0777b2147fbe7b783ee79045b8e99" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" -version = "2.6.4+1" +version = "2.6.4+3" [[deps.ExprTools]] git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec" @@ -735,7 +735,7 @@ version = "1.8.0" deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "4d81ed14783ec49ce9f2e168208a12ce1815aa25" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.10+1" +version = "3.3.10+3" [[deps.FastBroadcast]] deps = ["ArrayInterface", "LinearAlgebra", "Polyester", "Static", "StaticArrayInterface", "StrideArraysCore"] @@ -928,9 +928,9 @@ version = "0.21.0+0" [[deps.Giflib_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "0224cce99284d997f6880a42ef715a37c99338d1" +git-tree-sha1 = "6570366d757b50fabae9f4315ad74d2e40c0560a" uuid = "59f7168a-df46-5410-90c8-f2779963d0ec" -version = "5.2.2+0" +version = "5.2.3+0" [[deps.GilbertCurves]] git-tree-sha1 = "3e076ca96e34a47e98a46657b2bec2655a366d80" @@ -1012,7 +1012,7 @@ version = "8.5.0+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "50aedf345a709ab75872f80a2779568dc0bb461b" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.11.2+1" +version = "2.11.2+3" [[deps.HypergeometricFunctions]] deps = ["LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] @@ -1157,9 +1157,9 @@ version = "1.0.0" [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] -git-tree-sha1 = "be3dc50a92e5a386872a493a10050136d4703f9b" +git-tree-sha1 = "a007feb38b422fbdab534406aeca1b86823cb4d6" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.6.1" +version = "1.7.0" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] @@ -1193,9 +1193,9 @@ version = "0.1.5" [[deps.JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "ef10afc9f4b942bcd75f4c3bc9d9e8d802944c23" +git-tree-sha1 = "eac1206917768cb54957c65a615460d87b455fc1" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" -version = "3.1.0+0" +version = "3.1.1+0" [[deps.JuliaNVTXCallbacks_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -1245,9 +1245,9 @@ version = "3.100.2+0" [[deps.LERC_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "4ec1e8fac04150b570e315baaa68950e368a803d" +git-tree-sha1 = "aaafe88dccbd957a8d82f7d05be9b69172e0cee3" uuid = "88015f11-f218-50d7-93a8-a6af411a945d" -version = "4.0.0+1" +version = "4.0.1+0" [[deps.LLVMOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1268,7 +1268,7 @@ weakdeps = ["Serialization"] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "854a9c268c43b77b0a27f22d7fab8d33cdb3a731" uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" -version = "2.10.2+1" +version = "2.10.2+3" [[deps.LaTeXStrings]] git-tree-sha1 = "dda21b8cbd6a6c40d9d02a73230f9d70fed6918c" @@ -1342,9 +1342,9 @@ version = "1.7.0+0" [[deps.Libgpg_error_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "a7f43994b47130e4f491c3b2dbe78fe9e2aed2b3" +git-tree-sha1 = "df37206100d39f79b3376afb6b9cee4970041c61" uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" -version = "1.51.0+0" +version = "1.51.1+0" [[deps.Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1356,19 +1356,19 @@ version = "1.17.0+1" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "84eef7acd508ee5b3e956a2ae51b05024181dee0" uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" -version = "2.40.2+0" +version = "2.40.2+2" [[deps.Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "b404131d06f7886402758c9ce2214b636eb4d54a" +git-tree-sha1 = "4ab7581296671007fc33f07a721631b8855f4b1d" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.7.0+0" +version = "4.7.1+0" [[deps.Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "edbf5309f9ddf1cab25afc344b1e8150b7c832f9" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" -version = "2.40.2+0" +version = "2.40.2+2" [[deps.LinearAlgebra]] deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"] @@ -1411,9 +1411,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[deps.Lz4_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "abf88ff67f4fd89839efcae2f4c39cbc4ecd0846" +git-tree-sha1 = "191686b1ac1ea9c89fc52e996ad15d1d241d1e33" uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" -version = "1.10.0+1" +version = "1.10.1+0" [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] @@ -1442,7 +1442,7 @@ version = "0.1.11" deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] git-tree-sha1 = "70e830dab5d0775183c99fc75e4c24c614ed7142" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.5.1+0" +version = "5.5.1+2" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1627,13 +1627,13 @@ version = "5.0.6+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "7493f61f55a6cce7325f197443aa80d32554ba10" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.15+1" +version = "3.0.15+3" [[deps.OpenSpecFun_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] +git-tree-sha1 = "1346c9208249809840c91b26703912dff463d335" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.5+0" +version = "0.5.6+0" [[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1942,9 +1942,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "fd0794f59136050f4734f7af7818fec2f82bdcfc" +git-tree-sha1 = "3e5a9c5d6432b77a271646b4ada2573f239ac5c4" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.69.0" +version = "2.70.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2091,9 +2091,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "7c01731da8ab6d3094c4d44c9057b00932459255" +git-tree-sha1 = "47091a0340a675c738b1304b58161f3b0839d454" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.9" +version = "1.9.10" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2325,9 +2325,9 @@ version = "0.4.1" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "01915bfcd62be15329c9a07235447a89d588327c" +git-tree-sha1 = "c0667a8e676c53d390a09dc6870b3d8d6650e2bf" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.21.1" +version = "1.22.0" weakdeps = ["ConstructionBase", "InverseFunctions"] [deps.Unitful.extensions] @@ -2392,33 +2392,33 @@ version = "1.1.42+0" [[deps.XZ_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "15e637a697345f6743674f1322beefbc5dcd5cfc" +git-tree-sha1 = "beef98d5aad604d9e7d60b2ece5181f7888e2fd6" uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800" -version = "5.6.3+0" +version = "5.6.4+0" [[deps.Xorg_libX11_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] git-tree-sha1 = "9dafcee1d24c4f024e7edc92603cedba72118283" uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" -version = "1.8.6+1" +version = "1.8.6+3" [[deps.Xorg_libXau_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "2b0e27d52ec9d8d483e2ca0b72b3cb1a8df5c27a" uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" -version = "1.0.11+1" +version = "1.0.11+3" [[deps.Xorg_libXdmcp_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "02054ee01980c90297412e4c809c8694d7323af3" uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" -version = "1.1.4+1" +version = "1.1.4+3" [[deps.Xorg_libXext_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] git-tree-sha1 = "d7155fea91a4123ef59f42c4afb5ab3b4ca95058" uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" -version = "1.3.6+1" +version = "1.3.6+3" [[deps.Xorg_libXrender_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] @@ -2430,19 +2430,19 @@ version = "0.9.11+1" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "fee57a273563e273f0f53275101cd41a8153517a" uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74" -version = "0.1.1+1" +version = "0.1.1+3" [[deps.Xorg_libxcb_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] git-tree-sha1 = "1a74296303b6524a0472a8cb12d3d87a78eb3612" uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" -version = "1.17.0+1" +version = "1.17.0+3" [[deps.Xorg_xtrans_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "b9ead2d2bdb27330545eb14234a2e300da61232e" uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" -version = "1.5.0+1" +version = "1.5.0+3" [[deps.YAML]] deps = ["Base64", "Dates", "Printf", "StringEncodings"] @@ -2457,9 +2457,9 @@ version = "1.2.13+1" [[deps.Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "555d1076590a6cc2fdee2ef1469451f872d8b41b" +git-tree-sha1 = "622cf78670d067c738667aaa96c553430b65e269" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.5.6+1" +version = "1.5.7+0" [[deps.isoband_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -2471,13 +2471,13 @@ version = "0.2.3+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "46bf7be2917b59b761247be3f317ddf75e50e997" uuid = "477f73a3-ac25-53e9-8cc3-50b2fa2566f0" -version = "1.1.2+0" +version = "1.1.2+2" [[deps.libaom_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "1827acba325fdcdf1d2647fc8d5301dd9ba43a9d" +git-tree-sha1 = "522c1df09d05a71785765d19c9524661234738e9" uuid = "a4ae2306-e953-59d6-aa16-d00cac43593b" -version = "3.9.0+0" +version = "3.11.0+0" [[deps.libass_jll]] deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Zlib_jll"] @@ -2498,15 +2498,15 @@ version = "2.0.3+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "b70c870239dc3d7bc094eb2d6be9b73d27bef280" +git-tree-sha1 = "b7bfd3ab9d2c58c3829684142f5804e4c6499abc" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.44+0" +version = "1.6.45+0" [[deps.libsixel_jll]] -deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "libpng_jll"] -git-tree-sha1 = "7dfa0fd9c783d3d0cc43ea1af53d69ba45c447df" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"] +git-tree-sha1 = "1e53ffe8941ee486739f3c0cf11208c26637becd" uuid = "075b6546-f08a-558a-be8f-8157d0f608a5" -version = "1.10.3+1" +version = "1.10.4+0" [[deps.libvorbis_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] @@ -2516,15 +2516,15 @@ version = "1.3.7+2" [[deps.libwebp_jll]] deps = ["Artifacts", "Giflib_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libglvnd_jll", "Libtiff_jll", "libpng_jll"] -git-tree-sha1 = "ccbb625a89ec6195856a50aa2b668a5c08712c94" +git-tree-sha1 = "d2408cac540942921e7bd77272c32e58c33d8a77" uuid = "c5f90fcd-3b7e-5836-afba-fc50a0988cb2" -version = "1.4.0+0" +version = "1.5.0+0" [[deps.libzip_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "OpenSSL_jll", "XZ_jll", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "e797fa066eba69f4c0585ffbd81bc780b5118ce2" uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" -version = "1.11.2+0" +version = "1.11.2+2" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] @@ -2544,9 +2544,9 @@ version = "17.4.0+2" [[deps.x264_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "35976a1216d6c066ea32cba2150c4fa682b276fc" +git-tree-sha1 = "14cc7083fc6dff3cc44f2bc435ee96d06ed79aa7" uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a" -version = "10164.0.0+0" +version = "10164.0.1+0" [[deps.x265_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] diff --git a/examples/Manifest.toml b/examples/Manifest.toml index af60fddffe..8ca994022f 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -223,13 +223,13 @@ weakdeps = ["BandedMatrices"] deps = ["Artifacts", "JLLWrappers", "Libdl", "Lz4_jll", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "ef12cdd1c7fb7e1dfd6fa8fd60d4db6bc61d2f23" uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" -version = "1.21.6+0" +version = "1.21.6+2" [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "8873e196c2eb87962a2048b3b8e08946535864a1" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.8+2" +version = "1.0.8+4" [[deps.CEnum]] git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc" @@ -313,9 +313,9 @@ version = "1.18.2+1" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] -git-tree-sha1 = "3e4b134270b372f2ed4d4d0e936aabaefc1802bc" +git-tree-sha1 = "1713c74e00545bfe14605d2a2be1712de8fbcb58" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.25.0" +version = "1.25.1" weakdeps = ["SparseArrays"] [deps.ChainRulesCore.extensions] @@ -406,9 +406,9 @@ version = "0.10.18" [[deps.ClimaReproducibilityTests]] deps = ["OrderedCollections", "PrettyTables"] -git-tree-sha1 = "9dd1b7c4d0310115f1cd7bcfb0e2836a3f94f69f" +git-tree-sha1 = "122ee2d27e225684221b18b5dbb609c7ac59e077" uuid = "e0c89595-00ba-42a9-9f9b-061ef3dc23a1" -version = "0.1.0" +version = "0.1.1" [[deps.ClimaTimeSteppers]] deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] @@ -751,7 +751,7 @@ version = "2.2.5" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "e51db81749b0777b2147fbe7b783ee79045b8e99" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" -version = "2.6.4+1" +version = "2.6.4+3" [[deps.ExprTools]] git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec" @@ -785,7 +785,7 @@ version = "1.8.0" deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "4d81ed14783ec49ce9f2e168208a12ce1815aa25" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.10+1" +version = "3.3.10+3" [[deps.FastBroadcast]] deps = ["ArrayInterface", "LinearAlgebra", "Polyester", "Static", "StaticArrayInterface", "StrideArraysCore"] @@ -990,9 +990,9 @@ version = "0.21.0+0" [[deps.Giflib_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "0224cce99284d997f6880a42ef715a37c99338d1" +git-tree-sha1 = "6570366d757b50fabae9f4315ad74d2e40c0560a" uuid = "59f7168a-df46-5410-90c8-f2779963d0ec" -version = "5.2.2+0" +version = "5.2.3+0" [[deps.GilbertCurves]] git-tree-sha1 = "3e076ca96e34a47e98a46657b2bec2655a366d80" @@ -1065,7 +1065,7 @@ version = "8.5.0+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "50aedf345a709ab75872f80a2779568dc0bb461b" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.11.2+1" +version = "2.11.2+3" [[deps.HypergeometricFunctions]] deps = ["LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] @@ -1242,9 +1242,9 @@ version = "0.5.10" [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] -git-tree-sha1 = "be3dc50a92e5a386872a493a10050136d4703f9b" +git-tree-sha1 = "a007feb38b422fbdab534406aeca1b86823cb4d6" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.6.1" +version = "1.7.0" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] @@ -1260,9 +1260,9 @@ version = "0.1.5" [[deps.JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "ef10afc9f4b942bcd75f4c3bc9d9e8d802944c23" +git-tree-sha1 = "eac1206917768cb54957c65a615460d87b455fc1" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" -version = "3.1.0+0" +version = "3.1.1+0" [[deps.JuliaInterpreter]] deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"] @@ -1318,9 +1318,9 @@ version = "3.100.2+0" [[deps.LERC_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "4ec1e8fac04150b570e315baaa68950e368a803d" +git-tree-sha1 = "aaafe88dccbd957a8d82f7d05be9b69172e0cee3" uuid = "88015f11-f218-50d7-93a8-a6af411a945d" -version = "4.0.0+1" +version = "4.0.1+0" [[deps.LLVM]] deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Preferences", "Printf", "Unicode"] @@ -1362,7 +1362,7 @@ weakdeps = ["Serialization"] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "854a9c268c43b77b0a27f22d7fab8d33cdb3a731" uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" -version = "2.10.2+1" +version = "2.10.2+3" [[deps.LaTeXStrings]] git-tree-sha1 = "dda21b8cbd6a6c40d9d02a73230f9d70fed6918c" @@ -1431,9 +1431,9 @@ version = "1.7.0+0" [[deps.Libgpg_error_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "a7f43994b47130e4f491c3b2dbe78fe9e2aed2b3" +git-tree-sha1 = "df37206100d39f79b3376afb6b9cee4970041c61" uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" -version = "1.51.0+0" +version = "1.51.1+0" [[deps.Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1445,19 +1445,19 @@ version = "1.17.0+1" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "84eef7acd508ee5b3e956a2ae51b05024181dee0" uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" -version = "2.40.2+0" +version = "2.40.2+2" [[deps.Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "b404131d06f7886402758c9ce2214b636eb4d54a" +git-tree-sha1 = "4ab7581296671007fc33f07a721631b8855f4b1d" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.7.0+0" +version = "4.7.1+0" [[deps.Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "edbf5309f9ddf1cab25afc344b1e8150b7c832f9" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" -version = "2.40.2+0" +version = "2.40.2+2" [[deps.LightXML]] deps = ["Libdl", "XML2_jll"] @@ -1518,9 +1518,9 @@ version = "3.1.0" [[deps.Lz4_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "abf88ff67f4fd89839efcae2f4c39cbc4ecd0846" +git-tree-sha1 = "191686b1ac1ea9c89fc52e996ad15d1d241d1e33" uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" -version = "1.10.0+1" +version = "1.10.1+0" [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] @@ -1563,7 +1563,7 @@ version = "0.1.11" deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] git-tree-sha1 = "70e830dab5d0775183c99fc75e4c24c614ed7142" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.5.1+0" +version = "5.5.1+2" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1673,9 +1673,9 @@ version = "1.0.2" [[deps.NaNStatistics]] deps = ["PrecompileTools", "Static", "StaticArrayInterface"] -git-tree-sha1 = "f2a685149d4e7d62865babd606092f8e89a6d8f8" +git-tree-sha1 = "1529c48f8c63a815c985890e0192b006b06de528" uuid = "b946abbf-3ea7-4610-9019-9858bfdeaf2d" -version = "0.6.43" +version = "0.6.45" [[deps.NetCDF_jll]] deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] @@ -1757,13 +1757,13 @@ version = "5.0.6+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "7493f61f55a6cce7325f197443aa80d32554ba10" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.15+1" +version = "3.0.15+3" [[deps.OpenSpecFun_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] +git-tree-sha1 = "1346c9208249809840c91b26703912dff463d335" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.5+0" +version = "0.5.6+0" [[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -2103,9 +2103,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "fd0794f59136050f4734f7af7818fec2f82bdcfc" +git-tree-sha1 = "3e5a9c5d6432b77a271646b4ada2573f239ac5c4" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.69.0" +version = "2.70.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2258,9 +2258,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "7c01731da8ab6d3094c4d44c9057b00932459255" +git-tree-sha1 = "47091a0340a675c738b1304b58161f3b0839d454" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.9" +version = "1.9.10" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2474,9 +2474,9 @@ version = "0.4.1" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "01915bfcd62be15329c9a07235447a89d588327c" +git-tree-sha1 = "c0667a8e676c53d390a09dc6870b3d8d6650e2bf" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.21.1" +version = "1.22.0" weakdeps = ["ConstructionBase", "InverseFunctions"] [deps.Unitful.extensions] @@ -2550,33 +2550,33 @@ version = "1.1.42+0" [[deps.XZ_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "15e637a697345f6743674f1322beefbc5dcd5cfc" +git-tree-sha1 = "beef98d5aad604d9e7d60b2ece5181f7888e2fd6" uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800" -version = "5.6.3+0" +version = "5.6.4+0" [[deps.Xorg_libX11_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] git-tree-sha1 = "9dafcee1d24c4f024e7edc92603cedba72118283" uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" -version = "1.8.6+1" +version = "1.8.6+3" [[deps.Xorg_libXau_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "2b0e27d52ec9d8d483e2ca0b72b3cb1a8df5c27a" uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" -version = "1.0.11+1" +version = "1.0.11+3" [[deps.Xorg_libXdmcp_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "02054ee01980c90297412e4c809c8694d7323af3" uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" -version = "1.1.4+1" +version = "1.1.4+3" [[deps.Xorg_libXext_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] git-tree-sha1 = "d7155fea91a4123ef59f42c4afb5ab3b4ca95058" uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" -version = "1.3.6+1" +version = "1.3.6+3" [[deps.Xorg_libXrender_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] @@ -2588,19 +2588,19 @@ version = "0.9.11+1" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "fee57a273563e273f0f53275101cd41a8153517a" uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74" -version = "0.1.1+1" +version = "0.1.1+3" [[deps.Xorg_libxcb_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] git-tree-sha1 = "1a74296303b6524a0472a8cb12d3d87a78eb3612" uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" -version = "1.17.0+1" +version = "1.17.0+3" [[deps.Xorg_xtrans_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "b9ead2d2bdb27330545eb14234a2e300da61232e" uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" -version = "1.5.0+1" +version = "1.5.0+3" [[deps.YAML]] deps = ["Base64", "Dates", "Printf", "StringEncodings"] @@ -2615,9 +2615,9 @@ version = "1.2.13+1" [[deps.Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "555d1076590a6cc2fdee2ef1469451f872d8b41b" +git-tree-sha1 = "622cf78670d067c738667aaa96c553430b65e269" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.5.6+1" +version = "1.5.7+0" [[deps.demumble_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -2635,13 +2635,13 @@ version = "0.2.3+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "46bf7be2917b59b761247be3f317ddf75e50e997" uuid = "477f73a3-ac25-53e9-8cc3-50b2fa2566f0" -version = "1.1.2+0" +version = "1.1.2+2" [[deps.libaom_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "1827acba325fdcdf1d2647fc8d5301dd9ba43a9d" +git-tree-sha1 = "522c1df09d05a71785765d19c9524661234738e9" uuid = "a4ae2306-e953-59d6-aa16-d00cac43593b" -version = "3.9.0+0" +version = "3.11.0+0" [[deps.libass_jll]] deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Zlib_jll"] @@ -2662,15 +2662,15 @@ version = "2.0.3+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "b70c870239dc3d7bc094eb2d6be9b73d27bef280" +git-tree-sha1 = "b7bfd3ab9d2c58c3829684142f5804e4c6499abc" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.44+0" +version = "1.6.45+0" [[deps.libsixel_jll]] -deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "libpng_jll"] -git-tree-sha1 = "7dfa0fd9c783d3d0cc43ea1af53d69ba45c447df" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"] +git-tree-sha1 = "1e53ffe8941ee486739f3c0cf11208c26637becd" uuid = "075b6546-f08a-558a-be8f-8157d0f608a5" -version = "1.10.3+1" +version = "1.10.4+0" [[deps.libvorbis_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] @@ -2680,15 +2680,15 @@ version = "1.3.7+2" [[deps.libwebp_jll]] deps = ["Artifacts", "Giflib_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libglvnd_jll", "Libtiff_jll", "libpng_jll"] -git-tree-sha1 = "ccbb625a89ec6195856a50aa2b668a5c08712c94" +git-tree-sha1 = "d2408cac540942921e7bd77272c32e58c33d8a77" uuid = "c5f90fcd-3b7e-5836-afba-fc50a0988cb2" -version = "1.4.0+0" +version = "1.5.0+0" [[deps.libzip_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "OpenSSL_jll", "XZ_jll", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "e797fa066eba69f4c0585ffbd81bc780b5118ce2" uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" -version = "1.11.2+0" +version = "1.11.2+2" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] @@ -2708,9 +2708,9 @@ version = "17.4.0+2" [[deps.x264_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "35976a1216d6c066ea32cba2150c4fa682b276fc" +git-tree-sha1 = "14cc7083fc6dff3cc44f2bc435ee96d06ed79aa7" uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a" -version = "10164.0.0+0" +version = "10164.0.1+0" [[deps.x265_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 1def84276c..476f8d1dd1 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -229,7 +229,7 @@ weakdeps = ["BandedMatrices"] deps = ["Artifacts", "JLLWrappers", "Libdl", "Lz4_jll", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "ef12cdd1c7fb7e1dfd6fa8fd60d4db6bc61d2f23" uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" -version = "1.21.6+0" +version = "1.21.6+2" [[deps.BufferedStreams]] git-tree-sha1 = "6863c5b7fc997eadcabdbaf6c5f201dc30032643" @@ -240,7 +240,7 @@ version = "1.2.2" deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "8873e196c2eb87962a2048b3b8e08946535864a1" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.8+2" +version = "1.0.8+4" [[deps.CEnum]] git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc" @@ -324,9 +324,9 @@ version = "1.18.2+1" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] -git-tree-sha1 = "3e4b134270b372f2ed4d4d0e936aabaefc1802bc" +git-tree-sha1 = "1713c74e00545bfe14605d2a2be1712de8fbcb58" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.25.0" +version = "1.25.1" weakdeps = ["SparseArrays"] [deps.ChainRulesCore.extensions] @@ -762,7 +762,7 @@ version = "2.2.5" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "e51db81749b0777b2147fbe7b783ee79045b8e99" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" -version = "2.6.4+1" +version = "2.6.4+3" [[deps.ExprTools]] git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec" @@ -796,7 +796,7 @@ version = "1.8.0" deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "4d81ed14783ec49ce9f2e168208a12ce1815aa25" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.10+1" +version = "3.3.10+3" [[deps.FastBroadcast]] deps = ["ArrayInterface", "LinearAlgebra", "Polyester", "Static", "StaticArrayInterface", "StrideArraysCore"] @@ -1025,9 +1025,9 @@ version = "0.21.0+0" [[deps.Giflib_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "0224cce99284d997f6880a42ef715a37c99338d1" +git-tree-sha1 = "6570366d757b50fabae9f4315ad74d2e40c0560a" uuid = "59f7168a-df46-5410-90c8-f2779963d0ec" -version = "5.2.2+0" +version = "5.2.3+0" [[deps.GilbertCurves]] git-tree-sha1 = "3e076ca96e34a47e98a46657b2bec2655a366d80" @@ -1106,7 +1106,7 @@ version = "8.5.0+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "50aedf345a709ab75872f80a2779568dc0bb461b" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.11.2+1" +version = "2.11.2+3" [[deps.HypergeometricFunctions]] deps = ["LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] @@ -1285,9 +1285,9 @@ version = "0.5.10" [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] -git-tree-sha1 = "be3dc50a92e5a386872a493a10050136d4703f9b" +git-tree-sha1 = "a007feb38b422fbdab534406aeca1b86823cb4d6" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.6.1" +version = "1.7.0" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] @@ -1303,9 +1303,9 @@ version = "0.1.5" [[deps.JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "ef10afc9f4b942bcd75f4c3bc9d9e8d802944c23" +git-tree-sha1 = "eac1206917768cb54957c65a615460d87b455fc1" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" -version = "3.1.0+0" +version = "3.1.1+0" [[deps.JuliaInterpreter]] deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"] @@ -1361,9 +1361,9 @@ version = "3.100.2+0" [[deps.LERC_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "4ec1e8fac04150b570e315baaa68950e368a803d" +git-tree-sha1 = "aaafe88dccbd957a8d82f7d05be9b69172e0cee3" uuid = "88015f11-f218-50d7-93a8-a6af411a945d" -version = "4.0.0+1" +version = "4.0.1+0" [[deps.LLVM]] deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Preferences", "Printf", "Unicode"] @@ -1405,7 +1405,7 @@ weakdeps = ["Serialization"] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "854a9c268c43b77b0a27f22d7fab8d33cdb3a731" uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" -version = "2.10.2+1" +version = "2.10.2+3" [[deps.LaTeXStrings]] git-tree-sha1 = "dda21b8cbd6a6c40d9d02a73230f9d70fed6918c" @@ -1480,9 +1480,9 @@ version = "1.7.0+0" [[deps.Libgpg_error_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "a7f43994b47130e4f491c3b2dbe78fe9e2aed2b3" +git-tree-sha1 = "df37206100d39f79b3376afb6b9cee4970041c61" uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" -version = "1.51.0+0" +version = "1.51.1+0" [[deps.Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1494,19 +1494,19 @@ version = "1.17.0+1" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "84eef7acd508ee5b3e956a2ae51b05024181dee0" uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" -version = "2.40.2+0" +version = "2.40.2+2" [[deps.Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "b404131d06f7886402758c9ce2214b636eb4d54a" +git-tree-sha1 = "4ab7581296671007fc33f07a721631b8855f4b1d" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.7.0+0" +version = "4.7.1+0" [[deps.Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "edbf5309f9ddf1cab25afc344b1e8150b7c832f9" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" -version = "2.40.2+0" +version = "2.40.2+2" [[deps.LightXML]] deps = ["Libdl", "XML2_jll"] @@ -1573,9 +1573,9 @@ version = "3.1.0" [[deps.Lz4_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "abf88ff67f4fd89839efcae2f4c39cbc4ecd0846" +git-tree-sha1 = "191686b1ac1ea9c89fc52e996ad15d1d241d1e33" uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" -version = "1.10.0+1" +version = "1.10.1+0" [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] @@ -1618,7 +1618,7 @@ version = "0.1.11" deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] git-tree-sha1 = "70e830dab5d0775183c99fc75e4c24c614ed7142" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.5.1+0" +version = "5.5.1+2" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1734,9 +1734,9 @@ version = "1.0.2" [[deps.NaNStatistics]] deps = ["PrecompileTools", "Static", "StaticArrayInterface"] -git-tree-sha1 = "f2a685149d4e7d62865babd606092f8e89a6d8f8" +git-tree-sha1 = "1529c48f8c63a815c985890e0192b006b06de528" uuid = "b946abbf-3ea7-4610-9019-9858bfdeaf2d" -version = "0.6.43" +version = "0.6.45" [[deps.NetCDF_jll]] deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] @@ -1818,13 +1818,13 @@ version = "5.0.6+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "7493f61f55a6cce7325f197443aa80d32554ba10" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.15+1" +version = "3.0.15+3" [[deps.OpenSpecFun_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] +git-tree-sha1 = "1346c9208249809840c91b26703912dff463d335" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.5+0" +version = "0.5.6+0" [[deps.Optim]] deps = ["Compat", "FillArrays", "ForwardDiff", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "SparseArrays", "StatsBase"] @@ -2206,9 +2206,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "fd0794f59136050f4734f7af7818fec2f82bdcfc" +git-tree-sha1 = "3e5a9c5d6432b77a271646b4ada2573f239ac5c4" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.69.0" +version = "2.70.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2385,9 +2385,9 @@ weakdeps = ["OffsetArrays", "StaticArrays"] [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] -git-tree-sha1 = "7c01731da8ab6d3094c4d44c9057b00932459255" +git-tree-sha1 = "47091a0340a675c738b1304b58161f3b0839d454" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.9.9" +version = "1.9.10" weakdeps = ["ChainRulesCore", "Statistics"] [deps.StaticArrays.extensions] @@ -2671,33 +2671,33 @@ version = "1.1.42+0" [[deps.XZ_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "15e637a697345f6743674f1322beefbc5dcd5cfc" +git-tree-sha1 = "beef98d5aad604d9e7d60b2ece5181f7888e2fd6" uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800" -version = "5.6.3+0" +version = "5.6.4+0" [[deps.Xorg_libX11_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] git-tree-sha1 = "9dafcee1d24c4f024e7edc92603cedba72118283" uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" -version = "1.8.6+1" +version = "1.8.6+3" [[deps.Xorg_libXau_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "2b0e27d52ec9d8d483e2ca0b72b3cb1a8df5c27a" uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" -version = "1.0.11+1" +version = "1.0.11+3" [[deps.Xorg_libXdmcp_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "02054ee01980c90297412e4c809c8694d7323af3" uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" -version = "1.1.4+1" +version = "1.1.4+3" [[deps.Xorg_libXext_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] git-tree-sha1 = "d7155fea91a4123ef59f42c4afb5ab3b4ca95058" uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" -version = "1.3.6+1" +version = "1.3.6+3" [[deps.Xorg_libXrender_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] @@ -2709,19 +2709,19 @@ version = "0.9.11+1" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "fee57a273563e273f0f53275101cd41a8153517a" uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74" -version = "0.1.1+1" +version = "0.1.1+3" [[deps.Xorg_libxcb_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] git-tree-sha1 = "1a74296303b6524a0472a8cb12d3d87a78eb3612" uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" -version = "1.17.0+1" +version = "1.17.0+3" [[deps.Xorg_xtrans_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "b9ead2d2bdb27330545eb14234a2e300da61232e" uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" -version = "1.5.0+1" +version = "1.5.0+3" [[deps.YAML]] deps = ["Base64", "Dates", "Printf", "StringEncodings"] @@ -2736,9 +2736,9 @@ version = "1.2.13+1" [[deps.Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "555d1076590a6cc2fdee2ef1469451f872d8b41b" +git-tree-sha1 = "622cf78670d067c738667aaa96c553430b65e269" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.5.6+1" +version = "1.5.7+0" [[deps.demumble_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -2756,13 +2756,13 @@ version = "0.2.3+0" deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "46bf7be2917b59b761247be3f317ddf75e50e997" uuid = "477f73a3-ac25-53e9-8cc3-50b2fa2566f0" -version = "1.1.2+0" +version = "1.1.2+2" [[deps.libaom_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "1827acba325fdcdf1d2647fc8d5301dd9ba43a9d" +git-tree-sha1 = "522c1df09d05a71785765d19c9524661234738e9" uuid = "a4ae2306-e953-59d6-aa16-d00cac43593b" -version = "3.9.0+0" +version = "3.11.0+0" [[deps.libass_jll]] deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Zlib_jll"] @@ -2783,15 +2783,15 @@ version = "2.0.3+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "b70c870239dc3d7bc094eb2d6be9b73d27bef280" +git-tree-sha1 = "b7bfd3ab9d2c58c3829684142f5804e4c6499abc" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.44+0" +version = "1.6.45+0" [[deps.libsixel_jll]] -deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "libpng_jll"] -git-tree-sha1 = "7dfa0fd9c783d3d0cc43ea1af53d69ba45c447df" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "libpng_jll"] +git-tree-sha1 = "1e53ffe8941ee486739f3c0cf11208c26637becd" uuid = "075b6546-f08a-558a-be8f-8157d0f608a5" -version = "1.10.3+1" +version = "1.10.4+0" [[deps.libvorbis_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] @@ -2801,15 +2801,15 @@ version = "1.3.7+2" [[deps.libwebp_jll]] deps = ["Artifacts", "Giflib_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libglvnd_jll", "Libtiff_jll", "libpng_jll"] -git-tree-sha1 = "ccbb625a89ec6195856a50aa2b668a5c08712c94" +git-tree-sha1 = "d2408cac540942921e7bd77272c32e58c33d8a77" uuid = "c5f90fcd-3b7e-5836-afba-fc50a0988cb2" -version = "1.4.0+0" +version = "1.5.0+0" [[deps.libzip_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "OpenSSL_jll", "XZ_jll", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "e797fa066eba69f4c0585ffbd81bc780b5118ce2" uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" -version = "1.11.2+0" +version = "1.11.2+2" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] @@ -2835,9 +2835,9 @@ version = "1.0.1+0" [[deps.x264_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "35976a1216d6c066ea32cba2150c4fa682b276fc" +git-tree-sha1 = "14cc7083fc6dff3cc44f2bc435ee96d06ed79aa7" uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a" -version = "10164.0.0+0" +version = "10164.0.1+0" [[deps.x265_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"]