[arch-commits] Commit in arrayfire/repos/community-x86_64 (6 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Jun 25 07:58:38 UTC 2017
Date: Sunday, June 25, 2017 @ 07:58:37
Author: svenstaro
Revision: 240892
archrelease: copy trunk to community-x86_64
Added:
arrayfire/repos/community-x86_64/13c484e10537b52bcd012e6850520659769cece6.patch
(from rev 240891, arrayfire/trunk/13c484e10537b52bcd012e6850520659769cece6.patch)
arrayfire/repos/community-x86_64/PKGBUILD
(from rev 240891, arrayfire/trunk/PKGBUILD)
arrayfire/repos/community-x86_64/bf103c05bea41902cf9186224a6fa9435cb4e849.patch
(from rev 240891, arrayfire/trunk/bf103c05bea41902cf9186224a6fa9435cb4e849.patch)
Deleted:
arrayfire/repos/community-x86_64/13c484e10537b52bcd012e6850520659769cece6.patch
arrayfire/repos/community-x86_64/PKGBUILD
arrayfire/repos/community-x86_64/bf103c05bea41902cf9186224a6fa9435cb4e849.patch
------------------------------------------------+
13c484e10537b52bcd012e6850520659769cece6.patch | 62 +++++------
PKGBUILD | 127 +++++++++++------------
bf103c05bea41902cf9186224a6fa9435cb4e849.patch | 48 ++++----
3 files changed, 116 insertions(+), 121 deletions(-)
Deleted: 13c484e10537b52bcd012e6850520659769cece6.patch
===================================================================
--- 13c484e10537b52bcd012e6850520659769cece6.patch 2017-06-25 07:58:32 UTC (rev 240891)
+++ 13c484e10537b52bcd012e6850520659769cece6.patch 2017-06-25 07:58:37 UTC (rev 240892)
@@ -1,31 +0,0 @@
-From 13c484e10537b52bcd012e6850520659769cece6 Mon Sep 17 00:00:00 2001
-From: Shehzan Mohammed <shehzan at arrayfire.com>
-Date: Thu, 22 Dec 2016 18:10:54 -0500
-Subject: [PATCH] Build fix for CUDA Compile PTX generated names by CMake 3.7
-
----
- src/backend/cuda/CMakeLists.txt | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
-index 9cfa8a5..2f2045d 100644
---- a/src/backend/cuda/CMakeLists.txt
-+++ b/src/backend/cuda/CMakeLists.txt
-@@ -315,8 +315,16 @@ foreach(ptx_src_file ${ptx_sources})
-
- get_filename_component(_name "${ptx_src_file}" NAME_WE)
-
-+ # CUDA_COMPILE_PTX from CMake 3.7 has new features that require this change
-+ # TODO Fix this with a more complete solution
-+ IF(CMAKE_VERSION VERSION_LESS 3.7) # Before 3.7
-+ SET(NAME_APPEND "")
-+ ELSE(CMAKE_VERSION VERSION_LESS 3.7) # 3.7 and newer
-+ SET(NAME_APPEND "_1")
-+ ENDIF(CMAKE_VERSION VERSION_LESS 3.7)
-+
- set(_gen_file_name
-- "${PROJECT_BINARY_DIR}/src/backend/cuda/cuda_compile_ptx_generated_${_name}.cu.ptx")
-+ "${PROJECT_BINARY_DIR}/src/backend/cuda/cuda_compile_ptx${NAME_APPEND}_generated_${_name}.cu.ptx")
- set(_out_file_name
- "${PROJECT_BINARY_DIR}/src/backend/cuda/${_name}.ptx")
-
Copied: arrayfire/repos/community-x86_64/13c484e10537b52bcd012e6850520659769cece6.patch (from rev 240891, arrayfire/trunk/13c484e10537b52bcd012e6850520659769cece6.patch)
===================================================================
--- 13c484e10537b52bcd012e6850520659769cece6.patch (rev 0)
+++ 13c484e10537b52bcd012e6850520659769cece6.patch 2017-06-25 07:58:37 UTC (rev 240892)
@@ -0,0 +1,31 @@
+From 13c484e10537b52bcd012e6850520659769cece6 Mon Sep 17 00:00:00 2001
+From: Shehzan Mohammed <shehzan at arrayfire.com>
+Date: Thu, 22 Dec 2016 18:10:54 -0500
+Subject: [PATCH] Build fix for CUDA Compile PTX generated names by CMake 3.7
+
+---
+ src/backend/cuda/CMakeLists.txt | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
+index 9cfa8a5..2f2045d 100644
+--- a/src/backend/cuda/CMakeLists.txt
++++ b/src/backend/cuda/CMakeLists.txt
+@@ -315,8 +315,16 @@ foreach(ptx_src_file ${ptx_sources})
+
+ get_filename_component(_name "${ptx_src_file}" NAME_WE)
+
++ # CUDA_COMPILE_PTX from CMake 3.7 has new features that require this change
++ # TODO Fix this with a more complete solution
++ IF(CMAKE_VERSION VERSION_LESS 3.7) # Before 3.7
++ SET(NAME_APPEND "")
++ ELSE(CMAKE_VERSION VERSION_LESS 3.7) # 3.7 and newer
++ SET(NAME_APPEND "_1")
++ ENDIF(CMAKE_VERSION VERSION_LESS 3.7)
++
+ set(_gen_file_name
+- "${PROJECT_BINARY_DIR}/src/backend/cuda/cuda_compile_ptx_generated_${_name}.cu.ptx")
++ "${PROJECT_BINARY_DIR}/src/backend/cuda/cuda_compile_ptx${NAME_APPEND}_generated_${_name}.cu.ptx")
+ set(_out_file_name
+ "${PROJECT_BINARY_DIR}/src/backend/cuda/${_name}.ptx")
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-06-25 07:58:32 UTC (rev 240891)
+++ PKGBUILD 2017-06-25 07:58:37 UTC (rev 240892)
@@ -1,66 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=arrayfire
-pkgdesc="High performance software library for parallel computing with an easy-to-use API"
-url='http://arrayfire.com'
-pkgver=3.4.2
-arch=('x86_64')
-pkgrel=2
-license=('BSD')
-makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'glfw' 'glew' 'boost' 'git' 'python' 'gcc5' 'ocl-icd')
-makedepends_x86_64=('cuda' 'nvidia-utils')
-depends=('cblas' 'fftw' 'boost-libs' 'lapacke' 'forge' 'freeimage' 'glfw' 'glew')
-optdepends=('cuda: Required for using CUDA backend'
- 'nvidia-utils: Required for using CUDA backend'
- 'libclc: Required for using OpenCL backend')
-source=("http://arrayfire.com/arrayfire_source/arrayfire-full-${pkgver}.tar.bz2"
- bf103c05bea41902cf9186224a6fa9435cb4e849.patch
- 13c484e10537b52bcd012e6850520659769cece6.patch)
-sha512sums=('c8b139ca314224c33ff45a1b304dc5fc5ed2a5eca726606b316f4b355680c842fac434f19e6cd3820065845d94359a62e684e20521136f1944015760aa004368'
- 'de697b39ca747a1104b895c45bc7e3dba274c74bdd840ae0c0cb1e32d6d268b03da2d1092a09dd6f449fc1ad5f3e90470b1559b8c7038ee274b16d3c6b14a05b'
- 'b3b1c52e3161d8085297d4cd2cb0aa03d567cf8bbcdf33071cd402f049cba1cce38afb1085d82ba83a75741b47c2835141ca1b1253a1149f0ef373ab4526706b')
-
-prepare() {
- cd "${srcdir}/arrayfire-full-${pkgver}"
-
- patch -Np1 < "${srcdir}/bf103c05bea41902cf9186224a6fa9435cb4e849.patch"
- patch -Np1 < "${srcdir}/13c484e10537b52bcd012e6850520659769cece6.patch"
-}
-
-# check() {
-# cd "${srcdir}/arrayfire-full-${pkgver}/build"
-#
-# # Some tests fail :(
-# #make test
-# }
-
-build() {
- cd "${srcdir}/arrayfire-full-${pkgver}"
-
- rm -rf build
- mkdir build && cd build
-
- export CC=gcc-5
- export CXX=g++-5
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DUSE_SYSTEM_FORGE=ON \
- -DCOMPUTES_DETECTED_LIST="20;30;32;35;50;52;53" \
- -DBUILD_CPU=ON \
- -DBUILD_OPENCL=ON \
- -DBUILD_NONFREE=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_EXAMPLES=ON \
- -DBUILD_DOCS=ON
-
- make
-}
-
-package() {
- cd "${srcdir}/arrayfire-full-${pkgver}"
-
- install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- cd build
-
- make DESTDIR="${pkgdir}/" install
-}
Copied: arrayfire/repos/community-x86_64/PKGBUILD (from rev 240891, arrayfire/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-06-25 07:58:37 UTC (rev 240892)
@@ -0,0 +1,61 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=arrayfire
+pkgdesc="High performance software library for parallel computing with an easy-to-use API"
+url='http://arrayfire.com'
+pkgver=3.5.0
+arch=('x86_64')
+pkgrel=1
+license=('BSD')
+makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'glfw' 'glew' 'boost' 'git' 'python' 'gcc5' 'ocl-icd')
+makedepends_x86_64=('cuda' 'nvidia-utils')
+depends=('cblas' 'fftw' 'boost-libs' 'lapacke' 'forge' 'freeimage' 'glfw' 'glew')
+optdepends=('cuda: Required for using CUDA backend'
+ 'nvidia-utils: Required for using CUDA backend'
+ 'libclc: Required for using OpenCL backend')
+source=("http://arrayfire.com/arrayfire_source/arrayfire-full-${pkgver}.tar.bz2")
+sha512sums=('cf33ee9312724849bec4ed9573dfe9a9504520b7a5e8b45b9e022beab6a7cf14f00b978cb954bdd498dd70626913c40a72277e29b6b792da29cf5daf5c04e1d7')
+
+prepare() {
+ cd "${srcdir}/arrayfire-full-${pkgver}"
+
+ # patches here
+}
+
+build() {
+ cd "${srcdir}/arrayfire-full-${pkgver}"
+
+ rm -rf build
+ mkdir build && cd build
+
+ export CC=gcc-5
+ export CXX=g++-5
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DUSE_SYSTEM_FORGE=ON \
+ -DCOMPUTES_DETECTED_LIST="20;30;32;35;50;52;53" \
+ -DBUILD_CPU=ON \
+ -DBUILD_OPENCL=ON \
+ -DBUILD_NONFREE=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_EXAMPLES=ON \
+ -DBUILD_DOCS=ON
+
+ make
+}
+
+# check() {
+# cd "${srcdir}/arrayfire-full-${pkgver}/build"
+#
+# # Some tests fail :(
+# make test
+# }
+
+package() {
+ cd "${srcdir}/arrayfire-full-${pkgver}"
+
+ install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+ cd build
+
+ make DESTDIR="${pkgdir}/" install
+}
Deleted: bf103c05bea41902cf9186224a6fa9435cb4e849.patch
===================================================================
--- bf103c05bea41902cf9186224a6fa9435cb4e849.patch 2017-06-25 07:58:32 UTC (rev 240891)
+++ bf103c05bea41902cf9186224a6fa9435cb4e849.patch 2017-06-25 07:58:37 UTC (rev 240892)
@@ -1,24 +0,0 @@
-From bf103c05bea41902cf9186224a6fa9435cb4e849 Mon Sep 17 00:00:00 2001
-From: pradeep <pradeep at arrayfire.com>
-Date: Mon, 9 Jan 2017 12:58:52 +0530
-Subject: [PATCH] Fix for CUDA usage with gcc > 5.x
-
----
- src/backend/cuda/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
-index 8ae3799..f5ff450 100644
---- a/src/backend/cuda/CMakeLists.txt
-+++ b/src/backend/cuda/CMakeLists.txt
-@@ -338,6 +338,10 @@ ELSE()
- ENDIF()
- ENDIF()
-
-+IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_MWAITXINTRIN_H_INCLUDED -D_FORCE_INLINES")
-+ENDIF()
-+
- ## Copied from FindCUDA.cmake
- ## The target_link_library needs to link with the cuda libraries using
- ## PRIVATE
Copied: arrayfire/repos/community-x86_64/bf103c05bea41902cf9186224a6fa9435cb4e849.patch (from rev 240891, arrayfire/trunk/bf103c05bea41902cf9186224a6fa9435cb4e849.patch)
===================================================================
--- bf103c05bea41902cf9186224a6fa9435cb4e849.patch (rev 0)
+++ bf103c05bea41902cf9186224a6fa9435cb4e849.patch 2017-06-25 07:58:37 UTC (rev 240892)
@@ -0,0 +1,24 @@
+From bf103c05bea41902cf9186224a6fa9435cb4e849 Mon Sep 17 00:00:00 2001
+From: pradeep <pradeep at arrayfire.com>
+Date: Mon, 9 Jan 2017 12:58:52 +0530
+Subject: [PATCH] Fix for CUDA usage with gcc > 5.x
+
+---
+ src/backend/cuda/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
+index 8ae3799..f5ff450 100644
+--- a/src/backend/cuda/CMakeLists.txt
++++ b/src/backend/cuda/CMakeLists.txt
+@@ -338,6 +338,10 @@ ELSE()
+ ENDIF()
+ ENDIF()
+
++IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_MWAITXINTRIN_H_INCLUDED -D_FORCE_INLINES")
++ENDIF()
++
+ ## Copied from FindCUDA.cmake
+ ## The target_link_library needs to link with the cuda libraries using
+ ## PRIVATE
More information about the arch-commits
mailing list