Future proofing the JNI code

pavanky · pavanky · commit 0879ed62e663 · 2014-03-03T02:09:57.000-05:00
Always send dimension array of length 4
diff --git a/com/arrayfire/Array.java b/com/arrayfire/Array.java
@@ -83,7 +83,11 @@ public Array(int[] dims) throws Exception {
         } else if ( dims.length > 3 ) {
             throw new Exception("Upto 3 dimensions only supported for now.");
         }
-        this.ref = createArray(dims);
+        int[] adims;
+        adims = new int[] {1, 1, 1, 1};
+        for (int i = 0; i < dims.length; i++) adims[i] = dims[i];
+
+        this.ref = createArray(adims);
     }
 
     public Array(int[] dims, float[] elems) throws Exception {
@@ -98,7 +102,12 @@ public Array(int[] dims, float[] elems) throws Exception {
         if( elems.length > total_size || elems.length < total_size ) {
             throw new Exception("Mismatching dims and array size");
         }
-        this.ref = createArrayElems(dims,elems);
+
+        int[] adims;
+        adims = new int[] {1, 1, 1, 1};
+        for (int i = 0; i < dims.length; i++) adims[i] = dims[i];
+
+        this.ref = createArrayElems(adims, elems);
     }
 
     public int[] dims() {
diff --git a/src/java_wrapper.cpp b/src/java_wrapper.cpp
@@ -19,7 +19,7 @@ JNIEXPORT jlong JNICALL Java_com_arrayfire_Array_createArray(JNIEnv *env, jclass
     jlong ret;
     try{
         jint* dimptr = env->GetIntArrayElements(dims,0);
-        af::array *A = new af::array(dimptr[0],dimptr[1],dimptr[2]);
+        af::array *A = new af::array(dimptr[0],dimptr[1],dimptr[2],dimptr[3]);
         *A = af::constant(0.0f,dimptr[0],dimptr[1],dimptr[2]);
         ret = (jlong)(A);
         env->ReleaseIntArrayElements(dims,dimptr,0);
@@ -37,7 +37,8 @@ JNIEXPORT jlong JNICALL Java_com_arrayfire_Array_createArrayElems(JNIEnv *env, j
     try{
         jint* dimptr = env->GetIntArrayElements(dims,0);
         jfloat* inptr= env->GetFloatArrayElements(elems,0);
-        af::array *A = new af::array(dimptr[0],dimptr[1],dimptr[2],inptr);
+        af::array *A = new af::array(dimptr[0],dimptr[1],dimptr[2],dimptr[3],inptr);
+
         ret = (jlong)(A);
         env->ReleaseIntArrayElements(dims,dimptr,0);
         env->ReleaseFloatArrayElements(elems,inptr,0);

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,11 @@ public Array(int[] dims) throws Exception {`
`83`	`83`	`} else if ( dims.length > 3 ) {`
`84`	`84`	`throw new Exception("Upto 3 dimensions only supported for now.");`
`85`	`85`	`}`
`86`		`- this.ref = createArray(dims);`
	`86`	`+ int[] adims;`
	`87`	`+ adims = new int[] {1, 1, 1, 1};`
	`88`	`+ for (int i = 0; i < dims.length; i++) adims[i] = dims[i];`
	`89`	`+`
	`90`	`+ this.ref = createArray(adims);`
`87`	`91`	`}`
`88`	`92`
`89`	`93`	`public Array(int[] dims, float[] elems) throws Exception {`
`@@ -98,7 +102,12 @@ public Array(int[] dims, float[] elems) throws Exception {`
`98`	`102`	`if( elems.length > total_size \|\| elems.length < total_size ) {`
`99`	`103`	`throw new Exception("Mismatching dims and array size");`
`100`	`104`	`}`
`101`		`- this.ref = createArrayElems(dims,elems);`
	`105`	`+`
	`106`	`+ int[] adims;`
	`107`	`+ adims = new int[] {1, 1, 1, 1};`
	`108`	`+ for (int i = 0; i < dims.length; i++) adims[i] = dims[i];`
	`109`	`+`
	`110`	`+ this.ref = createArrayElems(adims, elems);`
`102`	`111`	`}`
`103`	`112`
`104`	`113`	`public int[] dims() {`