Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use a pythonic "SED" and fix some unknown exception #170

Merged
merged 2 commits into from
Mar 2, 2023
Merged

Use a pythonic "SED" and fix some unknown exception #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ddbe9
Update setup.py to patch SED.
tbridel Jan 12, 2023
e03ea03
Quick fix in exception catching
tbridel Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mfem/common/numba_coefficient.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ try:
jit = _JIT()
except ImportError:
pass
except BaseError:
except BaseException:
assert False, "Failed setting Numba signatures by an error other than ImportError"

def _scalar(func, td=False, params=None, complex=False, dependency=None,
Expand Down
39 changes: 20 additions & 19 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,28 +608,29 @@ def make_metis(use_int64=False, use_real64=False):

pwd = chdir(path)

sed_command = find_command('sed')
if sed_command is None:
assert False, "sed is not foudn"

if use_int64:
command = [sed_command, '-i',
's/#define IDXTYPEWIDTH 32/#define IDXTYPEWIDTH 64/g',
'include/metis.h']
pattern_int = "#define IDXTYPEWIDTH 32"
replace_int = "#define IDXTYPEWIDTH 64"
else:
command = [sed_command, '-i',
's/#define IDXTYPEWIDTH 64/#define IDXTYPEWIDTH 32/g',
'include/metis.h']
pattern_int = "#define IDXTYPEWIDTH 64"
replace_int = "#define IDXTYPEWIDTH 32"
with open("include/metis.h", "r") as metis_header_fid:
metis_header_lines = metis_header_fid.readlines()
with open("include/metis.h", "w") as metis_header_fid:
for line in metis_header_lines:
metis_header_fid.write(re.sub(pattern_int, replace_int, line))

if use_real64:
command = [sed_command, '-i',
's/#define REALTYPEWIDTH 32/#define REALTYPEWIDTH 64/g',
'include/metis.h']
pattern_real = "#define REALTYPEWIDTH 32"
replace_real = "#define REALTYPEWIDTH 64"
else:
command = [sed_command, '-i',
's/#define REALTYPEWIDTH 64/#define REALTYPEWIDTH 32/g',
'include/metis.h']
make_call(command)
pattern_real = "#define REALTYPEWIDTH 64"
replace_real = "#define REALTYPEWIDTH 32"
with open("include/metis.h", "r") as metis_header_fid:
metis_header_lines = metis_header_fid.readlines()
with open("include/metis.h", "w") as metis_header_fid:
for line in metis_header_lines:
metis_header_fid.write(re.sub(pattern_real, replace_real, line))

command = ['make', 'config', 'shared=1',
'prefix=' + metis_prefix,
Expand Down Expand Up @@ -1669,10 +1670,10 @@ def run(self):
if use_metis_gklib:
gitclone('gklib', use_sha=True)
gitclone('metis', use_sha=True)
make_metis(use_int64=metis_64)
make_metis(use_int64=metis_64, use_real64=metis_64)
else:
download('metis')
make_metis(use_int64=metis_64)
make_metis(use_int64=metis_64, use_real64=metis_64)

if build_hypre:
download('hypre')
Expand Down