Skip to content

Commit

Permalink
Temporarily add missing lib dirs on Cray
Browse files Browse the repository at this point in the history
  • Loading branch information
xylar committed Mar 10, 2023
1 parent 4c5c6ff commit 1f07c5b
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions conda/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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}' \
Expand Down

0 comments on commit 1f07c5b

Please sign in to comment.