Small refactoring change.

Author: isazi

kernel_tuner/utils/directives.py

@@ -369,7 +369,7 @@ def wrap_timing_fortran(code: str) -> str:
 
 def end_timing_cxx(code: str) -> str:
     """In C++ we need to return the measured time"""
-    return code + "\nreturn elapsed_time.count();\n"
+    return "\n".join([code, "return elapsed_time.count();\n"])
 
 
 def wrap_data(code: str, langs: Code, data: dict, preprocessor: list = None, user_dimensions: dict = None) -> str:
@@ -385,7 +385,7 @@ def wrap_data(code: str, langs: Code, data: dict, preprocessor: list = None, use
             elif is_openacc(langs.directive) and is_fortran(langs.language):
                 intro += create_data_directive_openacc_fortran(name, size)
                 outro += exit_data_directive_openacc_fortran(name, size)
-    return intro + code + outro
+    return "\n".join([intro, code, outro])
 
 
 def extract_directive_code(code: str, langs: Code, kernel_name: str = None) -> dict:

test/utils/test_directives.py

@@ -105,13 +105,13 @@ def test_wrap_data():
     code_f90 = "! this is a comment\n"
     data = {"array": ["int*", "size"]}
     preprocessor = ["#define size 42"]
-    expected_cxx = "#pragma acc enter data create(array[:42])\n#pragma acc update device(array[:42])\n// this is a comment\n#pragma acc exit data copyout(array[:42])\n"
+    expected_cxx = "#pragma acc enter data create(array[:42])\n#pragma acc update device(array[:42])\n\n// this is a comment\n\n#pragma acc exit data copyout(array[:42])\n"
     assert wrap_data(code_cxx, acc_cxx, data, preprocessor, None) == expected_cxx
-    expected_f90 = "!$acc enter data create(array(:42))\n!$acc update device(array(:42))\n! this is a comment\n!$acc exit data copyout(array(:42))\n"
+    expected_f90 = "!$acc enter data create(array(:42))\n!$acc update device(array(:42))\n\n! this is a comment\n\n!$acc exit data copyout(array(:42))\n"
     assert wrap_data(code_f90, acc_f90, data, preprocessor, None) == expected_f90
     data = {"matrix": ["float*", "rows,cols"]}
     preprocessor = ["#define rows 42", "#define cols 84"]
-    expected_f90 = "!$acc enter data create(matrix(:42,:84))\n!$acc update device(matrix(:42,:84))\n! this is a comment\n!$acc exit data copyout(matrix(:42,:84))\n"
+    expected_f90 = "!$acc enter data create(matrix(:42,:84))\n!$acc update device(matrix(:42,:84))\n\n! this is a comment\n\n!$acc exit data copyout(matrix(:42,:84))\n"
     assert wrap_data(code_f90, acc_f90, data, preprocessor, None) == expected_f90
     dimensions = {"rows": 42, "cols": 84}
     assert wrap_data(code_f90, acc_f90, data, user_dimensions=dimensions) == expected_f90