arrayfire · shehzan10 · Apr 25, 2016 · Mar 22, 2016 · Mar 22, 2016 · Mar 22, 2016
diff --git a/CMakeModules/CPackConfig.cmake b/CMakeModules/CPackConfig.cmake
@@ -2,16 +2,27 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 INCLUDE("${CMAKE_MODULE_PATH}/Version.cmake")
 
+OPTION(CREATE_STGZ "Create .sh install file" ON)
+MARK_AS_ADVANCED(CREATE_STGZ)
+
 # CPack package generation
-#SET(CPACK_GENERATOR "TGZ;STGZ")
-SET(CPACK_GENERATOR "STGZ")
-# Create the following installers are as follows:
-#  Windows: Use external packaging, do nothing here
-#  OSX: Deploy as TGZ and STGZ
-#IF("${CMAKE_SYSTEM}" MATCHES "Linux")
-#    #  Linux: TGZ, STGZ, DEB
-#    SET(CPACK_GENERATOR "TGZ;STGZ;DEB;RPM")
-#ENDIF()
+IF(${CREATE_STGZ})
+  LIST(APPEND CPACK_GENERATOR "STGZ")
+ENDIF()
+
+OPTION(CREATE_DEB "Create .deb install file" OFF)
+MARK_AS_ADVANCED(CREATE_DEB)
+
+IF(${CREATE_DEB})
+  LIST(APPEND CPACK_GENERATOR "DEB")
+ENDIF()
+
+OPTION(CREATE_RPM "Create .rpm install file" OFF)
+MARK_AS_ADVANCED(CREATE_RPM)
+
+IF(${CREATE_RPM})
+  LIST(APPEND CPACK_GENERATOR "RPM")
+ENDIF()
 
 # Common settings to all packaging tools
 SET(CPACK_PREFIX_DIR ${CMAKE_INSTALL_PREFIX})
@@ -59,16 +70,14 @@ SET(CPACK_COMPONENTS_ALL libraries headers documentation cmake)
 # Debian package
 ##
 SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${PROCESSOR_ARCHITECTURE})
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libfreeimage-dev, libatlas3gf-base, libfftw3-dev, liblapacke-dev")
-SET(CPACK_DEBIAN_PACKAGE_SUGGESTS "ocl-icd-libopencl1 (>= 2.0), nvidia-cuda-dev (>= 6.0)")
 
 ##
 # RPM package
 ##
 SET(CPACK_RPM_PACKAGE_LICENSE "BSD")
-SET(CPACK_PACKAGE_GROUP "Development/Libraries")
-SET(CPACK_RPM_PACKAGE_REQUIRES "freeimage atlas fftw lapack")
+set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
 
+SET(CPACK_PACKAGE_GROUP "Development/Libraries")
 ##
 # Source package
 ##

diff --git a/CMakeModules/Version.cmake b/CMakeModules/Version.cmake
@@ -3,7 +3,7 @@
 #
 SET(AF_VERSION_MAJOR "3")
 SET(AF_VERSION_MINOR "3")
-SET(AF_VERSION_PATCH "1")
+SET(AF_VERSION_PATCH "2")
 
 SET(AF_VERSION "${AF_VERSION_MAJOR}.${AF_VERSION_MINOR}.${AF_VERSION_PATCH}")
 SET(AF_API_VERSION_CURRENT ${AF_VERSION_MAJOR}${AF_VERSION_MINOR})

diff --git a/CMakeModules/osx_install/OSXInstaller.cmake b/CMakeModules/osx_install/OSXInstaller.cmake
@@ -158,6 +158,7 @@ PKG_BUILD(  PKG_NAME        ArrayFireOPENCL
             DEPENDS         OSX_INSTALL_SETUP_OpenCL
             TARGETS         opencl_package
             INSTALL_LOCATION /usr/local
+            SCRIPT_DIR      ${OSX_INSTALL_DIR}/opencl_scripts
             IDENTIFIER      com.arrayfire.pkg.arrayfire.opencl.lib
             PATH_TO_FILES   ${OSX_TEMP}/OpenCL
             FILTERS         cpu cuda unified)

diff --git a/CMakeModules/osx_install/cpu_scripts/postinstall b/CMakeModules/osx_install/cpu_scripts/postinstall
@@ -6,8 +6,10 @@ set -o pipefail
 err_file=/tmp/AFInstallerCPU.err
 brew=/usr/local/bin/brew
 
