From ad8bc09cf6040c582fcb04918840874cf0fb900d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 18 Mar 2016 17:03:04 -0300 Subject: arrayfire 3.3.1-1.parabola1: updating version --- libre/arrayfire/PKGBUILD | 12 ++-- libre/arrayfire/remove-nonfree-references.patch | 96 +++++++++++++------------ 2 files changed, 57 insertions(+), 51 deletions(-) (limited to 'libre/arrayfire') diff --git a/libre/arrayfire/PKGBUILD b/libre/arrayfire/PKGBUILD index 9682d0050..76bcadff3 100644 --- a/libre/arrayfire/PKGBUILD +++ b/libre/arrayfire/PKGBUILD @@ -3,19 +3,19 @@ pkgname=arrayfire pkgdesc="High performance software library for parallel computing with an easy-to-use API, without nonfree cuda and nvidia-utils support and nonfree SIFT algorithm" url='http://arrayfire.com' -pkgver=3.2.2 +pkgver=3.3.1 arch=('i686' 'x86_64') pkgrel=1.parabola1 license=('BSD') -makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'glfw' 'glew' 'boost' 'git') +makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'glfw' 'glew' 'boost' 'git' 'python') depends=('cblas' 'fftw' 'boost-libs' 'lapacke' 'forge' 'freeimage' 'glfw' 'glew') optdepends=('libclc: Required for using OpenCL backend') mksource=(http://arrayfire.com/arrayfire_source/arrayfire-full-${pkgver}.tar.bz2) source=(https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-full-${pkgver}.tar.bz2 remove-nonfree-references.patch) -mkmd5sums=('2b7f354c249bdbeef158513c0136b4a5') -md5sums=('b8806d884ca54426ee6e343e6cfef875' - '679f5b3b1dec733fd6c1e8c32168c560') +mkmd5sums=('4d2b7e9c14d1e5ba3ab262aceec94991') +md5sums=('c7ba11933024d8d57b369acb55bf3356' + 'a826b39647d3b48295dd727a2d74fb6a') check() { cd "${srcdir}/arrayfire-full-${pkgver}/build" @@ -30,7 +30,7 @@ mksource() { rm -v src/backend/cuda/kernel/sift_nonfree.hpp rm -v src/backend/opencl/kernel/sift_nonfree.cl rm -v src/backend/opencl/kernel/sift_nonfree.hpp - rm -v src/backend/cpu/sift_nonfree.hpp + rm -v src/backend/cpu/kernel/sift_nonfree.hpp } prepare() { diff --git a/libre/arrayfire/remove-nonfree-references.patch b/libre/arrayfire/remove-nonfree-references.patch index 1f6750e0c..b9b183543 100644 --- a/libre/arrayfire/remove-nonfree-references.patch +++ b/libre/arrayfire/remove-nonfree-references.patch @@ -1,6 +1,7 @@ -diff -Nur arrayfire-full-3.2.0.orig/docs/layout.xml arrayfire-full-3.2.0/docs/layout.xml ---- arrayfire-full-3.2.0.orig/docs/layout.xml 2015-11-13 14:02:44.000000000 -0300 -+++ arrayfire-full-3.2.0/docs/layout.xml 2015-11-16 22:17:23.086321178 -0300 +diff --git a/docs/layout.xml b/docs/layout.xml +index 0b272f6..971c00a 100644 +--- a/docs/layout.xml ++++ b/docs/layout.xml @@ -5,8 +5,6 @@ @@ -10,10 +11,11 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/layout.xml arrayfire-full-3.2.0/docs/la -diff -Nur arrayfire-full-3.1.2.orig/docs/pages/README.md arrayfire-full-3.1.2/docs/pages/README.md ---- arrayfire-full-3.1.2.orig/docs/pages/README.md 2015-09-25 19:16:18.000000000 -0300 -+++ arrayfire-full-3.1.2/docs/pages/README.md 2015-11-02 15:56:01.952662051 -0300 -@@ -9,10 +9,8 @@ +diff --git a/docs/pages/README.md b/docs/pages/README.md +index 8a395a7..46011ca 100644 +--- a/docs/pages/README.md ++++ b/docs/pages/README.md +@@ -9,10 +9,8 @@ ArrayFire is a high performance software library for parallel computing with an ## Installing ArrayFire @@ -25,7 +27,7 @@ diff -Nur arrayfire-full-3.1.2.orig/docs/pages/README.md arrayfire-full-3.1.2/do * [Build from source](https://github.com/arrayfire/arrayfire) ## Easy to use -@@ -24,7 +22,7 @@ +@@ -24,7 +22,7 @@ readable math-resembling notation. You _do not_ need expertise in parallel programming to use ArrayFire. A few lines of ArrayFire code @@ -34,7 +36,7 @@ diff -Nur arrayfire-full-3.1.2.orig/docs/pages/README.md arrayfire-full-3.1.2/do kernels. ## ArrayFire is extensive! -@@ -56,25 +54,23 @@ +@@ -56,25 +54,23 @@ unsigned integers. #### Extending ArrayFire ArrayFire can be used as a stand-alone application or integrated with @@ -63,18 +65,18 @@ diff -Nur arrayfire-full-3.1.2.orig/docs/pages/README.md arrayfire-full-3.1.2/do -Batch operations in ArrayFire are run in parallel ensuring an optimal usage of your CUDA or OpenCL device. +Batch operations in ArrayFire are run in parallel ensuring an optimal usage of your OpenCL device. - You can get the best performance out of ArrayFire using [vectorization techniques](). + You can get the best performance out of ArrayFire using [vectorization techniques](\ref vectorization). -@@ -93,7 +89,7 @@ +@@ -93,7 +89,7 @@ Read more about how [ArrayFire JIT](http://arrayfire.com/performance-of-arrayfir ## Simple Example - Here's a live example to let you see ArrayFire code. You create [arrays](\ref --construct_mat) which reside on CUDA or OpenCL devices. Then you can use -+construct_mat) which reside on OpenCL devices. Then you can use + Here's a live example to let you see ArrayFire code. You create [arrays](\ref construct_mat) +-which reside on CUDA or OpenCL devices. Then you can use ++which reside on OpenCL devices. Then you can use [ArrayFire functions](modules.htm) on those [arrays](\ref construct_mat). ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} -@@ -144,7 +140,7 @@ +@@ -144,7 +140,7 @@ Formatted: BibTeX: @misc{Yalamanchili2015, @@ -83,12 +85,13 @@ diff -Nur arrayfire-full-3.1.2.orig/docs/pages/README.md arrayfire-full-3.1.2/do address = {Atlanta}, author = {Yalamanchili, Pavan and Arshad, Umar and Mohammed, Zakiuddin and Garigipati, Pradeep and Entschev, Peter and Kloppenborg, Brian and Malcolm, James and Melonakos, John}, publisher = {AccelerEyes}, -diff -Nur arrayfire-full-3.1.2.orig/docs/pages/configuring_arrayfire_environment.md arrayfire-full-3.1.2/docs/pages/configuring_arrayfire_environment.md ---- arrayfire-full-3.1.2.orig/docs/pages/configuring_arrayfire_environment.md 2015-09-25 19:16:18.000000000 -0300 -+++ arrayfire-full-3.1.2/docs/pages/configuring_arrayfire_environment.md 2015-11-02 12:12:06.817016693 -0300 -@@ -18,19 +18,6 @@ - present in this directory. You can use this variable to add include paths and - libraries to your projects. +diff --git a/docs/pages/configuring_arrayfire_environment.md b/docs/pages/configuring_arrayfire_environment.md +index d554046..526d4cc 100644 +--- a/docs/pages/configuring_arrayfire_environment.md ++++ b/docs/pages/configuring_arrayfire_environment.md +@@ -28,19 +28,6 @@ detailed. This helps in locating the exact failure. + AF_PRINT_ERRORS=1 ./myprogram + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -AF_CUDA_DEFAULT_DEVICE {#af_cuda_default_device} -------------------------------------------------------------------------------- @@ -106,10 +109,11 @@ diff -Nur arrayfire-full-3.1.2.orig/docs/pages/configuring_arrayfire_environment AF_OPENCL_DEFAULT_DEVICE {#af_opencl_default_device} ------------------------------------------------------------------------------- -diff -Nur arrayfire-full-3.2.0.orig/docs/pages/getting_started.md arrayfire-full-3.2.0/docs/pages/getting_started.md ---- arrayfire-full-3.2.0.orig/docs/pages/getting_started.md 2015-11-13 14:02:44.000000000 -0300 -+++ arrayfire-full-3.2.0/docs/pages/getting_started.md 2015-11-16 22:17:23.086321178 -0300 -@@ -41,7 +41,6 @@ +diff --git a/docs/pages/getting_started.md b/docs/pages/getting_started.md +index c1ae05e..202baf2 100644 +--- a/docs/pages/getting_started.md ++++ b/docs/pages/getting_started.md +@@ -41,7 +41,6 @@ For example: \snippet test/getting_started.cpp ex_getting_started_init ArrayFire also supports array initialization from a device pointer. @@ -117,7 +121,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/getting_started.md arrayfire-full \snippet test/getting_started.cpp ex_getting_started_dev_ptr -@@ -69,7 +68,7 @@ +@@ -69,7 +68,7 @@ Most of ArrayFire's functions operate on an element-wise basis. This means that function like `c[i] = a[i] + b[i]` could simply be written as `c = a + b`. ArrayFire has an intelligent runtime JIT compliation engine which converts @@ -126,7 +130,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/getting_started.md arrayfire-full This "kernel fusion" technology not only decreases the number of kernel calls, but, more importantly, avoids extraneous global memory operations. Our JIT functionality extends across C/C++ function boundaries and only ends -@@ -100,7 +99,7 @@ +@@ -100,7 +99,7 @@ using the `af::` namespace. # Indexing {#getting_started_indexing} Like all functions in ArrayFire, indexing is also executed in parallel on @@ -135,7 +139,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/getting_started.md arrayfire-full Because of this, indexing becomes part of a JIT operation and is accomplished using parentheses instead of square brackets (i.e. as `A(0)` instead of `A[0]`). To index `af::array`s you may use one or a combination of the following functions: -@@ -123,8 +122,8 @@ +@@ -123,8 +122,8 @@ and device()](\ref af::array::device) functions. The `host` function *copies* the data from the device and makes it available in a C-style array on the host. The `device` function returns a pointer to device memory for interoperability @@ -146,7 +150,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/getting_started.md arrayfire-full \snippet test/getting_started.cpp ex_getting_started_ptr -@@ -194,8 +193,7 @@ +@@ -194,8 +193,7 @@ simply include the `arrayfire.h` header file and start coding! Now that you have a general introduction to ArrayFire, where do you go from here? In particular you might find these documents useful @@ -156,10 +160,11 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/getting_started.md arrayfire-full * [Timing ArrayFire code](\ref timing) -diff -Nur arrayfire-full-3.2.0.orig/docs/pages/release_notes.md arrayfire-full-3.2.0/docs/pages/release_notes.md ---- arrayfire-full-3.2.0.orig/docs/pages/release_notes.md 2015-11-13 14:02:44.000000000 -0300 -+++ arrayfire-full-3.2.0/docs/pages/release_notes.md 2015-11-16 22:17:23.086321178 -0300 -@@ -158,7 +158,6 @@ +diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md +index 7aa3878..186e183 100644 +--- a/docs/pages/release_notes.md ++++ b/docs/pages/release_notes.md +@@ -433,7 +433,6 @@ v3.1.1 Installers ----------- @@ -167,7 +172,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/release_notes.md arrayfire-full-3 * OpenCL backend now require OpenCL 1.2 or greater Bug Fixes -@@ -238,10 +237,6 @@ +@@ -513,10 +512,6 @@ Function Additions * \ref saveArray() and \ref readArray() - Stream arrays to binary files * \ref toString() - toString function returns the array and data as a string @@ -178,7 +183,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/release_notes.md arrayfire-full-3 Improvements ------------ * dot -@@ -265,11 +260,6 @@ +@@ -540,11 +535,6 @@ Improvements * CPU Backend * Device properties for CPU * Improved performance when all buffers are indexed linearly @@ -190,7 +195,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/release_notes.md arrayfire-full-3 * OpenCL Backend * Improve compilation times for OpenCL backend * Performance improvements for non-linear JIT kernels on OpenCL -@@ -303,7 +293,7 @@ +@@ -578,7 +568,7 @@ New Examples Installer ---------- * Fixed bug in automatic detection of ArrayFire when using with CMake in Windows @@ -199,9 +204,10 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/release_notes.md arrayfire-full-3 Known Issues ------------ -diff -Nur arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md arrayfire-full-3.2.0/docs/pages/using_on_linux.md ---- arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md 2015-11-13 14:02:44.000000000 -0300 -+++ arrayfire-full-3.2.0/docs/pages/using_on_linux.md 2015-11-16 22:54:37.520143633 -0300 +diff --git a/docs/pages/using_on_linux.md b/docs/pages/using_on_linux.md +index 493080f..b86c326 100644 +--- a/docs/pages/using_on_linux.md ++++ b/docs/pages/using_on_linux.md @@ -1,42 +1,35 @@ -Using ArrayFire on Linux {#using_on_linux} +Using ArrayFire on GNU/Linux {#using_on_linux} @@ -251,7 +257,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md arrayfire-full- Install build dependencies -@@ -44,7 +37,7 @@ +@@ -44,7 +37,7 @@ Install build dependencies yum install gcc gcc-c++ cmake make ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -260,7 +266,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md arrayfire-full- Install common dependencies -@@ -64,7 +57,7 @@ +@@ -64,7 +57,7 @@ ArrayFire to an existing project. As [discussed above](#big-picture), ArrayFire ships with a series of CMake scripts to make finding and using our library easy. The scripts will automatically find all versions of the ArrayFire library @@ -269,7 +275,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md arrayfire-full- First create a file called `CMakeLists.txt` in your project directory: -@@ -82,22 +75,13 @@ +@@ -82,22 +75,13 @@ and populate it with the following code: FIND_PACKAGE(OpenCL) SET(EXTRA_LIBS ${CMAKE_THREAD_LIBS_INIT} ${OpenCL_LIBRARIES}) @@ -293,7 +299,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md arrayfire-full- In the above code listing, the `FIND_PACKAGE` will find the ArrayFire include files, libraries, and define several variables including: -@@ -112,8 +96,6 @@ +@@ -112,8 +96,6 @@ If you wish to use a specific backend, the find script also defines these variab ArrayFire_CPU_FOUND - True of the ArrayFire CPU library has been found. ArrayFire_CPU_LIBRARIES - Location of ArrayFire's CPU library, if found @@ -302,7 +308,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md arrayfire-full- ArrayFire_OpenCL_FOUND - True of the ArrayFire OpenCL library has been found. ArrayFire_OpenCL_LIBRARIES - Location of ArrayFire's OpenCL library, if found ArrayFire_Unified_FOUND - True of the ArrayFire Unified library has been found. -@@ -121,13 +103,8 @@ +@@ -121,13 +103,8 @@ If you wish to use a specific backend, the find script also defines these variab Therefore, if you wish to target a specific specific backend, simply replace `${ArrayFire_LIBRARIES}` with `${ArrayFire_CPU}`, `${ArrayFire_OPENCL}`, @@ -317,7 +323,7 @@ diff -Nur arrayfire-full-3.2.0.orig/docs/pages/using_on_linux.md arrayfire-full- Next we need to instruct CMake to create build instructions and then compile. We suggest using CMake's out-of-source build functionality to keep your build -@@ -161,8 +138,7 @@ +@@ -161,8 +138,7 @@ instructions. Similarly, you will need to specify the path to the ArrayFire library using the `-L` option (e.g. `-L/usr/local/lib`) followed by the specific ArrayFire library you wish to use using the `-l` option (for example `-lafcpu`, -- cgit v1.2.3