Merge pull request arrayfire#1274 from pavanky/gfx_fixes

pavanky · pavanky · commit f3c5ad25d5c2 · 2016-02-11T20:30:19.000-05:00
Fixes to memory leaks, and performance improvements in graphics functions
diff --git a/src/api/c/plot.cpp b/src/api/c/plot.cpp
@@ -39,14 +39,19 @@ fg::Plot* setup_plot(const af_array X, const af_array Y, fg::PlotType type, fg::
 
     dim4 rdims(1, 0, 2, 3);
 
-    Array<T> Z = join(1, xIn, yIn);
-    Array<T> P = reorder(Z, rdims);
+    dim_t elements = xIn.elements();
+    dim4 rowDims = dim4(1, elements, 1, 1);
 
-    ArrayInfo Xinfo = getInfo(X);
-    af::dim4 X_dims = Xinfo.dims();
+    // Force the vectors to be row vectors
+    // This ensures we can use join(0,..) and skip reorder
+    xIn.modDims(rowDims);
+    yIn.modDims(rowDims);
+
+    // join along first dimension, skip reorder
+    Array<T> P = join(0, xIn, yIn);
 
     ForgeManager& fgMngr = ForgeManager::getInstance();
-    fg::Plot* plot = fgMngr.getPlot(X_dims.elements(), getGLType<T>(), type, marker);
+    fg::Plot* plot = fgMngr.getPlot(elements, getGLType<T>(), type, marker);
     plot->setColor(1.0, 0.0, 0.0);
     plot->setAxesLimits(xmax, xmin, ymax, ymin);
     plot->setAxesTitles("X Axis", "Y Axis");
diff --git a/src/api/c/plot3.cpp b/src/api/c/plot3.cpp
@@ -46,16 +46,13 @@ fg::Plot3* setup_plot3(const af_array P, fg::PlotType ptype, fg::MarkerType mtyp
         P_dims = pIn.dims();
     }
 
-    T max[3], min[3];
-    if(P_dims[0] == 3) {
-        af_get_data_ptr(max, getHandle(reduce<af_max_t, T, T>(pIn, 1)));
-        af_get_data_ptr(min, getHandle(reduce<af_min_t, T, T>(pIn, 1)));
+    if(P_dims[1] == 3){
+        pIn = transpose(pIn, false);
     }
 
-    if(P_dims[1] == 3) {
-        af_get_data_ptr(max, getHandle(reduce<af_max_t, T, T>(pIn, 0)));
-        af_get_data_ptr(min, getHandle(reduce<af_min_t, T, T>(pIn, 0)));
-    }
+    T max[3], min[3];
+    copyData(max, reduce<af_max_t, T, T>(pIn, 1));
+    copyData(min, reduce<af_min_t, T, T>(pIn, 1));
 
     ForgeManager& fgMngr = ForgeManager::getInstance();
     fg::Plot3* plot3 = fgMngr.getPlot3(P_dims.elements()/3, getGLType<T>(), ptype, mtype);
@@ -64,12 +61,7 @@ fg::Plot3* setup_plot3(const af_array P, fg::PlotType ptype, fg::MarkerType mtyp
                          max[1], min[1],
                          max[2], min[2]);
     plot3->setAxesTitles("X Axis", "Y Axis", "Z Axis");
-
-    if(P_dims[1] == 3){
-        pIn = transpose(pIn, false);
-    }
     copy_plot3<T>(pIn, plot3);
-
     return plot3;
 }
 
diff --git a/src/api/c/surface.cpp b/src/api/c/surface.cpp
@@ -49,21 +49,29 @@ fg::Surface* setup_surface(const af_array xVals, const af_array yVals, const af_
     af::dim4 Y_dims = Yinfo.dims();
     af::dim4 Z_dims = Zinfo.dims();
 
-    dim4   rdims(1, 0, 2, 3);
-    dim4 x_tdims(1, Y_dims[0], 1, 1);
-    dim4 y_tdims(1, X_dims[0], 1, 1);
     if(Xinfo.isVector()){
+        // Convert xIn is a column vector
+        xIn.modDims(xIn.elements());
+        // Now tile along second dimension
+        dim4 x_tdims(1, Y_dims[0], 1, 1);
         xIn = tile(xIn, x_tdims);
+
+        // Convert yIn to a row vector
+        yIn.modDims(af::dim4(1, yIn.elements()));
+        // Now tile along first dimension
+        dim4 y_tdims(X_dims[0], 1, 1, 1);
         yIn = tile(yIn, y_tdims);
-        yIn = reorder(yIn, rdims);
     }
 
-    xIn.modDims(xIn.elements());
-    yIn.modDims(yIn.elements());
-    zIn.modDims(zIn.elements());
-    Array<T> Z = join(1, join(1, xIn, yIn), zIn);
-    Z = reorder(Z, rdims);
-    Z.modDims(Z.elements());
+    // Flatten xIn, yIn and zIn into row vectors
+    dim4 rowDims = dim4(1, zIn.elements());
+    xIn.modDims(rowDims);
+    yIn.modDims(rowDims);
+    zIn.modDims(rowDims);
+
+    // Now join along first dimension, skip reorder
+    std::vector<Array<T> > inputs{xIn, yIn, zIn};
+    Array<T> Z = join(0, inputs);
 
     ForgeManager& fgMngr = ForgeManager::getInstance();
     fg::Surface* surface = fgMngr.getSurface(Z_dims[0], Z_dims[1], getGLType<T>());
