umar456 · May 17, 2017 · Dec 12, 2016 · Dec 21, 2016 · Dec 21, 2016 · Dec 22, 2016
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,6 +53,10 @@ ELSE(FREEIMAGE_FOUND)
     MESSAGE(WARNING, "FreeImage not found!")
 ENDIF(FREEIMAGE_FOUND)
 
+ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB)
+SET(Boost_USE_STATIC_LIBS OFF)
+FIND_PACKAGE(Boost REQUIRED)
+
 OPTION(USE_SYSTEM_CL2HPP "Use cl2.hpp installed on system" OFF)
 
 IF(BUILD_GRAPHICS)
@@ -128,10 +132,12 @@ INCLUDE_DIRECTORIES(BEFORE
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/backend"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/api/c"
+    "${Boost_INCLUDE_DIR}"
     )
 
 IF(${UNIX})
-    ADD_DEFINITIONS(-Wall -std=c++11 -fvisibility=hidden)
+    ADD_DEFINITIONS(-std=c++11 -Wall -fvisibility=hidden)
+
     IF(${WITH_COVERAGE})
         SET(CMAKE_CXX_FLAGS             "-fprofile-arcs -ftest-coverage")
         SET(CMAKE_EXE_LINKER_FLAGS      "-fprofile-arcs -ftest-coverage")

diff --git a/CMakeModules/build_glbinding.cmake b/CMakeModules/build_glbinding.cmake
@@ -3,7 +3,7 @@ INCLUDE(ExternalProject)
 SET(prefix ${PROJECT_BINARY_DIR}/third_party/glb)
 
 SET(LIB_POSTFIX "")
-IF (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+IF (CMAKE_BUILD_TYPE MATCHES Debug)
     SET(LIB_POSTFIX "d")
 ENDIF()
 

diff --git a/docs/details/algorithm.dox b/docs/details/algorithm.dox
@@ -107,7 +107,7 @@ Return type is u32 for all input types
 
 \ingroup scan_mat
 
-Perform exclusive sum along specified dimension
+Perform inclusive sum along specified dimension
 
 This table defines the return value types for the corresponding input types
 

diff --git a/include/af/algorithm.h b/include/af/algorithm.h
@@ -306,7 +306,7 @@ namespace af
     template<typename T> void max(T *val, unsigned *idx, const array &in);
 
     /**
-       C++ Interface exclusive sum (cumulative sum) of an array
+       C++ Interface inclusive sum (cumulative sum) of an array
 
        \param[in] in is the input array
        \param[in] dim The dimension along which exclusive sum is performed
@@ -761,7 +761,7 @@ extern "C" {
     AFAPI af_err af_imax_all(double *real, double *imag, unsigned *idx, const af_array in);
 
     /**
-       C Interface exclusive sum (cumulative sum) of an array
+       C Interface inclusive sum (cumulative sum) of an array
 
        \param[out] out will contain exclusive sums of the input
        \param[in] in is the input array

diff --git a/include/af/signal.h b/include/af/signal.h
@@ -654,6 +654,18 @@ AFAPI array medfilt1(const array& in, const dim_t wind_width = 3, const borderTy
 AFAPI array medfilt2(const array& in, const dim_t wind_length = 3, const dim_t wind_width = 3, const borderType edge_pad = AF_PAD_ZERO);
 #endif
 
+#if AF_API_VERSION >= 35
+/**
+   C++ Interface for setting plan cache size
+
+   This function doesn't do anything if called when CPU backend is active. The plans associated with
+   the most recently used array sizes are cached.
+
+   \param[in] cacheSize is the number of plans that shall be cached
+*/
+AFAPI void setFFTPlanCacheSize(size_t cacheSize);
+#endif
+
 }
 #endif
 
