[fix] MatrixVectorFloat4 set/get accesses fixed

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/collections/VectorFloat4.java

@@ -30,7 +30,7 @@ public final class VectorFloat4 implements TornadoCollectionInterface<FloatBuffe
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
     /**
      * number of elements in the storage.
      */
@@ -44,7 +44,7 @@ public final class VectorFloat4 implements TornadoCollectionInterface<FloatBuffe
      * @param array
      *     Array to be stored
      */
-    protected VectorFloat4(int numElements, FloatArray array) {
+    private VectorFloat4(int numElements, FloatArray array) {
         this.numElements = numElements;
         this.storage = array;
     }

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/images/ImageByte3.java

@@ -32,15 +32,15 @@ public final class ImageByte3 implements TornadoImagesInterface<ByteBuffer> {
     /**
      * backing array.
      */
-    protected final ByteArray storage;
+    private final ByteArray storage;
     /**
      * Number of rows.
      */
-    protected final int Y;
+    private final int Y;
     /**
      * Number of columns.
      */
-    protected final int X;
+    private final int X;
     /**
      * number of elements in the storage.
      */

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/images/ImageByte4.java

@@ -33,15 +33,15 @@ public final class ImageByte4 implements TornadoImagesInterface<ByteBuffer> {
     /**
      * backing array.
      */
-    protected final ByteArray storage;
+    private final ByteArray storage;
     /**
      * Number of rows.
      */
-    protected final int Y;
+    private final int Y;
     /**
      * Number of columns.
      */
-    protected final int X;
+    private final int X;
     /**
      * number of elements in the storage.
      */

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/images/ImageFloat.java

@@ -31,15 +31,15 @@ public final class ImageFloat implements TornadoImagesInterface<FloatBuffer> {
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
     /**
      * Number of rows.
      */
-    protected final int Y;
+    private final int Y;
     /**
      * Number of columns.
      */
-    protected final int X;
+    private final int X;
     /**
      * number of elements in the storage.
      */

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/images/ImageFloat3.java

@@ -32,15 +32,15 @@ public final class ImageFloat3 implements TornadoImagesInterface<FloatBuffer> {
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
     /**
      * Number of rows.
      */
-    protected final int Y;
+    private final int Y;
     /**
      * Number of columns.
      */
-    protected final int X;
+    private final int X;
     /**
      * number of elements in the storage.
      */

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/images/ImageFloat4.java

@@ -32,15 +32,15 @@ public final class ImageFloat4 implements TornadoImagesInterface<FloatBuffer> {
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
     /**
      * Number of rows.
      */
-    protected final int Y;
+    private final int Y;
     /**
      * Number of columns.
      */
-    protected final int X;
+    private final int X;
     /**
      * number of elements in the storage.
      */

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/images/ImageFloat8.java

@@ -32,15 +32,15 @@ public final class ImageFloat8 implements TornadoImagesInterface<FloatBuffer> {
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
     /**
      * Number of rows.
      */
-    protected final int Y;
+    private final int Y;
     /**
      * Number of columns.
      */
-    protected final int X;
+    private final int X;
     /**
      * number of elements in the storage.
      */

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/matrix/Matrix2DDouble.java

@@ -30,7 +30,7 @@ public final class Matrix2DDouble extends Matrix2DType implements TornadoMatrixI
     /**
      * backing array.
      */
-    protected final DoubleArray storage;
+    private final DoubleArray storage;
 
     /**
      * number of elements in the storage.
@@ -103,23 +103,22 @@ public void set(int i, int j, double value) {
     }
 
     public VectorDouble row(int row) {
-        int index = toRowMajor(row, 0, COLUMNS);
-        int from = index;
-        int to = getFinalIndexOfRange(index);
-        int size = to - from;
+        int baseIndex = toRowMajor(row, 0, COLUMNS);
+        int to = getFinalIndexOfRange(baseIndex);
+        int size = to - baseIndex;
         DoubleArray f = new DoubleArray(size);
         int j = 0;
-        for (int i = from; i < to; i++, j++) {
+        for (int i = baseIndex; i < to; i++, j++) {
             f.set(j, storage.get(i));
         }
         return new VectorDouble(COLUMNS, f);
     }
 
     public VectorDouble column(int col) {
-        int index = StorageFormats.toRowMajor(0, col, COLUMNS);
+        int baseIndex = StorageFormats.toRowMajor(0, col, COLUMNS);
         final VectorDouble v = new VectorDouble(ROWS);
         for (int i = 0; i < ROWS; i++) {
-            v.set(i, storage.get(index + (i * COLUMNS)));
+            v.set(i, storage.get(baseIndex + (i * COLUMNS)));
         }
         return v;
     }

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/matrix/Matrix2DFloat.java

@@ -31,7 +31,7 @@ public final class Matrix2DFloat extends Matrix2DType implements TornadoMatrixIn
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
 
     /**
      * number of elements in the storage.
@@ -110,13 +110,12 @@ public void set(int i, int j, float value) {
     }
 
     public VectorFloat row(int row) {
-        int index = toRowMajor(row, 0, COLUMNS);
-        int from = index;
-        int to = getFinalIndexOfRange(index);
-        int size = to - from;
+        int baseIndex = toRowMajor(row, 0, COLUMNS);
+        int to = getFinalIndexOfRange(baseIndex);
+        int size = to - baseIndex;
         FloatArray f = new FloatArray(size);
         int j = 0;
-        for (int i = from; i < to; i++) {
+        for (int i = baseIndex; i < to; i++) {
             f.set(j, storage.get(i));
             j++;
         }

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/matrix/Matrix2DFloat4.java

@@ -37,7 +37,7 @@ public final class Matrix2DFloat4 extends Matrix2DType implements TornadoMatrixI
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
     /**
      * number of elements in the storage.
      */

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/matrix/Matrix2DInt.java

@@ -27,10 +27,11 @@
 import uk.ac.manchester.tornado.api.types.utils.StorageFormats;
 
 public final class Matrix2DInt extends Matrix2DType implements TornadoMatrixInterface<IntBuffer> {
+
     /**
      * backing array.
      */
-    protected final IntArray storage;
+    private final IntArray storage;
 
     /**
      * number of elements in the storage.
@@ -109,13 +110,12 @@ public void set(int i, int j, int value) {
     }
 
     public VectorInt row(int row) {
-        int index = toRowMajor(row, 0, COLUMNS);
-        int from = index;
-        int to = getFinalIndexOfRange(index);
-        int size = to - from;
+        int baseIndex = toRowMajor(row, 0, COLUMNS);
+        int to = getFinalIndexOfRange(baseIndex);
+        int size = to - baseIndex;
         IntArray f = new IntArray(size);
         int j = 0;
-        for (int i = from; i < to; i++) {
+        for (int i = baseIndex; i < to; i++) {
             f.set(j, storage.get(i));
             j++;
         }
@@ -157,20 +157,6 @@ public void multiply(Matrix2DInt a, Matrix2DInt b) {
         }
     }
 
-    public void tmultiply(Matrix2DInt a, Matrix2DInt b) {
-        System.out.printf("tmult: M=%d (expect %d)\n", getNumRows(), a.getNumRows());
-        System.out.printf("tmult: N=%d (expect %d)\n", getNumColumns(), b.getNumRows());
-        for (int row = 0; row < getNumRows(); row++) {
-            for (int col = 0; col < b.getNumRows(); col++) {
-                int sum = 0;
-                for (int k = 0; k < b.getNumColumns(); k++) {
-                    sum += a.get(row, k) * b.get(col, k);
-                }
-                set(row, col, sum);
-            }
-        }
-    }
-
     public Matrix2DInt duplicate() {
         Matrix2DInt matrix = new Matrix2DInt(ROWS, COLUMNS);
         matrix.set(this);

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/matrix/Matrix3DFloat.java

@@ -28,7 +28,7 @@ public final class Matrix3DFloat extends Matrix3DType implements TornadoMatrixIn
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
 
     /**
      * number of elements in the storage.

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/matrix/Matrix4x4Float.java

@@ -31,19 +31,19 @@ public final class Matrix4x4Float implements TornadoMatrixInterface<FloatBuffer>
     /**
      * Number of rows.
      */
-    protected static final int ROWS = 4;
+    private static final int ROWS = 4;
     /**
      * Number of columns.
      */
-    protected static final int COLUMNS = 4;
+    private static final int COLUMNS = 4;
     /**
      * number of elements in the storage.
      */
     private static final int NUM_ELEMENTS = 16;
     /**
      * backing array.
      */
-    protected final FloatArray storage;
+    private final FloatArray storage;
 
     public Matrix4x4Float() {
         this(new FloatArray(NUM_ELEMENTS));

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/utils/StorageFormats.java

@@ -38,6 +38,7 @@ private StorageFormats() {
      *     length of a column
      * @return int
      */
+    @Deprecated
     public static int toColumnMajor(int i, int j, int ld) {
         return (j * ld) + i;
     }
@@ -49,16 +50,16 @@ public static int toColumnMajor(int i, int j, int ld) {
      *     row index
      * @param j
      *     column index
-     * @param yMax
+     * @param numColumns
      *     length of a row
      * @return int
      */
-    public static int toRowMajor(int i, int j, int yMax) {
-        return (i * yMax) + j;
+    public static int toRowMajor(int i, int j, int numColumns) {
+        return (i * numColumns) + j;
     }
 
     public static int toRowMajorVector(int i, int j, int numColumns, int vectorElements) {
-        return (i * numColumns * vectorElements) + j;
+        return ((i * numColumns) + j) * vectorElements;
     }
 
     public static int toRowMajor3D(int i, int j, int k, int zMax, int yMax) {

tornado-api/src/main/java/uk/ac/manchester/tornado/api/types/volumes/VolumeShort2.java

@@ -30,19 +30,19 @@ public final class VolumeShort2 implements TornadoVolumesInterface<ShortBuffer>
     /**
      * backing array.
      */
-    protected final ShortArray storage;
+    private final ShortArray storage;
     /**
      * Size in Y dimension.
      */
-    protected final int Y;
+    private final int Y;
     /**
      * Size in X dimension.
      */
-    protected final int X;
+    private final int X;
     /**
      * Size in Y dimension.
      */
-    protected final int Z;
+    private final int Z;
     /**
      * number of elements in the storage.
      */

tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/graal/compiler/plugins/OCLVectorPlugins.java

@@ -365,7 +365,6 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 return true;
             }
         });
-
     }
 
     static void registerParameterPlugins(Plugins plugins) {

tornado-examples/src/main/java/uk/ac/manchester/tornado/examples/compute/MatrixVector.java

@@ -61,10 +61,10 @@ public class MatrixVector {
     public static final int MAX_ITERATIONS = 100;
 
     private static void computeMatrixVector(Matrix2DFloat matrix, VectorFloat vector, VectorFloat output) {
-        for (@Parallel int i = 0; i < vector.size(); i++) {
+        for (@Parallel int i = 0; i < matrix.getNumRows(); i++) {
             float sum = 0.0f;
             for (int j = 0; j < matrix.getNumColumns(); j++) {
-                sum += vector.get(i) * matrix.get(i, i);
+                sum += matrix.get(i, j) * vector.get(j);
             }
             output.set(i, sum);
         }
@@ -77,7 +77,8 @@ public static void main(String[] args) {
             try {
                 size = Integer.parseInt(args[0]);
             } catch (NumberFormatException numberFormatException) {
-                size = 8192;
+                numberFormatException.printStackTrace();
+                throw new NullPointerException();
             }
         }