Merge pull request #1339 from shehzan10/hotfix-3.3.1

pavanky · pavanky · commit 58bd6248143c · 2016-03-16T16:32:43.000-04:00
Update clBLAS/clFFT Build Tags
diff --git a/CMakeModules/build_clBLAS.cmake b/CMakeModules/build_clBLAS.cmake
@@ -14,7 +14,7 @@ ENDIF()
 ExternalProject_Add(
     clBLAS-ext
     GIT_REPOSITORY https://github.com/arrayfire/clBLAS.git
-    GIT_TAG af3.3.0
+    GIT_TAG af3.3.1
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}"
     UPDATE_COMMAND ""
diff --git a/CMakeModules/build_clFFT.cmake b/CMakeModules/build_clFFT.cmake
@@ -14,7 +14,7 @@ ENDIF()
 ExternalProject_Add(
     clFFT-ext
     GIT_REPOSITORY https://github.com/arrayfire/clFFT.git
-    GIT_TAG af3.3.0
+    GIT_TAG af3.3.1
     PREFIX "${prefix}"
     INSTALL_DIR "${prefix}"
     UPDATE_COMMAND ""
diff --git a/src/backend/opencl/fft.cpp b/src/backend/opencl/fft.cpp
@@ -47,11 +47,17 @@ class clFFTPlanner
         }
 
         ~clFFTPlanner() {
+            //TODO: FIXME:
+            // clfftTeardown() cause a "Pure Virtual Function Called" crash on
+            // Window only when Intel devices are called. This causes tests to
+            // fail.
+            #ifndef OS_WIN
             static bool flag = true;
             if(flag) {
                 CLFFT_CHECK(clfftTeardown());
                 flag = false;
             }
+            #endif
         }
 
     private:

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,17 @@ class clFFTPlanner`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`~clFFTPlanner() {`
	`50`	`+ //TODO: FIXME:`
	`51`	`+ // clfftTeardown() cause a "Pure Virtual Function Called" crash on`
	`52`	`+ // Window only when Intel devices are called. This causes tests to`
	`53`	`+ // fail.`
	`54`	`+ #ifndef OS_WIN`
`50`	`55`	`static bool flag = true;`
`51`	`56`	`if(flag) {`
`52`	`57`	`CLFFT_CHECK(clfftTeardown());`
`53`	`58`	`flag = false;`
`54`	`59`	`}`
	`60`	`+ #endif`
`55`	`61`	`}`
`56`	`62`
`57`	`63`	`private:`