Added tests and fixed a bug in moving data.

Author: isazi

kernel_tuner/utils/directives.py

@@ -347,13 +347,8 @@ def wrap_data(code: str, langs: Code, data: dict, preprocessor: list = None, use
                 intro += create_data_directive_openacc_cxx(name, size)
                 outro += exit_data_directive_openacc_cxx(name, size)
             elif is_openacc(langs.directive) and is_fortran(langs.language):
-                if "," in data[name][1]:
-                    # Multi dimensional
-                    pass
-                else:
-                    # One dimensional
-                    intro += create_data_directive_openacc_fortran(name, size)
-                    outro += exit_data_directive_openacc_fortran(name, size)
+                intro += create_data_directive_openacc_fortran(name, size)
+                outro += exit_data_directive_openacc_fortran(name, size)
     return intro + code + outro
 
 

test/utils/test_directives.py

@@ -109,6 +109,14 @@ def test_wrap_data():
     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"
     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"
+    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
+    assert wrap_data(code_f90, acc_f90, data, preprocessor=[], user_dimensions=dimensions) == expected_f90
+
 
 
 def test_extract_directive_code():