From 38995a5c4fff66dbfb38ab7cd163470ce0498e7c Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jrlogin12.jureca>
Date: Thu, 10 Jun 2021 23:30:37 +0200
Subject: [PATCH] Make the check also work in for -mt toolchains
---
Custom_Toolchains/ipsmpi.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Custom_Toolchains/ipsmpi.py b/Custom_Toolchains/ipsmpi.py
index ccb0767a2..2a92bcece 100644
--- a/Custom_Toolchains/ipsmpi.py
+++ b/Custom_Toolchains/ipsmpi.py
@@ -59,7 +59,8 @@ class Ipsmpi(IccIfort, IntelCompilersToolchain, Psmpi):
# 'a' is assumed to be equivalent with '.01' (January), and 'b' with '.07' (June)
# (good enough for this purpose)
self.ipsmpi_ver = self.version.replace('a', '.01').replace('b', '.07')
- if LooseVersion(self.ipsmpi_ver) >= LooseVersion('2020.12'):
+ # Strip out -mt if necessary for the comparison, otherwise it breaks
+ if LooseVersion(self.ipsmpi_ver.replace('-mt', '')) >= LooseVersion('2020.12'):
self.oneapi_gen = True
self.SUBTOOLCHAIN = IntelCompilersToolchain.NAME
self.COMPILER_MODULE_NAME = IntelCompilersToolchain.COMPILER_MODULE_NAME
--
GitLab