Skip to content

Commit c49b93a

Browse files
committed
Minor refactoring.
1 parent e9636b3 commit c49b93a

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

kernel_tuner/utils/directives.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,59 +63,59 @@ def is_fortran(lang: Language) -> bool:
6363
return isinstance(lang, Fortran)
6464

6565

66-
def line_contains_pragma(line: str, lang: Language) -> bool:
66+
def line_contains_openacc_pragma(line: str, lang: Language) -> bool:
6767
"""Check if line contains OpenACC pragma or not"""
6868
if is_cxx(lang):
69-
return line_contains_pragma_cxx(line)
69+
return line_contains_openacc_pragma_cxx(line)
7070
elif is_fortran(lang):
71-
return line_contains_pragma_fortran(line)
71+
return line_contains_openacc_pragma_fortran(line)
7272
return False
7373

7474

75-
def line_contains_pragma_cxx(line: str) -> bool:
75+
def line_contains_openacc_pragma_cxx(line: str) -> bool:
7676
"""Check if a line of code contains a C++ OpenACC pragma or not"""
7777
return "#pragma acc" in line
7878

7979

80-
def line_contains_pragma_fortran(line: str) -> bool:
80+
def line_contains_openacc_pragma_fortran(line: str) -> bool:
8181
"""Check if a line of code contains a Fortran OpenACC pragma or not"""
8282
return "!$acc" in line
8383

8484

85-
def create_data_directive(name: str, size: int, lang: Language) -> str:
85+
def create_data_directive_openacc(name: str, size: int, lang: Language) -> str:
8686
"""Create a data directive for a given language"""
8787
if is_cxx(lang):
88-
return create_data_directive_cxx(name, size)
88+
return create_data_directive_openacc_cxx(name, size)
8989
elif is_fortran(lang):
90-
return create_data_directive_fortran(name, size)
90+
return create_data_directive_openacc_fortran(name, size)
9191
return ""
9292

9393

94-
def create_data_directive_cxx(name: str, size: int) -> str:
94+
def create_data_directive_openacc_cxx(name: str, size: int) -> str:
9595
"""Create C++ OpenACC code to allocate and copy data"""
9696
return f"#pragma acc enter data create({name}[:{size}])\n#pragma acc update device({name}[:{size}])\n"
9797

9898

99-
def create_data_directive_fortran(name: str, size: int) -> str:
99+
def create_data_directive_openacc_fortran(name: str, size: int) -> str:
100100
"""Create Fortran OpenACC code to allocate and copy data"""
101101
return f"!$acc enter data create({name}(:{size}))\n!$acc update device({name}(:{size}))\n"
102102

103103

104-
def exit_data_directive(name: str, size: int, lang: Language) -> str:
104+
def exit_data_directive_openacc(name: str, size: int, lang: Language) -> str:
105105
"""Create code to copy data back for a given language"""
106106
if is_cxx(lang):
107-
return exit_data_directive_cxx(name, size)
107+
return exit_data_directive_openacc_cxx(name, size)
108108
elif is_fortran(lang):
109-
return exit_data_directive_fortran(name, size)
109+
return exit_data_directive_openacc_fortran(name, size)
110110
return ""
111111

112112

113-
def exit_data_directive_cxx(name: str, size: int) -> str:
113+
def exit_data_directive_openacc_cxx(name: str, size: int) -> str:
114114
"""Create C++ OpenACC code to copy back data"""
115115
return f"#pragma acc exit data copyout({name}[:{size}])\n"
116116

117117

118-
def exit_data_directive_fortran(name: str, size: int) -> str:
118+
def exit_data_directive_openacc_fortran(name: str, size: int) -> str:
119119
"""Create Fortran OpenACC code to copy back data"""
120120
return f"!$acc exit data copyout({name}(:{size}))\n"
121121

@@ -251,17 +251,17 @@ def wrap_data(code: str, langs: Code, data: dict, preprocessor: list, user_dimen
251251
if "*" in data[name][0]:
252252
size = parse_size(data[name][1], preprocessor=preprocessor, dimensions=user_dimensions)
253253
if is_openacc(langs.directive) and is_cxx(langs.language):
254-
intro += create_data_directive_cxx(name, size)
254+
intro += create_data_directive_openacc_cxx(name, size)
255255
elif is_openacc(langs.directive) and is_fortran(langs.language):
256-
intro += create_data_directive_fortran(name, size)
256+
intro += create_data_directive_openacc_fortran(name, size)
257257
outro = str()
258258
for name in data.keys():
259259
if "*" in data[name][0]:
260260
size = parse_size(data[name][1], preprocessor=preprocessor, dimensions=user_dimensions)
261261
if is_openacc(langs.directive) and is_cxx(langs.language):
262-
outro += exit_data_directive_cxx(name, size)
262+
outro += exit_data_directive_openacc_cxx(name, size)
263263
elif is_openacc(langs.directive) and is_fortran(langs.language):
264-
outro += exit_data_directive_fortran(name, size)
264+
outro += exit_data_directive_openacc_fortran(name, size)
265265
return intro + code + outro
266266

267267

test/utils/test_directives.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@ def test_is_fortran():
2323
def test_line_contains_pragma():
2424
cxx_code = "int main(void) {\n#pragma acc parallel}"
2525
f90_code = "!$acc parallel"
26-
assert line_contains_pragma(cxx_code, Cxx())
27-
assert not line_contains_pragma(f90_code, Cxx())
28-
assert line_contains_pragma(f90_code, Fortran())
29-
assert not line_contains_pragma(cxx_code, Fortran())
26+
assert line_contains_openacc_pragma(cxx_code, Cxx())
27+
assert not line_contains_openacc_pragma(f90_code, Cxx())
28+
assert line_contains_openacc_pragma(f90_code, Fortran())
29+
assert not line_contains_openacc_pragma(cxx_code, Fortran())
3030

3131

3232
def test_create_data_directive():
3333
assert (
34-
create_data_directive("array", 1024, Cxx())
35-
== "#pragma acc enter data create(array[:1024])\n#pragma acc update device(array[:1024])\n"
34+
create_data_directive_openacc("array", 1024, Cxx())
35+
== "#pragma acc enter data create(array[:1024])\n#pragma acc update device(array[:1024])\n"
3636
)
3737
assert (
38-
create_data_directive("matrix", 35, Fortran())
39-
== "!$acc enter data create(matrix(:35))\n!$acc update device(matrix(:35))\n"
38+
create_data_directive_openacc("matrix", 35, Fortran())
39+
== "!$acc enter data create(matrix(:35))\n!$acc update device(matrix(:35))\n"
4040
)
4141

4242

4343
def test_exit_data_directive():
44-
assert exit_data_directive("array", 1024, Cxx()) == "#pragma acc exit data copyout(array[:1024])\n"
45-
assert exit_data_directive("matrix", 35, Fortran()) == "!$acc exit data copyout(matrix(:35))\n"
44+
assert exit_data_directive_openacc("array", 1024, Cxx()) == "#pragma acc exit data copyout(array[:1024])\n"
45+
assert exit_data_directive_openacc("matrix", 35, Fortran()) == "!$acc exit data copyout(matrix(:35))\n"
4646

4747

4848
def test_correct_kernel():

0 commit comments

Comments
 (0)