Skip to content

Commit f65dd97

Browse files
shehzan10shehzan10
committed
Merge pull request #1394 from arrayfire/hotfix-3.3.2
Release 3.3.2
2 parents f53efc3 + be22316 commit f65dd97

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+2809
-899
lines changed

‎CMakeModules/CPackConfig.cmake

+22-13
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,27 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
22

33
INCLUDE("${CMAKE_MODULE_PATH}/Version.cmake")
44

5+
OPTION(CREATE_STGZ "Create .sh install file" ON)
6+
MARK_AS_ADVANCED(CREATE_STGZ)
7+
58
# CPack package generation
6-
#SET(CPACK_GENERATOR "TGZ;STGZ")
7-
SET(CPACK_GENERATOR "STGZ")
8-
# Create the following installers are as follows:
9-
# Windows: Use external packaging, do nothing here
10-
# OSX: Deploy as TGZ and STGZ
11-
#IF("${CMAKE_SYSTEM}" MATCHES "Linux")
12-
# # Linux: TGZ, STGZ, DEB
13-
# SET(CPACK_GENERATOR "TGZ;STGZ;DEB;RPM")
14-
#ENDIF()
9+
IF(${CREATE_STGZ})
10+
LIST(APPEND CPACK_GENERATOR "STGZ")
11+
ENDIF()
12+
13+
OPTION(CREATE_DEB "Create .deb install file" OFF)
14+
MARK_AS_ADVANCED(CREATE_DEB)
15+
16+
IF(${CREATE_DEB})
17+
LIST(APPEND CPACK_GENERATOR "DEB")
18+
ENDIF()
19+
20+
OPTION(CREATE_RPM "Create .rpm install file" OFF)
21+
MARK_AS_ADVANCED(CREATE_RPM)
22+
23+
IF(${CREATE_RPM})
24+
LIST(APPEND CPACK_GENERATOR "RPM")
25+
ENDIF()
1526

1627
# Common settings to all packaging tools
1728
SET(CPACK_PREFIX_DIR ${CMAKE_INSTALL_PREFIX})
@@ -59,16 +70,14 @@ SET(CPACK_COMPONENTS_ALL libraries headers documentation cmake)
5970
# Debian package
6071
##
6172
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${PROCESSOR_ARCHITECTURE})
62-
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libfreeimage-dev, libatlas3gf-base, libfftw3-dev, liblapacke-dev")
63-
SET(CPACK_DEBIAN_PACKAGE_SUGGESTS "ocl-icd-libopencl1 (>= 2.0), nvidia-cuda-dev (>= 6.0)")
6473

6574
##
6675
# RPM package
6776
##
6877
SET(CPACK_RPM_PACKAGE_LICENSE "BSD")
69-
SET(CPACK_PACKAGE_GROUP "Development/Libraries")
70-
SET(CPACK_RPM_PACKAGE_REQUIRES "freeimage atlas fftw lapack")
78+
set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
7179

80+
SET(CPACK_PACKAGE_GROUP "Development/Libraries")
7281
##
7382
# Source package
7483
##

‎CMakeModules/Version.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
SET(AF_VERSION_MAJOR "3")
55
SET(AF_VERSION_MINOR "3")
6-
SET(AF_VERSION_PATCH "1")
6+
SET(AF_VERSION_PATCH "2")
77

88
SET(AF_VERSION "${AF_VERSION_MAJOR}.${AF_VERSION_MINOR}.${AF_VERSION_PATCH}")
99
SET(AF_API_VERSION_CURRENT ${AF_VERSION_MAJOR}${AF_VERSION_MINOR})

‎CMakeModules/osx_install/OSXInstaller.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ PKG_BUILD( PKG_NAME ArrayFireOPENCL
158158
DEPENDS OSX_INSTALL_SETUP_OpenCL
159159
TARGETS opencl_package
160160
INSTALL_LOCATION /usr/local
161+
SCRIPT_DIR ${OSX_INSTALL_DIR}/opencl_scripts
161162
IDENTIFIER com.arrayfire.pkg.arrayfire.opencl.lib
162163
PATH_TO_FILES ${OSX_TEMP}/OpenCL
163164
FILTERS cpu cuda unified)

