From 5467de561fb6526a120105b8e65c6ef1a8ba81cc Mon Sep 17 00:00:00 2001 From: Yunqi Shao Date: Thu, 11 Apr 2024 11:47:06 +0000 Subject: [PATCH] Update tensorflow block for changes in 2.14 and 2.15 --- easybuild/easyblocks/t/tensorflow.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/easybuild/easyblocks/t/tensorflow.py b/easybuild/easyblocks/t/tensorflow.py index f907e8981b6..45fa243c1a9 100644 --- a/easybuild/easyblocks/t/tensorflow.py +++ b/easybuild/easyblocks/t/tensorflow.py @@ -187,7 +187,7 @@ def is_version_ok(version_range): ('gast', '2.0.0:'): 'gast_archive', ('google.protobuf', '2.0.0:'): 'com_google_protobuf', ('keras_applications', '2.0.0:2.2.0'): 'keras_applications_archive', - ('opt_einsum', '2.0.0:'): 'opt_einsum_archive', + ('opt_einsum', '2.0.0:2.15.0'): 'opt_einsum_archive', ('pasta', '2.0.0:'): 'pasta', ('six', '2.0.0:'): 'six_archive', # Part of Python EC ('tblib', '2.4.0:'): 'tblib_archive', @@ -595,6 +595,13 @@ def configure_step(self): # SYCL support removed in 2.4 if LooseVersion(self.version) < LooseVersion('2.4'): config_env_vars['TF_NEED_OPENCL_SYCL'] = '0' + # Clang toggle since 2.14.0 + if LooseVersion(self.version) > LooseVersion('2.13'): + config_env_vars['TF_NEED_CLANG'] = '0' + # Hermietic python version since 2.14.0 + if LooseVersion(self.version) > LooseVersion('2.13'): + pyver = det_python_version(self.python_cmd) + config_env_vars['TF_PYTHON_VERSION'] = '.'.join(pyver.split('.')[:2]) if self._with_cuda: cuda_version = get_software_version('CUDA')