+echo $(date) > $err_file
+
 if [ ! -f $brew ]; then
-    osascript -e 'tell app "Finder" to display dialog "Brew not installed. Please install brew at http://brew.sh"'
+    osascript -e 'tell app "Installer" to display dialog "Brew not installed. Please install brew at http://brew.sh"'
     open http://brew.sh
     echo "Brew not found" >> $err_file
     exit 1
@@ -20,5 +22,14 @@ if [ -z $user ]; then
     exit 1
 fi
 
-su $user -c "$brew tap homebrew/versions" 2> $err_file
-su $user -c "$brew install fftw glfw3 fontconfig" 2> $err_file
+function deps_err
+{
+    osascript -e 'tell app "Installer" to display dialog "ArrayFire files installed but failed to install ArrayFire dependencies using Brew."'
+    osascript -e 'tell app "Installer" to display dialog "Visit https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures to fix errors manually."'
+    open https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures
+    echo "Dependencies failed to install" >> $err_file
+    exit 1
+}
+
+su $user -c "$brew tap homebrew/versions" >> $err_file 2>&1
+su $user -c "$brew install fftw glfw3 fontconfig" >> $err_file 2>&1 || deps_err
diff --git a/CMakeModules/osx_install/cuda_scripts/postinstall b/CMakeModules/osx_install/cuda_scripts/postinstall
@@ -6,8 +6,10 @@ set -o pipefail
 err_file=/tmp/AFInstallerCUDA.err
 brew=/usr/local/bin/brew
 
+echo $(date) > $err_file
+
 if [ ! -f $brew ]; then
-    osascript -e 'tell app "Finder" to display dialog "Brew not installed. Please install brew at brew.sh"'
+    osascript -e 'tell app "Installer" to display dialog "Brew not installed. Please install brew at brew.sh"'
     echo "Brew not found" >> $err_file
     exit 1
 fi
@@ -19,5 +21,14 @@ if [ -z $user ]; then
     exit 1
 fi
 
-su $user -c "$brew tap homebrew/versions" 2> $err_file
-su $user -c "$brew install glfw3 fontconfig" 2> $err_file
+function deps_err
+{
+    osascript -e 'tell app "Installer" to display dialog "ArrayFire files installed but failed to install ArrayFire dependencies using Brew."'
+    osascript -e 'tell app "Installer" to display dialog "Visit https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures to fix errors manually."'
+    open https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures
+    echo "Dependencies failed to install" >> $err_file
+    exit 1
+}
+
+su $user -c "$brew tap homebrew/versions" >> $err_file 2>&1
+su $user -c "$brew install glfw3 fontconfig" >> $err_file 2>&1 || deps_err
diff --git a/CMakeModules/osx_install/opencl_scripts/postinstall b/CMakeModules/osx_install/opencl_scripts/postinstall
@@ -6,8 +6,10 @@ set -o pipefail
 err_file=/tmp/AFInstallerOpenCL.err
 brew=/usr/local/bin/brew
 
+echo $(date) > $err_file
+
 if [ ! -f $brew ]; then
-    osascript -e 'tell app "Finder" to display dialog "Brew not installed. Please install brew at brew.sh"'
+    osascript -e 'tell app "Installer" to display dialog "Brew not installed. Please install brew at brew.sh"'
     echo "Brew not found" >> $err_file
     exit 1
 fi
@@ -19,5 +21,14 @@ if [ -z $user ]; then
     exit 1
 fi
 
-su $user -c "$brew tap homebrew/versions" 2> $err_file
-su $user -c "$brew install glfw3 fontconfig" 2> $err_file
+function deps_err
+{
+    osascript -e 'tell app "Installer" to display dialog "ArrayFire files installed but failed to install ArrayFire dependencies using Brew."'
+    osascript -e 'tell app "Installer" to display dialog "Visit https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures to fix errors manually."'
+    open https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures
+    echo "Dependencies failed to install" >> $err_file
+    exit 1
+}
+
+su $user -c "$brew tap homebrew/versions" >> $err_file 2>&1
+su $user -c "$brew install fftw glfw3 fontconfig" >> $err_file 2>&1 || deps_err
diff --git a/CMakeModules/osx_install/readme.html b/CMakeModules/osx_install/readme.html
@@ -9,5 +9,6 @@ <h2>Install Directories</h2>
     </ul>
     <p> For complete list of updates, visit <a href="http://www.arrayfire.com/docs/releasenotes.htm">ArrayFire Release Notes</a></p>
 
