From f8f48690594c703f80cbb78fd3aab013434e2d2d Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Fri, 19 Apr 2024 14:36:34 +0200 Subject: [PATCH 1/8] Add DeepDiffs to precompile script --- system/precompile.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/system/precompile.jl b/system/precompile.jl index f0630ea0ad9a..ef7af517edaa 100644 --- a/system/precompile.jl +++ b/system/precompile.jl @@ -2,6 +2,7 @@ import Pkg Pkg.add("Documenter") Pkg.add("PrettyTables") Pkg.add("Aqua") +Pkg.add("DeepDiffs") Pkg.precompile() From 493df44360c27c195e36dcd264abe1a1e72fff0e Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Fri, 19 Apr 2024 14:38:29 +0200 Subject: [PATCH 2/8] Disable persistent_tasks in testing. is this even a good idea ? --- test/Aqua.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Aqua.jl b/test/Aqua.jl index 0f2c72467b95..5efeaa3d0134 100644 --- a/test/Aqua.jl +++ b/test/Aqua.jl @@ -6,6 +6,7 @@ using Aqua ambiguities=false, # TODO: fix ambiguities unbound_args=false, # TODO: fix unbound type parameters piracies=false, # TODO: check the reported methods to be moved upstream + persistent_tasks=false # TODO: FIXME | setting this to true breaks Oscar.build() ) @test length(Aqua.detect_unbound_args_recursively(Oscar)) <= 16 end From 968d08e68eaf95a78ac2d4dd0cd625bb068d1576 Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Tue, 14 May 2024 17:55:16 +0200 Subject: [PATCH 3/8] Revert "Add DeepDiffs to precompile script" This reverts commit bed67b7dd92b41ea7a3687f300a0cb496b45867d. --- system/precompile.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/system/precompile.jl b/system/precompile.jl index ef7af517edaa..f0630ea0ad9a 100644 --- a/system/precompile.jl +++ b/system/precompile.jl @@ -2,7 +2,6 @@ import Pkg Pkg.add("Documenter") Pkg.add("PrettyTables") Pkg.add("Aqua") -Pkg.add("DeepDiffs") Pkg.precompile() From e422c4de02700f2d0826dbb535712d0771c09ec9 Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Tue, 14 May 2024 17:58:10 +0200 Subject: [PATCH 4/8] Add JSONSchema as dependency, use short tests --- system/precompile.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/precompile.jl b/system/precompile.jl index f0630ea0ad9a..a54942422283 100644 --- a/system/precompile.jl +++ b/system/precompile.jl @@ -2,8 +2,8 @@ import Pkg Pkg.add("Documenter") Pkg.add("PrettyTables") Pkg.add("Aqua") - +Pkg.add("JSONSchema") Pkg.precompile() - +ENV["OSCAR_TEST_SUBSET"] = "short" include(joinpath(pkgdir(Oscar), "test", "runtests.jl")) Hecke.system("precompile.jl") From 6af3e54051b0609162e868404d55f44615ec840d Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Tue, 14 May 2024 17:58:26 +0200 Subject: [PATCH 5/8] Fix CPU target default --- system/Build.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/Build.jl b/system/Build.jl index 8c8b81336e35..587a24e5b381 100644 --- a/system/Build.jl +++ b/system/Build.jl @@ -27,11 +27,12 @@ Oscar.system("precompile.jl") sysimage=joinpath(tmp, "Oscar.$(Libdl.dlext)") if !("JULIA_CPU_TARGET" in keys(ENV)) || (ENV["JULIA_CPU_TARGET"] == "") - PackageCompiler.create_sysimage([:Oscar], sysimage_path=sysimage, precompile_execution_file=CO) + println("Building system image for generic target. Use JULIA_CPU_TARGET to change.") + target = "generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" else target = ENV["JULIA_CPU_TARGET"] - PackageCompiler.create_sysimage([:Oscar], sysimage_path=sysimage, precompile_execution_file=CO; cpu_target=target) end +PackageCompiler.create_sysimage([:Oscar], sysimage_path=sysimage, precompile_execution_file=CO; cpu_target=target) println("(re)start julia as") println("\tjulia -J $(sysimage)") From d5594d4b1d742ae2eb30500812ac77ea4d3f0b9b Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Wed, 15 May 2024 10:36:10 +0200 Subject: [PATCH 6/8] Update system/Build.jl Use portable defaults Co-authored-by: Max Horn --- system/Build.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Build.jl b/system/Build.jl index 587a24e5b381..14b36016ab03 100644 --- a/system/Build.jl +++ b/system/Build.jl @@ -28,7 +28,7 @@ Oscar.system("precompile.jl") sysimage=joinpath(tmp, "Oscar.$(Libdl.dlext)") if !("JULIA_CPU_TARGET" in keys(ENV)) || (ENV["JULIA_CPU_TARGET"] == "") println("Building system image for generic target. Use JULIA_CPU_TARGET to change.") - target = "generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" + target = PackageCompiler.default_app_cpu_target() else target = ENV["JULIA_CPU_TARGET"] end From 851f9e55d7e0df6c33167e2fca1c0590ce025a88 Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Wed, 15 May 2024 15:27:32 +0200 Subject: [PATCH 7/8] Update test/Aqua.jl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lars Göttgens --- test/Aqua.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Aqua.jl b/test/Aqua.jl index 5efeaa3d0134..0f2c72467b95 100644 --- a/test/Aqua.jl +++ b/test/Aqua.jl @@ -6,7 +6,6 @@ using Aqua ambiguities=false, # TODO: fix ambiguities unbound_args=false, # TODO: fix unbound type parameters piracies=false, # TODO: check the reported methods to be moved upstream - persistent_tasks=false # TODO: FIXME | setting this to true breaks Oscar.build() ) @test length(Aqua.detect_unbound_args_recursively(Oscar)) <= 16 end From f2877398fa13a0d5f71ab817f1d8a50655763a8a Mon Sep 17 00:00:00 2001 From: Aaruni Kaushik Date: Fri, 17 May 2024 14:53:01 +0200 Subject: [PATCH 8/8] Remove aqua from build requirements --- system/precompile.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/system/precompile.jl b/system/precompile.jl index a54942422283..957072614e73 100644 --- a/system/precompile.jl +++ b/system/precompile.jl @@ -1,7 +1,6 @@ import Pkg Pkg.add("Documenter") Pkg.add("PrettyTables") -Pkg.add("Aqua") Pkg.add("JSONSchema") Pkg.precompile() ENV["OSCAR_TEST_SUBSET"] = "short"