@@ -1190,6 +1202,8 @@ AFAPI af_err af_iir(af_array *y, const af_array b, const af_array a, const af_ar
    the most recently used array sizes are cached.
 
    \param[in] cache_size is the number of plans that shall be cached
+
+   \ingroup signal_func_fft
 */
 AFAPI af_err af_set_fft_plan_cache_size(size_t cache_size);
 #endif

diff --git a/src/api/c/graphics_common.cpp b/src/api/c/graphics_common.cpp
@@ -10,13 +10,12 @@
 #if defined(WITH_GRAPHICS)
 
 #include <graphics_common.hpp>
+#include <glbinding/Meta.h>
 #include <err_common.hpp>
 #include <backend.hpp>
 #include <platform.hpp>
 #include <util.hpp>
-
-#include <glbinding/gl/gl.h>
-#include <glbinding/Meta.h>
+#include <mutex>
 
 using namespace std;
 using namespace gl;
@@ -54,7 +53,7 @@ INSTANTIATE_GET_FG_TYPE(short           , forge::s16);
 gl::GLenum glErrorSkip(const char *msg, const char* file, int line)
 {
 #ifndef NDEBUG
-    gl::GLenum x = glGetError();
+    gl::GLenum x = gl::glGetError();
     if (x != GL_NO_ERROR) {
         char buf[1024];
         sprintf(buf, "GL Error Skipped at: %s:%d Message: %s Error Code: %d \"%s\"\n", file, line, msg, (int)x, glbinding::Meta::getString(x).c_str());
@@ -70,7 +69,7 @@ gl::GLenum glErrorCheck(const char *msg, const char* file, int line)
 {
 // Skipped in release mode
 #ifndef NDEBUG
-    gl::GLenum x = glGetError();
+    gl::GLenum x = gl::glGetError();
 
     if (x != GL_NO_ERROR) {
         char buf[1024];
@@ -85,7 +84,7 @@ gl::GLenum glErrorCheck(const char *msg, const char* file, int line)
 
 gl::GLenum glForceErrorCheck(const char *msg, const char* file, int line)
 {
-    gl::GLenum x = glGetError();
+    gl::GLenum x = gl::glGetError();
 
     if (x != GL_NO_ERROR) {
         char buf[1024];
@@ -173,7 +172,6 @@ double step_round(const double in, const bool dir)
 
 namespace graphics
 {
-
 ForgeManager& ForgeManager::getInstance()
 {
     static ForgeManager my_instance;
@@ -182,50 +180,66 @@ ForgeManager& ForgeManager::getInstance()
 
 ForgeManager::~ForgeManager()
 {
-    destroyResources();
+    /* clear all OpenGL resource objects (images, plots, histograms etc) first
+     * and then delete the windows */
+    for(ImgMapIter iter = mImgMap.begin(); iter != mImgMap.end(); iter++)
+        delete (iter->second);
+
+    for(PltMapIter iter = mPltMap.begin(); iter != mPltMap.end(); iter++)
+        delete (iter->second);
+
+    for(HstMapIter iter = mHstMap.begin(); iter != mHstMap.end(); iter++)
+        delete (iter->second);
+
+    for(ChartMapIter iter = mChartMap.begin(); iter != mChartMap.end(); iter++) {
+        for(int i = 0; i < (int)(iter->second).size(); i++) {
+            if((iter->second)[i] != NULL) {
+                delete (iter->second)[i];
+                mChartAxesOverrideMap.erase((iter->second)[i]);
+            }
+        }
+    }
 }
 
-forge::Font* ForgeManager::getFont(const bool dontCreate)
+forge::Font* ForgeManager::getFont()
 {
-    static bool flag = true;
-    static forge::Font* fnt = NULL;
+    static std::once_flag flag;
+    static std::unique_ptr<forge::Font> fnt;
 
     CheckGL("Begin ForgeManager::getFont");
-
-    if (flag && !dontCreate) {
-        fnt = new forge::Font();
+    std::call_once(flag,
+            [] {
+                fnt.reset(new forge::Font());
 #if defined(_WIN32) || defined(_MSC_VER)
-        fnt->loadSystemFont("Arial");
+                fnt->loadSystemFont("Arial");
 #else
-        fnt->loadSystemFont("Vera");
+                fnt->loadSystemFont("Vera");
 #endif
-        CheckGL("End ForgeManager::getFont");
-        flag = false;
-    };
+            });
+    CheckGL("End ForgeManager::getFont");
 
-    return fnt;
+    return fnt.get();
 }
 
-forge::Window* ForgeManager::getMainWindow(const bool dontCreate)
+forge::Window* ForgeManager::getMainWindow()
 {
-    static bool flag = true;
-    static forge::Window* wnd = NULL;
+    static std::once_flag flag;
+    static std::unique_ptr<forge::Window> wnd;
 
     // Define AF_DISABLE_GRAPHICS with any value to disable initialization
     std::string noGraphicsENV = getEnvVar("AF_DISABLE_GRAPHICS");
-    if(noGraphicsENV.empty()) { // If AF_DISABLE_GRAPHICS is not defined
-        if (flag && !dontCreate) {
-            wnd = new forge::Window(WIDTH, HEIGHT, "ArrayFire", NULL, true);
-            makeContextCurrent(wnd);
 
-            ForgeManager& fgMngr = ForgeManager::getInstance();
-            fgMngr.setWindowChartGrid(wnd, 1, 1);
+    if (noGraphicsENV.empty()) { // If AF_DISABLE_GRAPHICS is not defined
+        std::call_once(flag,
+                [] {
+                    wnd.reset(new forge::Window(WIDTH, HEIGHT, "ArrayFire", NULL, true));
+                    makeContextCurrent(wnd.get());
 
-            CheckGL("End ForgeManager::getMainWindow");
-            flag = false;
-        };
+                    ForgeManager::getInstance().setWindowChartGrid(wnd.get(), 1, 1);
+                });
     }
-    return wnd;
+
+    return wnd.get();
 }
 
 void ForgeManager::setWindowChartGrid(const forge::Window* window,
@@ -259,13 +273,15 @@ forge::Chart* ForgeManager::getChart(const forge::Window* window, const int r, c
     forge::Chart* chart = NULL;
     ChartMapIter iter = mChartMap.find(window);
 
-    if(iter != mChartMap.end()) {
+    if (iter != mChartMap.end()) {
+
         int gRows = window->gridRows();
         int gCols = window->gridCols();
 
         if(c >= gCols || r >= gRows)
             AF_ERROR("Grid points are out of bounds", AF_ERR_TYPE);
 
+        // upgrade to exclusive access to make changes
         chart = (iter->second)[c * gRows + r];
 
         if (chart == NULL) {
@@ -303,9 +319,12 @@ forge::Image* ForgeManager::getImage(int w, int h, forge::ChannelFormat mode, fo
     key = (((key << 16) | mode) << 16) | type;
 
     ChartKey_t keypair = std::make_pair(key, nullptr);
+
     ImgMapIter iter = mImgMap.find(keypair);
+
     if (iter==mImgMap.end()) {
         forge::Image* temp = new forge::Image(w, h, mode, type);
+
         mImgMap[keypair] = temp;
     }
 
@@ -326,13 +345,17 @@ forge::Image* ForgeManager::getImage(forge::Chart* chart, int w, int h,
     key = (((key << 16) | mode) << 16) | type;
 
     ChartKey_t keypair = std::make_pair(key, chart);
+
     ImgMapIter iter = mImgMap.find(keypair);
+
     if (iter==mImgMap.end()) {
         if(chart->getChartType() != FG_CHART_2D)
             AF_ERROR("Image can only be added to chart of type FG_CHART_2D", AF_ERR_TYPE);
 
         forge::Image* temp = new forge::Image(w, h, mode, type);
+
         mImgMap[keypair] = temp;
+
         chart->add(*mImgMap[keypair]);
     }
 
@@ -352,10 +375,14 @@ forge::Plot* ForgeManager::getPlot(forge::Chart* chart, int nPoints, forge::dtyp
     key |= (((((dtype & 0x000F) << 12) | (ptype & 0x000F)) << 8) | (mtype & 0x000F));
 
     ChartKey_t keypair = std::make_pair(key, chart);
+
     PltMapIter iter = mPltMap.find(keypair);
+
     if (iter==mPltMap.end()) {
         forge::Plot* temp = new forge::Plot(nPoints, dtype, chart->getChartType(), ptype, mtype);
+
         mPltMap[keypair] = temp;
+
         chart->add(*mPltMap[keypair]);
     }
 
@@ -373,13 +400,17 @@ forge::Histogram* ForgeManager::getHistogram(forge::Chart* chart, int nBins, for
     long long key = ((nBins & _48BIT) << 48) | (type & _16BIT);
 
     ChartKey_t keypair = std::make_pair(key, chart);
+
     HstMapIter iter = mHstMap.find(keypair);
+
     if (iter==mHstMap.end()) {
         if(chart->getChartType() != FG_CHART_2D)
             AF_ERROR("Histogram can only be added to chart of type FG_CHART_2D", AF_ERR_TYPE);
 
         forge::Histogram* temp = new forge::Histogram(nBins, type);
+
         mHstMap[keypair] = temp;
+
         chart->add(*mHstMap[keypair]);
     }
 
@@ -397,13 +428,17 @@ forge::Surface* ForgeManager::getSurface(forge::Chart* chart, int nX, int nY, fo
     long long key = (((nX * nY) & _48BIT) << 48) | (type & _16BIT);
 
     ChartKey_t keypair = std::make_pair(key, chart);
+
     SfcMapIter iter = mSfcMap.find(keypair);
+
     if (iter==mSfcMap.end()) {
         if(chart->getChartType() != FG_CHART_3D)
             AF_ERROR("Surface can only be added to chart of type FG_CHART_3D", AF_ERR_TYPE);
 
         forge::Surface* temp = new forge::Surface(nX, nY, type);
+
         mSfcMap[keypair] = temp;
+
         chart->add(*mSfcMap[keypair]);
     }
 
@@ -421,10 +456,14 @@ forge::VectorField* ForgeManager::getVectorField(forge::Chart* chart, int nPoint
     long long key = (((nPoints) & _48BIT) << 48) | (type & _16BIT);
 
     ChartKey_t keypair = std::make_pair(key, chart);
+
     VcfMapIter iter = mVcfMap.find(keypair);
+
     if (iter==mVcfMap.end()) {
         forge::VectorField* temp = new forge::VectorField(nPoints, type, chart->getChartType());
+
         mVcfMap[keypair] = temp;
+
         chart->add(*mVcfMap[keypair]);
     }
 
@@ -448,33 +487,6 @@ void ForgeManager::setChartAxesOverride(forge::Chart* chart, bool flag)
     }
     mChartAxesOverrideMap[chart] = flag;
 }
-
-void ForgeManager::destroyResources()
-{
-    /* clear all OpenGL resource objects (images, plots, histograms etc) first
-     * and then delete the windows */
-    for(ImgMapIter iter = mImgMap.begin(); iter != mImgMap.end(); iter++)
-        delete (iter->second);
-
-    for(PltMapIter iter = mPltMap.begin(); iter != mPltMap.end(); iter++)
-        delete (iter->second);
-
-    for(HstMapIter iter = mHstMap.begin(); iter != mHstMap.end(); iter++)
-        delete (iter->second);
-
-    for(ChartMapIter iter = mChartMap.begin(); iter != mChartMap.end(); iter++) {
-        for(int i = 0; i < (int)(iter->second).size(); i++) {
-            if((iter->second)[i] != NULL) {
-                delete (iter->second)[i];
-                mChartAxesOverrideMap.erase((iter->second)[i]);
-            }
-        }
-    }
-
-    delete getFont(true);
-    delete getMainWindow(true);
-}
-
 }
 
 #endif