From 313e09cacd64e3d51b67bc6216ce43b2541a505c Mon Sep 17 00:00:00 2001
From: Damian Alvarez <d.alvarez@fz-juelich.de>
Date: Mon, 31 Jan 2022 15:26:44 +0100
Subject: [PATCH] To have proper string comparisons. Otherwise PyCUDA was
tweaked, and suite sparse was failing
---
Custom_EasyBlocks/suitesparse.py | 2 +-
Custom_Hooks/eb_hooks.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Custom_EasyBlocks/suitesparse.py b/Custom_EasyBlocks/suitesparse.py
index db700f720..1318aa2a2 100644
--- a/Custom_EasyBlocks/suitesparse.py
+++ b/Custom_EasyBlocks/suitesparse.py
@@ -123,7 +123,7 @@ class EB_SuiteSparse(ConfigureMake):
for (var, val) in list(cfgvars.items()):
# Let's overwrite NVCCFLAGS at the end, since the line breaks and the fact that it appears multiple
# times makes it tricky to handle it properly
- if var is not'NVCCFLAGS':
+ if var != 'NVCCFLAGS':
orig_line = line
# for variables in cfgvars, substiture lines assignment
# in the file, whatever they are, by assignments to the
diff --git a/Custom_Hooks/eb_hooks.py b/Custom_Hooks/eb_hooks.py
index 6b19ff7cf..e4346aa4d 100644
--- a/Custom_Hooks/eb_hooks.py
+++ b/Custom_Hooks/eb_hooks.py
@@ -267,7 +267,7 @@ def tweak_dependencies(ec):
for dep_to_tweak in TWEAKABLE_DEPENDENCIES:
for dep in dependencies:
remove = False
- if dep_to_tweak in dep[0]:
+ if dep_to_tweak == dep[0]:
list_dep = list(dep)
if isinstance(TWEAKABLE_DEPENDENCIES[dep_to_tweak], str):
list_dep[1] = TWEAKABLE_DEPENDENCIES[dep_to_tweak]
--
GitLab