Skip to content

Commit

Permalink
re-format entire project
Browse files Browse the repository at this point in the history
  • Loading branch information
arlowhite committed Aug 12, 2024
1 parent 6592a8f commit 90626d5
Show file tree
Hide file tree
Showing 84 changed files with 2,146 additions and 1,647 deletions.
11 changes: 8 additions & 3 deletions Aviz/build/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

using Pkg, PackageCompiler


here = @__DIR__
cd(here)

Expand All @@ -11,7 +10,9 @@ if "app" in ARGS

cd("../..")

create_app("Aviz", "adria_aviz"; include_lazy_artifacts=true, force=true, incremental=true)
create_app(
"Aviz", "adria_aviz"; include_lazy_artifacts=true, force=true, incremental=true
)
exit()
end

Expand All @@ -29,7 +30,11 @@ if "sysimage" in ARGS

project_deps = collect(keys(Pkg.project().dependencies))
try
create_sysimage(project_deps; sysimage_path=sysimage_fn, precompile_execution_file="precompile_script.jl")
create_sysimage(
project_deps;
sysimage_path=sysimage_fn,
precompile_execution_file="precompile_script.jl"
)
catch
@info "Sysimage build failed..."
end
Expand Down
1 change: 0 additions & 1 deletion Aviz/build/precompile_script.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ using Statistics, Distributions
using Makie.GeometryBasics
using ADRIA, Makie


precompile(CSV.read, (String, DataFrame))
precompile(GeoDataFrames.read, (String,))

Expand Down
25 changes: 19 additions & 6 deletions ODE_preferences.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,22 @@ using OrdinaryDiffEq

set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileNonStiff" => true)
set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileStiff" => false)
set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileAutoSwitch" => false)
set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileLowStorage" => false)
set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileDefaultSpecialize" => true)
set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileAutoSpecialize" => false)
set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileFunctionWrapperSpecialize" => false)
set_preferences!(UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileNoSpecialize" => false)
set_preferences!(
UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileAutoSwitch" => false
)
set_preferences!(
UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileLowStorage" => false
)
set_preferences!(
UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileDefaultSpecialize" => true
)
set_preferences!(
UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileAutoSpecialize" => false
)
set_preferences!(
UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"),
"PrecompileFunctionWrapperSpecialize" => false
)
set_preferences!(
UUID("1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"), "PrecompileNoSpecialize" => false
)
9 changes: 6 additions & 3 deletions build/make.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Pkg, PackageCompiler


# Removed ADRIA from sysimage project so line below is not needed (but could be useful later).
# project_deps = filter!(i -> i != "ADRIA", project_deps) # Remove ADRIA (we don't want to make this static for dev purposes)
sysimage_fn = "ADRIA_sysimage.dll"
Expand All @@ -13,7 +12,11 @@ if "dev" in ARGS
end

project_deps = collect(keys(Pkg.project().dependencies))
create_sysimage(project_deps; sysimage_path=sysimage_fn, precompile_execution_file="precompile_script.jl")
create_sysimage(
project_deps;
sysimage_path=sysimage_fn,
precompile_execution_file="precompile_script.jl"
)

if "dev" in ARGS
@info "Removing dev packages from project spec"
Expand All @@ -25,4 +28,4 @@ end
# A julia session with the sysimage can be started with:
# julia --project=. -J ADRIA_sysimage.dll

exit()
exit()
2 changes: 0 additions & 2 deletions build/precompile_script.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using CSV, DataFrames, GeoDataFrames


precompile(CSV.read, (String, DataFrame))
precompile(GeoDataFrames.read, (String,))


# precompile(load_domain, (String, Int64))
# precompile(Domain, (String, Int64, String, String, String, String, String, String, String))
# precompile(EnvLayer, (String, String, String, String, String, String, String))
Expand Down
7 changes: 3 additions & 4 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ push!(LOAD_PATH, "../src/")

using Documenter, ADRIA


makedocs(
makedocs(;
sitename="ADRIA.jl",
format=Documenter.HTML(
format=Documenter.HTML(;
prettyurls=get(ENV, "CI", nothing) == "true",
assets=["assets/favicon.ico"]
),
Expand Down Expand Up @@ -43,7 +42,7 @@ makedocs(
]
)

deploydocs(
deploydocs(;
repo="github.com/open-AIMS/ADRIA.jl.git",
devbranch="main",
target="build",
Expand Down
Loading

0 comments on commit 90626d5

Please sign in to comment.