Merge pull request #84 from AdaCore/review_tutorial

Review tutorial

Author: ohenley

doc/tutorial.rst

@@ -58,11 +58,11 @@ second to make the next steps meaningful.
 This code is currently fully native and single treaded. We're going to offload
 the computation to the GPU.
 
-Open ``src/common/kernel.ads``. You'll see the specification of ``Native_Complex_Computation``:
+Open ``src/common/kernel.ads``. You'll see the specification of ``Complex_Computation``:
 
 .. code-block:: ada
 
-  procedure Native_Complex_Computation
+  procedure Complex_Computation
      (A : Float_Array;
       B : Float_Array;
       C : out Float_Array;
@@ -86,8 +86,8 @@ Introduce a new pointer type in the ``Kernel`` package:
     type Array_Device_Access is access Float_Array
        with Designated_Storage_Model => CUDA.Storage_Models.Model;
 
-Note that this pointer has to be pool specific - e.g. it can't have the ``all``
-Ada reservered word. That means that it conceptually points to a specific
+Note that this pointer has to be pool specific - e.g. it can't be an ``access all``. 
+That means that it conceptually points to a specific
 pool of data - the device memory - and that conversions with other
 pointers types are not allowed.
 
@@ -139,7 +139,7 @@ and thread index:
 Note that these are expressed in terms of Interfaces.C.int, so the result
 needs to be converted explicly to Integer.
 
-From there, the call to ``Native_Complex_Computation`` is trivial. The whole
+From there, the call to ``Complex_Computation`` is trivial. The whole
 kernel should now look like:
 
 .. code-block:: ada
@@ -151,7 +151,7 @@ kernel should now look like:
    is
       I : Integer := Integer (Block_Dim.X * Block_IDx.X + Thread_IDx.X);
    begin
-      Native_Complex_Computation (A.all, B.all, C.all, I);
+      Complex_Computation (A.all, B.all, C.all, I);
    end Device_Complex_Computation;
 
 We're done with the kernel - let's move to the host code. Open ``src/host/main.adb``.

tutorial/src/common/kernel.adb

@@ -3,11 +3,8 @@ with Interfaces.C;     use Interfaces.C;
 
 package body Kernel is
 
-    procedure Native_Complex_Computation
-     (A : Float_Array;
-      B : Float_Array;
-      C : out Float_Array;
-      I : Integer)
+   procedure Complex_Computation
+     (A : Float_Array; B : Float_Array; C : out Float_Array; I : Integer)
    is
    begin
       if I < A'Length then
@@ -17,6 +14,6 @@ package body Kernel is
             end loop;
          end loop;
       end if;
-   end Native_Complex_Computation;
+   end Complex_Computation;
 
 end Kernel;

tutorial/src/common/kernel.ads

@@ -4,9 +4,9 @@ with CUDA.Storage_Models; use CUDA.Storage_Models;
 
 package Kernel is
 
-   type Float_Array is array (Integer range <>) of Float;
+  type Float_Array is array (Integer range <>) of Float;
 
-   procedure Native_Complex_Computation
+   procedure Complex_Computation
      (A : Float_Array;
       B : Float_Array;
       C : out Float_Array;

tutorial/src/host/main.adb

@@ -48,7 +48,7 @@ begin
    T0 := Clock;
 
    for I in 0 .. Num_Elements - 1 loop
-      Native_Complex_Computation (H_A.all, H_B.all, H_C.all, I);
+      Complex_Computation (H_A.all, H_B.all, H_C.all, I);
    end loop;
 
    Lapsed := Clock - T0;

tutorial/src_completed/common/kernel.adb

@@ -3,7 +3,7 @@ with Interfaces.C;     use Interfaces.C;
 
 package body Kernel is
 
-    procedure Native_Complex_Computation
+    procedure Complex_Computation
      (A : Float_Array;
       B : Float_Array;
       C : out Float_Array;
@@ -17,7 +17,7 @@ package body Kernel is
             end loop;
          end loop;
       end if;
-   end Native_Complex_Computation;
+   end Complex_Computation;
 
    procedure Device_Complex_Computation
      (A : Array_Device_Access;
@@ -26,7 +26,7 @@ package body Kernel is
    is
       I : Integer := Integer (Block_Dim.X * Block_IDx.X + Thread_IDx.X);
    begin
-      Native_Complex_Computation (A.all, B.all, C.all, I);
+      Complex_Computation (A.all, B.all, C.all, I);
    end Device_Complex_Computation;
 
 end Kernel;

tutorial/src_completed/common/kernel.ads

@@ -9,7 +9,7 @@ package Kernel is
    type Array_Device_Access is access Float_Array
      with Designated_Storage_Model => CUDA.Storage_Models.Model;
 
-    procedure Native_Complex_Computation
+    procedure Complex_Computation
      (A : Float_Array;
       B : Float_Array;
       C : out Float_Array;

tutorial/src_completed/host/main.adb

@@ -55,7 +55,7 @@ begin
    T0 := Clock;
 
    for I in 0 .. Num_Elements - 1 loop
-      Native_Complex_Computation (H_A.all, H_B.all, H_C.all, I);
+      Complex_Computation (H_A.all, H_B.all, H_C.all, I);
    end loop;
 
    Lapsed := Clock - T0;