From 1f07c5b0f874b827187b8004301592a8216d8967 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 10 Mar 2023 11:35:05 +0100 Subject: [PATCH] Temporarily add missing lib dirs on Cray --- conda/bootstrap.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/conda/bootstrap.py b/conda/bootstrap.py index d28c53d4e5..d9da7d1d20 100755 --- a/conda/bootstrap.py +++ b/conda/bootstrap.py @@ -385,8 +385,9 @@ def get_env_vars(machine, compiler, mpilib): return env_vars -def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env, - spack_base, spack_template_path, env_vars, tmpdir, logger): +def build_spack_env(config, update_spack, machine, compiler, mpi, # noqa: C901 + spack_env, spack_base, spack_template_path, env_vars, + tmpdir, logger): albany = config.get('deploy', 'albany') cmake = config.get('deploy', 'cmake') @@ -480,11 +481,24 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env, mpicxx = '-lmpi_cxx' else: mpicxx = '' + + # hopefully a temporary fix until Albany handles this itself + if machine == 'chicoma-cpu': + cray_libs = \ + '-L/opt/cray/xpmem/2.4.4-2.3_13.8__gff0e1d9.shasta/lib64 ' \ + '-L/opt/cray/pe/dsmml/0.2.2/dsmml/lib' + elif machine == 'pm-cpu': + cray_libs = \ + '-L/opt/cray/xpmem/2.5.2-2.4_3.30__gd0f7936.shasta/lib64 ' \ + '-L/opt/cray/pe/dsmml/0.2.2/dsmml/lib' + else: + cray_libs = '' + env_vars = \ f'{env_vars}' \ f'export {albany_flags}\n' \ f'export MPAS_EXTERNAL_LIBS="${{MPAS_EXTERNAL_LIBS}} ' \ - f'${{ALBANY_LINK_LIBS}} {stdcxx} {mpicxx}"\n' + f'{cray_libs} ${{ALBANY_LINK_LIBS}} {stdcxx} {mpicxx}"\n' if lapack != 'None': env_vars = f'{env_vars}' \