Updated examples.

Author: isazi

examples/directives/vector_add_c_openacc.py

@@ -3,14 +3,16 @@
 
 from kernel_tuner import tune_kernel
 from kernel_tuner.utils.directives import (
+    Code,
+    OpenACC,
+    Cxx,
     extract_directive_signature,
     extract_directive_code,
     extract_preprocessor,
     generate_directive_function,
     extract_directive_data,
     allocate_signature_memory,
 )
-from collections import OrderedDict
 
 code = """
 #include <stdlib.h>
@@ -38,15 +40,16 @@
 """
 
 # Extract tunable directive
+app = Code(OpenACC(), Cxx())
 preprocessor = extract_preprocessor(code)
-signature = extract_directive_signature(code)
-body = extract_directive_code(code)
+signature = extract_directive_signature(code, app)
+body = extract_directive_code(code, app)
 # Allocate memory on the host
-data = extract_directive_data(code)
+data = extract_directive_data(code, app)
 args = allocate_signature_memory(data["vector_add"], preprocessor)
 # Generate kernel string
 kernel_string = generate_directive_function(
-    preprocessor, signature["vector_add"], body["vector_add"], data=data["vector_add"]
+    preprocessor, signature["vector_add"], body["vector_add"], app, data=data["vector_add"]
 )
 
 tune_params = dict()

examples/directives/vector_add_fortran_openacc.py

@@ -3,14 +3,16 @@
 
 from kernel_tuner import tune_kernel
 from kernel_tuner.utils.directives import (
+    Code,
+    OpenACC,
+    Fortran,
     extract_directive_signature,
     extract_directive_code,
     extract_preprocessor,
     generate_directive_function,
     extract_directive_data,
     allocate_signature_memory,
 )
-from collections import OrderedDict
 
 code = """
 #define VECTOR_SIZE 1000000
@@ -33,18 +35,19 @@
 """
 
 # Extract tunable directive
+app = Code(OpenACC(), Fortran())
 preprocessor = extract_preprocessor(code)
-signature = extract_directive_signature(code)
-body = extract_directive_code(code)
+signature = extract_directive_signature(code, app)
+body = extract_directive_code(code, app)
 # Allocate memory on the host
-data = extract_directive_data(code)
+data = extract_directive_data(code, app)
 args = allocate_signature_memory(data["vector_add"], preprocessor)
 # Generate kernel string
 kernel_string = generate_directive_function(
-    preprocessor, signature["vector_add"], body["vector_add"], data=data["vector_add"]
+    preprocessor, signature["vector_add"], body["vector_add"], app, data=data["vector_add"]
 )
 
-tune_params = OrderedDict()
+tune_params = dict()
 tune_params["nthreads"] = [32 * i for i in range(1, 33)]
 metrics = dict()
 metrics["GB/s"] = lambda x: ((2 * 4 * len(args[0])) + (4 * len(args[0]))) / (x["time"] / 10**3) / 10**9