‎CMakeModules/osx_install/cpu_scripts/postinstall

+14-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ set -o pipefail
66
err_file=/tmp/AFInstallerCPU.err
77
brew=/usr/local/bin/brew
88

9+
echo $(date) > $err_file
10+
911
if [ ! -f $brew ]; then
10-
osascript -e 'tell app "Finder" to display dialog "Brew not installed. Please install brew at http://brew.sh"'
12+
osascript -e 'tell app "Installer" to display dialog "Brew not installed. Please install brew at http://brew.sh"'
1113
open http://brew.sh
1214
echo "Brew not found" >> $err_file
1315
exit 1
@@ -20,5 +22,14 @@ if [ -z $user ]; then
2022
exit 1
2123
fi
2224

23-
su $user -c "$brew tap homebrew/versions" 2> $err_file
24-
su $user -c "$brew install fftw glfw3 fontconfig" 2> $err_file
25+
function deps_err
26+
{
27+
osascript -e 'tell app "Installer" to display dialog "ArrayFire files installed but failed to install ArrayFire dependencies using Brew."'
28+
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."'
29+
open https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures
30+
echo "Dependencies failed to install" >> $err_file
31+
exit 1
32+
}
33+
34+
su $user -c "$brew tap homebrew/versions" >> $err_file 2>&1
35+
su $user -c "$brew install fftw glfw3 fontconfig" >> $err_file 2>&1 || deps_err

‎CMakeModules/osx_install/cuda_scripts/postinstall

+14-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ set -o pipefail
66
err_file=/tmp/AFInstallerCUDA.err
77
brew=/usr/local/bin/brew
88

9+
echo $(date) > $err_file
10+
911
if [ ! -f $brew ]; then
10-
osascript -e 'tell app "Finder" to display dialog "Brew not installed. Please install brew at brew.sh"'
12+
osascript -e 'tell app "Installer" to display dialog "Brew not installed. Please install brew at brew.sh"'
1113
echo "Brew not found" >> $err_file
1214
exit 1
1315
fi
@@ -19,5 +21,14 @@ if [ -z $user ]; then
1921
exit 1
2022
fi
2123

22-
su $user -c "$brew tap homebrew/versions" 2> $err_file
23-
su $user -c "$brew install glfw3 fontconfig" 2> $err_file
24+
function deps_err
25+
{
26+
osascript -e 'tell app "Installer" to display dialog "ArrayFire files installed but failed to install ArrayFire dependencies using Brew."'
27+
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."'
28+
open https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures
29+
echo "Dependencies failed to install" >> $err_file
30+
exit 1
31+
}
32+
33+
su $user -c "$brew tap homebrew/versions" >> $err_file 2>&1
34+
su $user -c "$brew install glfw3 fontconfig" >> $err_file 2>&1 || deps_err

‎CMakeModules/osx_install/opencl_scripts/postinstall

+14-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ set -o pipefail
66
err_file=/tmp/AFInstallerOpenCL.err
77
brew=/usr/local/bin/brew
88

9+
echo $(date) > $err_file
10+
911
if [ ! -f $brew ]; then
10-
osascript -e 'tell app "Finder" to display dialog "Brew not installed. Please install brew at brew.sh"'
12+
osascript -e 'tell app "Installer" to display dialog "Brew not installed. Please install brew at brew.sh"'
1113
echo "Brew not found" >> $err_file
1214
exit 1
1315
fi
@@ -19,5 +21,14 @@ if [ -z $user ]; then
1921
exit 1
2022
fi
2123

22-
su $user -c "$brew tap homebrew/versions" 2> $err_file
23-
su $user -c "$brew install glfw3 fontconfig" 2> $err_file
24+
function deps_err
25+
{
26+
osascript -e 'tell app "Installer" to display dialog "ArrayFire files installed but failed to install ArrayFire dependencies using Brew."'
27+
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."'
28+
open https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures
29+
echo "Dependencies failed to install" >> $err_file
30+
exit 1
31+
}
32+
33+
su $user -c "$brew tap homebrew/versions" >> $err_file 2>&1
34+
su $user -c "$brew install fftw glfw3 fontconfig" >> $err_file 2>&1 || deps_err

‎CMakeModules/osx_install/readme.html

