From b2efa3cd8ce7a2b900f76ff4a17e11a000666cea Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Sun, 31 Mar 2024 10:57:56 +0200 Subject: [PATCH] Update JULIA_CPU_TARGET for precompiling packages (#2104) * Update JULIA_CPU_TARGET for precompiling packages * Update links * Also update link for aarch64 --- .../setup-scripts/setup-julia-packages.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/minimal-notebook/setup-scripts/setup-julia-packages.bash b/images/minimal-notebook/setup-scripts/setup-julia-packages.bash index 5e8f7e80..14a77407 100755 --- a/images/minimal-notebook/setup-scripts/setup-julia-packages.bash +++ b/images/minimal-notebook/setup-scripts/setup-julia-packages.bash @@ -11,20 +11,20 @@ set -exuo pipefail # container runs on a host that's the same architecture, but a *different* # generation of CPU than what the build host was, the precompilation is useless # and Julia takes a long long time to start up. This specific multitarget comes -# from https://github.com/JuliaCI/julia-buildkite/blob/70bde73f6cb17d4381b62236fc2d96b1c7acbba7/utilities/build_envs.sh#L20-L76, +# from https://github.com/JuliaCI/julia-buildkite/blob/9f354745a1f2bf31a5952462aa1ff2d869507cb8/utilities/build_envs.sh#L20-L82, # and may need to be updated as new CPU generations come out. # If the architecture the container runs on is different, # precompilation may still have to be re-done on first startup - but this # *should* catch most of the issues. See # https://github.com/jupyter/docker-stacks/issues/2015 for more information if [ "$(uname -m)" == "x86_64" ]; then - # See https://github.com/JuliaCI/julia-buildkite/blob/70bde73f6cb17d4381b62236fc2d96b1c7acbba7/utilities/build_envs.sh#L24 + # See https://github.com/JuliaCI/julia-buildkite/blob/9f354745a1f2bf31a5952462aa1ff2d869507cb8/utilities/build_envs.sh#L23 # for an explanation of these options - export JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" + export JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)" elif [ "$(uname -m)" == "aarch64" ]; then - # See https://github.com/JuliaCI/julia-buildkite/blob/70bde73f6cb17d4381b62236fc2d96b1c7acbba7/utilities/build_envs.sh#L54 + # See https://github.com/JuliaCI/julia-buildkite/blob/9f354745a1f2bf31a5952462aa1ff2d869507cb8/utilities/build_envs.sh#L56 # for an explanation of these options - export JULIA_CPU_TARGET="generic;cortex-a57;thunderx2t99;carmel" + export JULIA_CPU_TARGET="generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)" fi # Install base Julia packages