+    <p> For questions about ArrayFire or this installer, visit <a href="https://groups.google.com/forum/#!forum/arrayfire-users"> ArrayFire User Forums</a> </p>
 </body>
 </html>
diff --git a/docs/details/data.dox b/docs/details/data.dox
@@ -338,8 +338,8 @@ array/value is selected.
 
 \brief Replace elements of an array based on an conditional array
 
-If the condition array has an element as true, then the element is
-replaced by the array/value, otherwise no change.
+- Input values are retained when corresponding elements from condition array are true.
+- Input values are replaced when corresponding elements from condition array are false.
 
 \ingroup manip_mat
 \ingroup arrayfire_func

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
@@ -1,6 +1,49 @@
 Release Notes {#releasenotes}
 ==============
 
+v3.3.2
+==============
+
+Improvements
+------------
+* Family of [Sort](\ref sort_mat) functions now support
+  [higher order dimensions](https://github.com/arrayfire/arrayfire/pull/1373).
+* Improved performance of batched sort on dim 0 for all [Sort](\ref sort_mat) functions.
+* [Median](\ref stat_func_median) now also supports higher order dimensions.
+
+Bug Fixes
+--------------
+
+* Fixes to [error handling](https://github.com/arrayfire/arrayfire/issues/1352) in C++ API for binary functions.
+* Fixes to [external OpenCL context management](https://github.com/arrayfire/arrayfire/issues/1350).
+* Fixes to [JPEG_GREYSCALE](https://github.com/arrayfire/arrayfire/issues/1360) for FreeImage versions <= 3.154.
+* Fixed for [non-float inputs](https://github.com/arrayfire/arrayfire/issues/1386) to \ref af::rgb2gray().
+
+Build
+------
+* [Disable CPU Async](https://github.com/arrayfire/arrayfire/issues/1378) when building with GCC < 4.8.4.
+* Add option to [disable CPUID](https://github.com/arrayfire/arrayfire/issues/1369) from CMake.
+* More verbose message when [CUDA Compute Detection fails](https://github.com/arrayfire/arrayfire/issues/1362).
+* Print message to use [CUDA library stub](https://github.com/arrayfire/arrayfire/issues/1363)
+  from CUDA Toolkit if CUDA Library is not found from default paths.
+* [Build Fixes](https://github.com/arrayfire/arrayfire/pull/1385) on Windows.
+  * For compiling tests our of source.
+  * For compiling ArrayFire with static MKL.
+* [Exclude <sys/sysctl.h>](https://github.com/arrayfire/arrayfire/pull/1368) when building on GNU Hurd.
+* Add [manual CMake options](https://github.com/arrayfire/arrayfire/pull/1389) to build DEB and RPM packages.
+
+Documentation
+-------------
+* Fixed documentation for \ref af::replace().
+* Fixed images in [Using on OSX](\ref using_on_osx) page.
+
+Installer
+---------
+* Linux x64 installers will now be compiled with GCC 4.9.2.
+* OSX installer gives better error messages on brew failures and
+  now includes link to [Fixing OS X Installer Failures] (https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures)
+  for brew installation failures.
+
 v3.3.1
 ==============
 
@@ -361,7 +404,7 @@ Bug Fixes
 Documentation Updates
 ---------------------
 * Improved tutorials documentation
-    * More detailed Using on [Linux](\ref using_on_windows), [OSX](\ref using_on_windows),
+    * More detailed Using on [Linux](\ref using_on_linux), [OSX](\ref using_on_osx),
       [Windows](\ref using_on_windows) pages.
 * Added return type information for functions that return different type
   arrays
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,6 @@ <h2>Install Directories</h2> @@
         </ul>
         <p> For complete list of updates, visit <a href="http://www.arrayfire.com/docs/releasenotes.htm">ArrayFire Release Notes</a></p>
+        <p> For questions about ArrayFire or this installer, visit <a href="https://groups.google.com/forum/#!forum/arrayfire-users"> ArrayFire User Forums</a> </p>
     </body>
     </html>