From 523640812c07aa6b738d37424ca2776c2bcfbce0 Mon Sep 17 00:00:00 2001 From: Goetz Waschk Date: Thu, 7 Nov 2024 14:36:17 +0100 Subject: [PATCH] intel-compilers-devel: new version 2025.0 Signed-off-by: Goetz Waschk --- .../SPECS/intel-compilers-devel.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/components/compiler-families/intel-compilers-devel/SPECS/intel-compilers-devel.spec b/components/compiler-families/intel-compilers-devel/SPECS/intel-compilers-devel.spec index da0d5cf0fc..763c575fdb 100644 --- a/components/compiler-families/intel-compilers-devel/SPECS/intel-compilers-devel.spec +++ b/components/compiler-families/intel-compilers-devel/SPECS/intel-compilers-devel.spec @@ -19,15 +19,14 @@ # version, but the build system was already using a newer version, then # the resulting binaries might rely on symbols which are not present # in the minimum version. Newer versions may still be installed in parallel. -%define exact_intel_ver 2024.0 -%define exact_intel_ver_module 2024.0.0 -%define exact_mkl_ver 2024.0 -%define exact_classic_ver 2023.2.1 -%define exact_deps compiler/2024.0.0 mkl/%{exact_mkl_ver} oclfpga/2024.0.0 compiler-rt/2024.0.0 debugger/2024.0.0 tbb/2021.11 +%define exact_intel_ver 2025.0 +%define exact_intel_ver_module 2025.0.0 +%define exact_mkl_ver 2025.0 +%define exact_deps umf/0.9.0 compiler/2025.0.0 mkl/%{exact_mkl_ver} compiler-rt/2025.0.0 debugger/2025.0.0 tbb/2022.0.0 Summary: OpenHPC compatibility package for Intel(R) oneAPI HPC Toolkit Name: %{pname}%{PROJ_DELIM} -Version: 2024.0 +Version: 2025.0 Release: %{?dist}.1 License: Apache-2.0 URL: https://github.com/openhpc/ohpc @@ -41,8 +40,6 @@ Source2: oneAPI.repo #!BuildIgnore: post-build-checks Requires: gcc libstdc++-devel -Requires(pre): intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-%{exact_classic_ver} -Requires: intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-%{exact_classic_ver} Requires: intel-oneapi-dpcpp-cpp-%{exact_intel_ver} Requires: intel-oneapi-mkl-devel-%{exact_mkl_ver} Requires: intel-oneapi-compiler-fortran-%{exact_intel_ver} @@ -162,9 +159,9 @@ if { ![info exists ::env(ACL_SKIP_BSP_CONF)] } { setenv ACL_SKIP_BSP_CONF 1 } -module load "oclfpga" module load "tbb" module load "compiler-rt" +module load "umf" module load "compiler/\$version" module load "$mklver"