diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83d8ec9cbedc458bf8e98ae9233f757f17fbe1dc..6b73968201b8fb26678d3906a502694c0b42242e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ default: - image: rboman/waves-py3:2022.0 + image: rboman/waves-py3:latest before_script: - - source /opt/intel/mkl/bin/mklvars.sh intel64 - - source /opt/intel/tbb/bin/tbbvars.sh intel64 + - source /opt/intel/oneapi/mkl/latest/env/vars.sh + - source /opt/intel/oneapi/tbb/latest/env/vars.sh - echo $(nproc) - printenv | sort diff --git a/fwk/wutils.py b/fwk/wutils.py index d5baa08e243c06eb43a2344f9314a93f4463408c..1e40cab731793b71f9b989558488d021d57cb572 100644 --- a/fwk/wutils.py +++ b/fwk/wutils.py @@ -124,12 +124,18 @@ def initDLL(): # For new versions of python, DLLs must be loaded via a specific command import platform, os, sys if 'Windows' in platform.uname() and sys.version_info.minor >= 8: - lookfor = ['tbb', 'mkl', 'vtk'] + lookfor = ['tbb', 'mkl', 'vtk', 'mumps', 'compiler'] for k in lookfor: + print(f'[initDLL] looking for {k}') + found=False for v in os.environ['path'].split(';'): if k in v.lower(): + print(f'[initDLL]\tos.add_dll_directory("{v}")') os.add_dll_directory(v) + found=True break + if not found: + print('[initDLL]**WARNING: {k} dll path not found!') # ------------------------------------------------------------------------------ @@ -158,7 +164,7 @@ def initMKL(verb=False): for s in ['OMP', 'MKL', 'KMP']: print('* %s environment:' % s) for key, value in os.environ.items(): - if s in key: + if s+'_' in key: print(' %s = %s' % (key, value)) print('')