From b5fef2cbc7dec95cd94c183d8de0fa76c8c7ec44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20F=C3=A9votte?= Date: Wed, 15 Apr 2020 22:14:31 +0200 Subject: [PATCH] =?UTF-8?q?Ex=203-3=20:=20Correction=20de=20bugs=20dans=20?= =?UTF-8?q?les=20outils=20de=20reproductibilit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module3/exo3/Tools.jl | 11 ++++-- module3/exo3/compile.jl | 6 +-- module3/exo3/exercice.html | 40 +++++++++---------- module3/exo3/exercice.jmd | 2 +- module3/exo3/repro.html | 44 ++++++++++++++------- module3/exo3/repro.jmd | 63 +++++++++++++++++++----------- module3/exo3/setup.jl | 4 ++ module3/exo3/{make.jl => weave.jl} | 8 ++-- 8 files changed, 108 insertions(+), 70 deletions(-) rename module3/exo3/{make.jl => weave.jl} (68%) diff --git a/module3/exo3/Tools.jl b/module3/exo3/Tools.jl index c507a3a..81c6348 100644 --- a/module3/exo3/Tools.jl +++ b/module3/exo3/Tools.jl @@ -5,7 +5,7 @@ module Tools function run_julia(args...) cd(@__DIR__) julia = Base.julia_cmd()[1] - run(`$julia --color=yes --startup-file=no --project $args`) + @time run(`$julia --color=yes --startup-file=no --project $args`) nothing end @@ -17,9 +17,14 @@ function weave() cd(@__DIR__) opts = String[] - isfile("Exercice.so") && push!(opts, "-JExercice.so") + if isfile("Exercice.so") + @info "Using custom system image: Exercice.so" + push!(opts, "-JExercice.so") + end - run_julia(opts..., "make.jl") + run_julia(opts..., "weave.jl") end end + +nothing diff --git a/module3/exo3/compile.jl b/module3/exo3/compile.jl index 2eebec2..d3c953d 100755 --- a/module3/exo3/compile.jl +++ b/module3/exo3/compile.jl @@ -8,9 +8,9 @@ Pkg.activate(@__DIR__) Pkg.instantiate() using PackageCompiler -@time create_sysimage(Symbol.(keys(Pkg.project().dependencies)); - sysimage_path=Pkg.project().name * ".so", - precompile_execution_file=joinpath(@__DIR__, "make.jl")) +create_sysimage(Symbol.(keys(Pkg.project().dependencies)); + sysimage_path=Pkg.project().name * ".so", + precompile_execution_file=joinpath(@__DIR__, "weave.jl")) # Local Variables: # mode: julia diff --git a/module3/exo3/exercice.html b/module3/exo3/exercice.html index a205ae7..3ca5432 100644 --- a/module3/exo3/exercice.html +++ b/module3/exo3/exercice.html @@ -946,9 +946,9 @@ Missing data: 2012-09-29 - 2012-10-20 (21 days)

Une visualisation de l'ensemble des données semble montrer une augmentation tendancielle de la concentration en CO2, à laquelle se superpose une oscillation à plus haute fréquence.

-
+