+1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ <h2>Install Directories</h2>
99
</ul>
1010
<p> For complete list of updates, visit <a href="http://www.arrayfire.com/docs/releasenotes.htm">ArrayFire Release Notes</a></p>
1111

12+
<p> For questions about ArrayFire or this installer, visit <a href="https://groups.google.com/forum/#!forum/arrayfire-users"> ArrayFire User Forums</a> </p>
1213
</body>
1314
</html>

‎docs/details/data.dox

+2-2
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,8 @@ array/value is selected.
338338

339339
\brief Replace elements of an array based on an conditional array
340340

341-
If the condition array has an element as true, then the element is
342-
replaced by the array/value, otherwise no change.
341+
- Input values are retained when corresponding elements from condition array are true.
342+
- Input values are replaced when corresponding elements from condition array are false.
343343

344344
\ingroup manip_mat
345345
\ingroup arrayfire_func

‎docs/pages/release_notes.md

+44-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,49 @@
11
Release Notes {#releasenotes}
22
==============
33

4+
v3.3.2
5+
==============
6+
7+
Improvements
8+
------------
9+
* Family of [Sort](\ref sort_mat) functions now support
10+
[higher order dimensions](https://github.com/arrayfire/arrayfire/pull/1373).
11+
* Improved performance of batched sort on dim 0 for all [Sort](\ref sort_mat) functions.
12+
* [Median](\ref stat_func_median) now also supports higher order dimensions.
13+
14+
Bug Fixes
15+
--------------
16+
17+
* Fixes to [error handling](https://github.com/arrayfire/arrayfire/issues/1352) in C++ API for binary functions.
18+
* Fixes to [external OpenCL context management](https://github.com/arrayfire/arrayfire/issues/1350).
19+
* Fixes to [JPEG_GREYSCALE](https://github.com/arrayfire/arrayfire/issues/1360) for FreeImage versions <= 3.154.
20+
* Fixed for [non-float inputs](https://github.com/arrayfire/arrayfire/issues/1386) to \ref af::rgb2gray().
21+
22+
Build
23+
------
24+
* [Disable CPU Async](https://github.com/arrayfire/arrayfire/issues/1378) when building with GCC < 4.8.4.
25+
* Add option to [disable CPUID](https://github.com/arrayfire/arrayfire/issues/1369) from CMake.
26+
* More verbose message when [CUDA Compute Detection fails](https://github.com/arrayfire/arrayfire/issues/1362).
27+
* Print message to use [CUDA library stub](https://github.com/arrayfire/arrayfire/issues/1363)
28+
from CUDA Toolkit if CUDA Library is not found from default paths.
29+
* [Build Fixes](https://github.com/arrayfire/arrayfire/pull/1385) on Windows.
30+
* For compiling tests our of source.
31+
* For compiling ArrayFire with static MKL.
32+
* [Exclude <sys/sysctl.h>](https://github.com/arrayfire/arrayfire/pull/1368) when building on GNU Hurd.
33+
* Add [manual CMake options](https://github.com/arrayfire/arrayfire/pull/1389) to build DEB and RPM packages.
34+
35+
Documentation
36+
-------------
37+
* Fixed documentation for \ref af::replace().
38+
* Fixed images in [Using on OSX](\ref using_on_osx) page.
39+
40+
Installer
41+
---------
42+
* Linux x64 installers will now be compiled with GCC 4.9.2.
43+
* OSX installer gives better error messages on brew failures and
44+
now includes link to [Fixing OS X Installer Failures] (https://github.com/arrayfire/arrayfire/wiki/Fixing-Common-OS-X-Installer-Failures)
45+
for brew installation failures.
46+
447
v3.3.1
548
==============
649

@@ -361,7 +404,7 @@ Bug Fixes
361404
Documentation Updates
362405
---------------------
363406
* Improved tutorials documentation
364-
* More detailed Using on [Linux](\ref using_on_windows), [OSX](\ref using_on_windows),
407+
* More detailed Using on [Linux](\ref using_on_linux), [OSX](\ref using_on_osx),
365408
[Windows](\ref using_on_windows) pages.
366409
* Added return type information for functions that return different type
367410
arrays

0 commit comments

Comments
 (0)