From 6cfb9339eec72cf81e1d27cf3b6086e82bbfea90 Mon Sep 17 00:00:00 2001 From: Annop Wongwathanarat Date: Wed, 12 Apr 2023 05:13:57 +0100 Subject: armpl-gcc: add version 23.04 (#36776) --- .../repos/builtin/packages/armpl-gcc/package.py | 120 +++++++++++++++++---- 1 file changed, 101 insertions(+), 19 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/armpl-gcc/package.py b/var/spack/repos/builtin/packages/armpl-gcc/package.py index 7358dcd65d..45c122ee19 100644 --- a/var/spack/repos/builtin/packages/armpl-gcc/package.py +++ b/var/spack/repos/builtin/packages/armpl-gcc/package.py @@ -7,17 +7,79 @@ import os from spack.package import * -_os_map = { +_os_map_before_23 = { "ubuntu18.04": "Ubuntu-18.04", "ubuntu20.04": "Ubuntu-20.04", + "ubuntu22.04": "Ubuntu-20.04", "sles15": "SLES-15", "centos7": "RHEL-7", "centos8": "RHEL-8", + "rhel7": "RHEL-7", + "rhel8": "RHEL-8", "rocky8": "RHEL-8", "amzn2": "RHEL-7", + "amzn2023": "RHEL-7", +} + +_os_map = { + "ubuntu20.04": "Ubuntu-20.04", + "ubuntu22.04": "Ubuntu-22.04", + "sles15": "SLES-15", + "centos7": "RHEL-7", + "centos8": "RHEL-8", + "rhel7": "RHEL-7", + "rhel8": "RHEL-8", + "rhel9": "RHEL-9", + "rocky8": "RHEL-8", + "amzn2": "AmazonLinux-2", + "amzn2023": "AmazonLinux-2023", } _versions = { + "23.04_gcc-12.2": { + "RHEL-7": ("e159f84f14d885aa5e47ca17c16ef3d95128f834a655827bf6b48fcf8d6ec459"), + "RHEL-8": ("6ac1974ec9bd814d3a4eecf330cefd67cf2c878f026a8b04bc2928368948671a"), + "RHEL-9": ("71fc8ac9e48ec531b24d5641481070daa8561a5c0373dfbd8915847c8b45641c"), + "SLES-15": ("b26a22123294c161519dce398869626e6a793ce94b76648cce46b0111d17d215"), + "Ubuntu-20.04": ("c410e1aebb1465f8ae7b264fa74f847137e3c1d9f28c1a9332bf69c59b6f9eec"), + "Ubuntu-22.04": ("9f9179336d14ea253462701c96c13d0b01b7c8a09a3fb987c0b22ad647598410"), + "AmazonLinux-2": ("3ef5556d7ac5a269af432eb24ed25d2504bcd0070f8b899231f2a45cea6f1a1d"), + "AmazonLinux-2023": ("037c70ffdcbdf152ddcb7a4f9e1e1acb7c6cd7ea7337966a2b101e684493653d"), + }, + "23.04_gcc-11.3": { + "RHEL-7": ("75f53d160c2254db38f670e86b5381b6d4d778cb0325bfc6fed772c1a8f4c7d7"), + "RHEL-8": ("3d10bd5d3b82a2affcea94fdb235eb046c622abf82306682aabdf3abd9e8fc4e"), + "RHEL-9": ("df3a7c3571af2e6c3e071cf88afdc3352cd32428c22859d833e68afb3d39b4de"), + "SLES-15": ("6dda1320be97d4e5bd2f192b8c6743a6975aab17499554d5506506a620f27e04"), + "Ubuntu-20.04": ("57cc91b3b43fd663f827f5a2f3e2b3bddf76ea0f80d95e227a95d961fae64b5d"), + "Ubuntu-22.04": ("aa56ea09ded38e17bf26ea449b5d45fb112b0feb34a5408c629fe030011c83a4"), + "AmazonLinux-2": ("26494f69237eaf123356b41265f6531d8049dd7aa04898e7b3cd3e8d67d2f25a"), + "AmazonLinux-2023": ("30a1a7d14b567c2e68b11cf40890d09899d4cb5fdc3605b9a0c271867ff0f4b9"), + }, + "23.04_gcc-10.2": { + "RHEL-7": ("08bb8a78dc27989e044f5154744355699e2896d60ae8838b0e6ce4318a9462ab"), + "RHEL-8": ("29415b6d6bce9176aa372ac794769541775573f8302e801a4bf5cdfad5b07851"), + "SLES-15": ("aa3ea267a4d02a9c01fa9ef9fd5ac9e0b8687bac8b19047b52ea57ca587ee838"), + "Ubuntu-20.04": ("d68a66d85e4cd7e99b66308fe563a623b902e49cb01a2ba0342f575beb192a55"), + "AmazonLinux-2": ("a9eded299ea08ba32c91b6e99e1fe24240fcbee0a60696d1dba6d20b2bb39d5c"), + }, + "23.04_gcc-9.3": { + "RHEL-7": ("0550fafeecfd8a23500f8fdd3cddf49ed574ae274894f2ca7935a69618dbd418"), + "RHEL-8": ("d041b3b8ffd4752f0180999bdfc3c6764659097f0b042482bc1058d4c9a504cb"), + "SLES-15": ("dcf8107423dc54068765a3e5f39bfed18df1c9662743f93c785554d0a223a727"), + "Ubuntu-20.04": ("577dc2ceb34f1e0aaf3e28953ed406de02e3e245eeafd7f9d6666866509fb1a1"), + "AmazonLinux-2": ("50df0ee6067c2d3b888545beaa34936bb3b8a8736d52535badf2ab48acc866e2"), + }, + "23.04_gcc-8.2": { + "RHEL-7": ("a579d3790c60ff05952cf4f778089843555413686037ab8b743c2756df8c4070"), + "RHEL-8": ("6c90eb65cdd472a16eaebbcd7455840048814ced5986f31a0daaf10f9a2d33fd"), + "SLES-15": ("9c3a8323f47db78128751ae74fb3dea11b6237d8433aae0c6e2c8e7951c3ea00"), + "AmazonLinux-2": ("02819c958976530e6363d629c5b6d5097892eef5ee4904e27b25e18f52e08c17"), + }, + "23.04_gcc-7.5": { + "RHEL-7": ("2141340617d9a053ed03f9da5b1a787bc96bf065eceee3bf350184a4d3fd8a44"), + "AmazonLinux-2": ("27dfc5f52e6c44a84d99b6d0841e526ea9ff5878262094760c3c82a6863eceb4"), + }, "22.1_gcc-11.2": { "RHEL-7": ("9ce7858525109cca8f4e1d533113b6410d55f10cc4db16c4742562da87a32f2b"), "RHEL-8": ("24f9f4496e41c2314d4ace25b6e3d63127bd586ff7bdd8a732471cbc65a8023e"), @@ -114,24 +176,29 @@ _versions = { } -def get_os(): +def get_os(ver): spack_os = spack.platforms.host().default_os - return _os_map.get(spack_os, "RHEL-7") + if ver.startswith("22."): + return _os_map_before_23.get(spack_os, "") + else: + return _os_map.get(spack_os, "RHEL-7") def get_package_url(version): - os = get_os() - os_no_dash = get_os().replace("-", "") - os_lower = os.split(".")[0].lower() base_url = "https://developer.arm.com/-/media/Files/downloads/hpc/arm-performance-libraries/" armpl_version = version.split("_")[0] armpl_version_dashed = armpl_version.replace(".", "-") gcc_version = version.split("_")[1] + os = get_os(armpl_version) filename = "arm-performance-libraries_" + armpl_version + "_" + os + "_" + gcc_version + ".tar" - if armpl_version == "22.1": - return base_url + armpl_version_dashed + "/" + os_lower + "/" + filename + os_short = "" + if armpl_version.startswith("22.0."): + os_short = os.replace("-", "") else: - return base_url + armpl_version_dashed + "/" + os_no_dash + "/" + filename + os_short = os.split(".")[0].lower() + if "amazonlinux" in os_short: + os_short = os_short.replace("amazonlinux", "al") + return base_url + armpl_version_dashed + "/" + os_short + "/" + filename def get_armpl_prefix(spec): @@ -148,7 +215,7 @@ class ArmplGcc(Package): maintainers("annop-w") for ver, packages in _versions.items(): - key = "{0}".format(get_os()) + key = "{0}".format(get_os(ver)) sha256sum = packages.get(key) url = get_package_url(ver) if sha256sum: @@ -158,6 +225,13 @@ class ArmplGcc(Package): conflicts("target=ppc64:", msg="Only available on Aarch64") conflicts("target=ppc64le:", msg="Only available on Aarch64") + conflicts("%gcc@:11", when="@23.04_gcc-12.2") + conflicts("%gcc@:10", when="@23.04_gcc-11.3") + conflicts("%gcc@:9", when="@23.04_gcc-10.2") + conflicts("%gcc@:8", when="@23.04_gcc-9.3") + conflicts("%gcc@:7", when="@23.04_gcc-8.2") + conflicts("%gcc@:6", when="@23.04_gcc-7.5") + conflicts("%gcc@:10", when="@22.1_gcc-11.2") conflicts("%gcc@:9", when="@22.1_gcc-10.2") conflicts("%gcc@:8", when="@22.1_gcc-9.3") @@ -195,8 +269,14 @@ class ArmplGcc(Package): if self.compiler.name != "gcc": raise spack.error.SpackError(("Only compatible with GCC.\n")) - armpl_version = "{}".format(spec.version.up_to(3)).split("_")[0] - exe = Executable("./arm-performance-libraries_{0}_{1}.sh".format(armpl_version, get_os())) + with when("@:22"): + armpl_version = "{}".format(spec.version.up_to(3)).split("_")[0] + with when("@23:"): + armpl_version = "{}".format(spec.version).split("_")[0] + + exe = Executable( + "./arm-performance-libraries_{0}_{1}.sh".format(armpl_version, get_os(armpl_version)) + ) exe("--accept", "--force", "--install-to", prefix) @property @@ -263,12 +343,14 @@ class ArmplGcc(Package): @run_after("install") def make_pkgconfig_files(self): - # ArmPL pkgconfig files do not have .pc extension and are thus not found by pkg-config - armpl_dir = get_armpl_prefix(self.spec) - for f in find(join_path(armpl_dir, "pkgconfig"), "*"): - symlink(f, f + ".pc") + if self.spec.satisfies("@:22"): + # ArmPL pkgconfig files do not have .pc extension and are thus not found by pkg-config + armpl_dir = get_armpl_prefix(self.spec) + for f in find(join_path(armpl_dir, "pkgconfig"), "*"): + symlink(f, f + ".pc") def setup_dependent_build_environment(self, env, dependent_spec): - # pkgconfig directory is not in standard ("lib", "lib64", "share") location - armpl_dir = get_armpl_prefix(self.spec) - env.append_path("PKG_CONFIG_PATH", join_path(armpl_dir, "pkgconfig")) + if self.spec.satisfies("@:22"): + # pkgconfig directory is not in standard ("lib", "lib64", "share") location + armpl_dir = get_armpl_prefix(self.spec) + env.append_path("PKG_CONFIG_PATH", join_path(armpl_dir, "pkgconfig")) -- cgit v1.2.3-60-g2f50