Commit 4d0e38cd authored by Joubert, Wayne's avatar Joubert, Wayne
Browse files

scalapack minor adjustments.

parent fb7c9489
......@@ -439,9 +439,9 @@ def make_binary(build_dir_path, test):
'FCLOADER = pgf90'],
['FCLOADFLAGS = ..FCFLAGS.',
'FCLOADFLAGS = $(FCFLAGS) ' +
('-Wl,-z,muldefs -Wl,-Map,out_linkmap.txt ' + ldflags + ' ' +
esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
('-Wl,-z,muldefs -Wl,-Map,out_linkmap.txt ' +
esslflags + ' ' + laflags + ' ' + ldflags
if use_syslapack(test) else laflags + ' ' + ldflags)],
['CCLOADFLAGS = ..CCFLAGS.', 'CCLOADFLAGS = $(FCLOADFLAGS)'],
['BLASLIB = -lblas',
'BLASLIB = ' +
......@@ -463,7 +463,7 @@ def make_binary(build_dir_path, test):
#--------------------
laflags = '-' + 'L' + lapack_dir_path
esslflags = '-lessl'
#---Module dir needed vy xlf.
#---Module dir needed by xlf.
fmod_dir_path = os.path.join(build_dir_path, 'scalapack',
'mpfort_fmod')
#---blas/lapack files not in essl needed by scalapack.
......@@ -477,12 +477,19 @@ def make_binary(build_dir_path, test):
['CCFLAGS = -O3', 'CCFLAGS = -O3 -compiler xlc'],
['NOOPT = -O0',
'NOOPT = -O0 -compiler xlf95 -qfixed -qnosave'],
['FCLOADFLAGS = ..FCFLAGS.',
'FCLOADFLAGS = $(FCFLAGS) -qnosave ' +
('-Wl,-z,muldefs -Wl,-Map,out_linkmap.txt ' + ' -lgfortran ' +
esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['CCLOADFLAGS = ..CCFLAGS.', 'CCLOADFLAGS = $(FCLOADFLAGS)'],
['CCLOADFLAGS = ..CCFLAGS.',
'CCLOADFLAGS = $(CCFLAGS) -qnosave ' +
('-Wl,-z,muldefs -Wl,-Map,out_linkmap.txt ' + ' -lgfortran ' +
esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['BLASLIB = -lblas',
'BLASLIB = ' +
('-lessl -lblas' if use_syslapack(test) else '-lblas')],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment