From 5a8ed6f109198a81a343c9319778be399483431e Mon Sep 17 00:00:00 2001 From: Jean-guillaume Piccinali Date: Wed, 22 Jan 2025 16:16:44 +0100 Subject: [PATCH] linaro/24.1.1 (#183) --- config.yaml | 15 ++++++------ recipes/linaro-forge/23.1.2/config.yaml | 6 ----- recipes/linaro-forge/23.1.2/environments.yaml | 10 -------- recipes/linaro-forge/23.1.2/modules.yaml | 23 ------------------- recipes/linaro-forge/23.1.2/post-install | 7 ------ recipes/linaro-forge/23.1.2/repo | 1 - recipes/linaro-forge/24.0.2/compilers.yaml | 5 ---- .../{23.1.2 => 24.1.1}/compilers.yaml | 0 .../{24.0.2 => 24.1.1}/config.yaml | 2 +- .../{24.0.2 => 24.1.1}/environments.yaml | 2 +- .../{24.0.2 => 24.1.1}/extra/reframe.yaml | 1 + .../{24.0.2 => 24.1.1}/modules.yaml | 0 .../{24.0.2 => 24.1.1}/post-install | 2 +- recipes/linaro-forge/{24.0.2 => 24.1.1}/repo | 0 .../repo/packages/linaro-forge/package.py | 16 +++++-------- 15 files changed, 17 insertions(+), 73 deletions(-) delete mode 100644 recipes/linaro-forge/23.1.2/config.yaml delete mode 100644 recipes/linaro-forge/23.1.2/environments.yaml delete mode 100644 recipes/linaro-forge/23.1.2/modules.yaml delete mode 100644 recipes/linaro-forge/23.1.2/post-install delete mode 120000 recipes/linaro-forge/23.1.2/repo delete mode 100644 recipes/linaro-forge/24.0.2/compilers.yaml rename recipes/linaro-forge/{23.1.2 => 24.1.1}/compilers.yaml (100%) rename recipes/linaro-forge/{24.0.2 => 24.1.1}/config.yaml (86%) rename recipes/linaro-forge/{24.0.2 => 24.1.1}/environments.yaml (76%) rename recipes/linaro-forge/{24.0.2 => 24.1.1}/extra/reframe.yaml (90%) rename recipes/linaro-forge/{24.0.2 => 24.1.1}/modules.yaml (100%) rename recipes/linaro-forge/{24.0.2 => 24.1.1}/post-install (65%) rename recipes/linaro-forge/{24.0.2 => 24.1.1}/repo (100%) diff --git a/config.yaml b/config.yaml index 25d2565f..30645d1c 100644 --- a/config.yaml +++ b/config.yaml @@ -196,26 +196,25 @@ uenvs: todi: [gh200] develop: False linaro-forge: - "24.1": + "24.1.1": recipes: - zen2: "24.1" - gh200: "24.1" + zen2: "24.1.1" + gh200: "24.1.1" deploy: eiger: [zen2] santis: [gh200] daint: [gh200] - todi: [gh200] + # clariden ? develop: False mount: "/user-tools" - "24.0.2": + "24.1": recipes: - zen2: "24.0.2" - gh200: "24.0.2" + zen2: "24.1" + gh200: "24.1" deploy: eiger: [zen2] santis: [gh200] daint: [gh200] - todi: [gh200] develop: False mount: "/user-tools" mch: diff --git a/recipes/linaro-forge/23.1.2/config.yaml b/recipes/linaro-forge/23.1.2/config.yaml deleted file mode 100644 index e11973f2..00000000 --- a/recipes/linaro-forge/23.1.2/config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -name: linaro -store: /user-tools -spack: - repo: https://github.com/spack/spack.git - commit: releases/v0.21 -modules: True diff --git a/recipes/linaro-forge/23.1.2/environments.yaml b/recipes/linaro-forge/23.1.2/environments.yaml deleted file mode 100644 index c3d2dd87..00000000 --- a/recipes/linaro-forge/23.1.2/environments.yaml +++ /dev/null @@ -1,10 +0,0 @@ -linaro: - compiler: - - toolchain: gcc - spec: gcc - unify: true - specs: - - linaro-forge@23.1.2 +accept-eula - views: - forge: - link: roots diff --git a/recipes/linaro-forge/23.1.2/modules.yaml b/recipes/linaro-forge/23.1.2/modules.yaml deleted file mode 100644 index 623307b0..00000000 --- a/recipes/linaro-forge/23.1.2/modules.yaml +++ /dev/null @@ -1,23 +0,0 @@ -modules: - # Paths to check when creating modules for all module sets - prefix_inspections: - bin: - - PATH - lib: - - LD_LIBRARY_PATH - lib64: - - LD_LIBRARY_PATH - - default: - arch_folder: false - # Where to install modules - roots: - tcl: /user-environment/modules - tcl: - all: - autoload: none - hash_length: 0 - exclude_implicits: true - exclude: ['%gcc@7.5.0', 'gcc %gcc@7.5.0'] - projections: - all: '{name}/{version}' diff --git a/recipes/linaro-forge/23.1.2/post-install b/recipes/linaro-forge/23.1.2/post-install deleted file mode 100644 index 1d0e1129..00000000 --- a/recipes/linaro-forge/23.1.2/post-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -#forge_bin=$(spack -C {{ env.config }} location -i linaro-forge)/bin -#ln -s $forge_bin {{ env.mount }}/bin -forge_bin={{ env.mount }}/env/forge/bin -echo "export PATH=$forge_bin:$PATH" >> {{ env.mount }}/activate -echo "export UENV_DDT_VERSION=23.1.2" >> {{ env.mount }}/activate diff --git a/recipes/linaro-forge/23.1.2/repo b/recipes/linaro-forge/23.1.2/repo deleted file mode 120000 index 3f5a289d..00000000 --- a/recipes/linaro-forge/23.1.2/repo +++ /dev/null @@ -1 +0,0 @@ -../repo \ No newline at end of file diff --git a/recipes/linaro-forge/24.0.2/compilers.yaml b/recipes/linaro-forge/24.0.2/compilers.yaml deleted file mode 100644 index c3bc6ac6..00000000 --- a/recipes/linaro-forge/24.0.2/compilers.yaml +++ /dev/null @@ -1,5 +0,0 @@ -bootstrap: - spec: gcc@12 -gcc: - specs: - - gcc@12 diff --git a/recipes/linaro-forge/23.1.2/compilers.yaml b/recipes/linaro-forge/24.1.1/compilers.yaml similarity index 100% rename from recipes/linaro-forge/23.1.2/compilers.yaml rename to recipes/linaro-forge/24.1.1/compilers.yaml diff --git a/recipes/linaro-forge/24.0.2/config.yaml b/recipes/linaro-forge/24.1.1/config.yaml similarity index 86% rename from recipes/linaro-forge/24.0.2/config.yaml rename to recipes/linaro-forge/24.1.1/config.yaml index d3d719cd..afa60d7f 100644 --- a/recipes/linaro-forge/24.0.2/config.yaml +++ b/recipes/linaro-forge/24.1.1/config.yaml @@ -3,5 +3,5 @@ store: /user-tools description: https://www.linaroforge.com/download-documentation spack: repo: https://github.com/spack/spack.git - commit: releases/v0.21 + commit: releases/v0.22 modules: True diff --git a/recipes/linaro-forge/24.0.2/environments.yaml b/recipes/linaro-forge/24.1.1/environments.yaml similarity index 76% rename from recipes/linaro-forge/24.0.2/environments.yaml rename to recipes/linaro-forge/24.1.1/environments.yaml index 0ba44c47..11d888b3 100644 --- a/recipes/linaro-forge/24.0.2/environments.yaml +++ b/recipes/linaro-forge/24.1.1/environments.yaml @@ -4,7 +4,7 @@ gcc-env: spec: gcc unify: true specs: - - linaro-forge@24.0.2 +accept-eula + - linaro-forge@24.1.1 +accept-eula views: forge: link: roots diff --git a/recipes/linaro-forge/24.0.2/extra/reframe.yaml b/recipes/linaro-forge/24.1.1/extra/reframe.yaml similarity index 90% rename from recipes/linaro-forge/24.0.2/extra/reframe.yaml rename to recipes/linaro-forge/24.1.1/extra/reframe.yaml index 01eccf6a..bde425fc 100644 --- a/recipes/linaro-forge/24.0.2/extra/reframe.yaml +++ b/recipes/linaro-forge/24.1.1/extra/reframe.yaml @@ -1,6 +1,7 @@ default: features: - ddt + - map cc: gcc cxx: g++ ftn: gfortran diff --git a/recipes/linaro-forge/24.0.2/modules.yaml b/recipes/linaro-forge/24.1.1/modules.yaml similarity index 100% rename from recipes/linaro-forge/24.0.2/modules.yaml rename to recipes/linaro-forge/24.1.1/modules.yaml diff --git a/recipes/linaro-forge/24.0.2/post-install b/recipes/linaro-forge/24.1.1/post-install similarity index 65% rename from recipes/linaro-forge/24.0.2/post-install rename to recipes/linaro-forge/24.1.1/post-install index f8e0bdf7..4f0ed916 100644 --- a/recipes/linaro-forge/24.0.2/post-install +++ b/recipes/linaro-forge/24.1.1/post-install @@ -2,4 +2,4 @@ forge_bin={{ env.mount }}/env/forge/bin echo "export PATH=$forge_bin:\$PATH" >> {{ env.mount }}/activate -echo "export UENV_DDT_VERSION=24.0.2" >> {{ env.mount }}/activate +echo "export UENV_DDT_VERSION=24.1.1" >> {{ env.mount }}/activate diff --git a/recipes/linaro-forge/24.0.2/repo b/recipes/linaro-forge/24.1.1/repo similarity index 100% rename from recipes/linaro-forge/24.0.2/repo rename to recipes/linaro-forge/24.1.1/repo diff --git a/recipes/linaro-forge/repo/packages/linaro-forge/package.py b/recipes/linaro-forge/repo/packages/linaro-forge/package.py index ac6ecffc..9564dffc 100644 --- a/recipes/linaro-forge/repo/packages/linaro-forge/package.py +++ b/recipes/linaro-forge/repo/packages/linaro-forge/package.py @@ -1,5 +1,4 @@ -# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. +# Copyright Spack Project Developers. See COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) @@ -23,6 +22,9 @@ class LinaroForge(Package): maintainers("kenche-linaro") if platform.machine() == "aarch64": + version( + "24.1.1", sha256="ad02a8912650bdca6f50de12c2b6fb471730a5f38f3c58fe91d48429337d3a10" + ) version("24.1", sha256="e297d0c19c95d4db842187eb38882db094094ec667d854aaf396e11a81bffe0b") version( "24.0.6", sha256="a7f9f71e4352be3680854611fe433a9974fcb8a327ac65ca3bc950c956eac6e4" @@ -66,9 +68,6 @@ class LinaroForge(Package): version( "22.1.4", sha256="4e2af481a37b4c99dba0de6fac75ac945316955fc4170d06e321530adea7ac9f" ) - version( - "21.1.3", sha256="4a4ff7372aad5a31fc9e18b7b6c493691ab37d8d44a3158584e62d1ab82b0eeb" - ) elif platform.machine() == "ppc64le": # N.B. support for ppc64le was dropped in 24.0 version( @@ -97,10 +96,10 @@ class LinaroForge(Package): version( "22.0.4", sha256="f4cb5bcbaa67f9209299fe4653186a2829760b8b16a2883913aa43766375b04c" ) + elif platform.machine() == "x86_64": version( - "21.1.3", sha256="eecbc5686d60994c5468b2d7cd37bebe5d9ac0ba37bd1f98fbfc69b071db541e" + "24.1.1", sha256="b58b59f0b4ccf50eb48753d740172f71941b1fbe132dea96d35c6dad58cd9b96" ) - elif platform.machine() == "x86_64": version("24.1", sha256="0b96878ab73c20b39c4730ed15f24ca86dc5985637ff5d8e68f55e1e802e5fe3") version( "24.0.6", sha256="eab198b964862b4664359ccbec1edb27c2dd3b9fa82bcb4e14fc616a2b0341da" @@ -147,9 +146,6 @@ class LinaroForge(Package): version( "22.0.4", sha256="a2c8c1da38b9684d7c4656a98b3fc42777b03fd474cd0bf969324804f47587e5" ) - version( - "21.1.3", sha256="03dc82f1d075deb6f08d1e3e6592dc9b630d406c08a1316d89c436b5874f3407" - ) variant( "probe",