* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/
@ 2016-12-01 9:00 Marius Brehler
0 siblings, 0 replies; 7+ messages in thread
From: Marius Brehler @ 2016-12-01 9:00 UTC (permalink / raw
To: gentoo-commits
commit: a2fd90ae05dcc27d04772022a8563de2a9da5ff0
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Dec 1 09:00:02 2016 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Thu Dec 1 09:00:28 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a2fd90ae
sci-libs/arrayfire: Fix FindCBLAS.cmake in 3.4.1-r1
Package-Manager: portage-2.3.0
...fire-3.4.1.ebuild => arrayfire-3.4.1-r1.ebuild} | 2 ++
.../files/arrayfire-3.4.1-FindCBLAS.patch | 37 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
similarity index 98%
rename from sci-libs/arrayfire/arrayfire-3.4.1.ebuild
rename to sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
index 8c80bc3..563042a 100644
--- a/sci-libs/arrayfire/arrayfire-3.4.1.ebuild
+++ b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
@@ -52,6 +52,8 @@ S="${WORKDIR}/${PN}-full-${PV}"
BUILD_DIR="${S}/build"
CMAKE_BUILD_TYPE=Release
+PATCHES=("${FILESDIR}/${P}-FindCBLAS.patch")
+
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
# user is (usually) not in the video group
RESTRICT="userpriv"
diff --git a/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
new file mode 100644
index 0000000..b75569f
--- /dev/null
+++ b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
@@ -0,0 +1,37 @@
+https://github.com/arrayfire/arrayfire/pull/1657
+
+
+From 23228318b153bdc5bb30e084f9310b09b1644bd0 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Wed, 30 Nov 2016 14:07:21 +0100
+Subject: [PATCH] FindCBLAS.cmake: Fix setting CBLAS_INCLUDE_DIR if PkgConfig
+ is used
+
+---
+ CMakeModules/FindCBLAS.cmake | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake
+index fbb646b..058b7d7 100644
+--- a/CMakeModules/FindCBLAS.cmake
++++ b/CMakeModules/FindCBLAS.cmake
+@@ -39,8 +39,14 @@ IF(PC_CBLAS_FOUND)
+ LIST(APPEND CBLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
+ ENDFOREACH(PC_LIB)
+
+- FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES)
+- MARK_AS_ADVANCED(CBLAS_LIBRARIES)
++ FIND_PATH(CBLAS_INCLUDE_DIRS NAMES cblas.h HINTS ${PC_CBLAS_INCLUDE_DIRS} )
++ IF (NOT CBLAS_INCLUDE_DIRS)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - cblas.h not found in ${PC_CBLAS_INCLUDE_DIRS}")
++ ENDIF (NOT CBLAS_INCLUDE_DIRS)
++ SET(CBLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIRS})
++
++ FIND_PACKAGE_HANDLE_STANDARD_ARGS(CBLAS DEFAULT_MSG CBLAS_LIBRARIES CBLAS_INCLUDE_DIR)
++ MARK_AS_ADVANCED(CBLAS_LIBRARIES CBLAS_INCLUDE_DIR)
+
+ ELSE(PC_CBLAS_FOUND)
+
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/
@ 2017-04-11 14:52 Marius Brehler
0 siblings, 0 replies; 7+ messages in thread
From: Marius Brehler @ 2017-04-11 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 9dff7e7eecad5710bd17afa035a2e13d53bc3856
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Apr 11 14:50:39 2017 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Apr 11 14:50:39 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9dff7e7e
sci-libs/arrayfire: Apply upstream patch to 3.4.2
Build fix for CUDA Compile PTX generated names by CMake 3.7
See https://github.com/arrayfire/arrayfire/issues/1755
Package-Manager: Portage-2.3.3, Repoman-2.3.1
...fire-3.4.2.ebuild => arrayfire-3.4.2-r1.ebuild} | 2 ++
...-fix-for-CUDA-Compile-PTX-generated-names.patch | 34 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/sci-libs/arrayfire/arrayfire-3.4.2.ebuild b/sci-libs/arrayfire/arrayfire-3.4.2-r1.ebuild
similarity index 96%
rename from sci-libs/arrayfire/arrayfire-3.4.2.ebuild
rename to sci-libs/arrayfire/arrayfire-3.4.2-r1.ebuild
index 51723b18c..0a9ff57d4 100644
--- a/sci-libs/arrayfire/arrayfire-3.4.2.ebuild
+++ b/sci-libs/arrayfire/arrayfire-3.4.2-r1.ebuild
@@ -53,6 +53,8 @@ S="${WORKDIR}/${PN}-full-${PV}"
BUILD_DIR="${S}/build"
CMAKE_BUILD_TYPE=Release
+PATCHES=("${FILESDIR}/${P}-Build-fix-for-CUDA-Compile-PTX-generated-names.patch")
+
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
# user is (usually) not in the video group
RESTRICT="userpriv"
diff --git a/sci-libs/arrayfire/files/arrayfire-3.4.2-Build-fix-for-CUDA-Compile-PTX-generated-names.patch b/sci-libs/arrayfire/files/arrayfire-3.4.2-Build-fix-for-CUDA-Compile-PTX-generated-names.patch
new file mode 100644
index 000000000..3cc51b1b3
--- /dev/null
+++ b/sci-libs/arrayfire/files/arrayfire-3.4.2-Build-fix-for-CUDA-Compile-PTX-generated-names.patch
@@ -0,0 +1,34 @@
+From 13c484e10537b52bcd012e6850520659769cece6 Mon Sep 17 00:00:00 2001
+From: Shehzan Mohammed <shehzan@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")
+
+--
+2.10.2
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/
@ 2016-05-19 7:14 Marius Brehler
0 siblings, 0 replies; 7+ messages in thread
From: Marius Brehler @ 2016-05-19 7:14 UTC (permalink / raw
To: gentoo-commits
commit: d85e227cb142383049ee20008f014fe54da51240
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu May 19 07:08:01 2016 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Thu May 19 07:08:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d85e227c
sci-libs/arrayfire: Version bump to 3.2.2
Package-Manager: portage-2.2.28
sci-libs/arrayfire/arrayfire-3.3.2.ebuild | 111 +++++++++++++++++++++
.../files/arrayfire-3.3.2-FindLAPACKE.patch | 28 ++++++
2 files changed, 139 insertions(+)
diff --git a/sci-libs/arrayfire/arrayfire-3.3.2.ebuild b/sci-libs/arrayfire/arrayfire-3.3.2.ebuild
new file mode 100644
index 0000000..22b96bd
--- /dev/null
+++ b/sci-libs/arrayfire/arrayfire-3.3.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+GTEST_PV="1.7.0"
+
+DESCRIPTION="A general purpose GPU library"
+HOMEPAGE="http://www.arrayfire.com/"
+SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2
+test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )"
+KEYWORDS="~amd64"
+
+LICENSE="BSD
+ nonfree? ( OpenSIFT )"
+SLOT="0"
+IUSE="+examples +cpu cuda nonfree opencl test unified graphics"
+
+RDEPEND="
+ >=sys-devel/gcc-4.7:*
+ media-libs/freeimage
+ cuda? (
+ >=dev-util/nvidia-cuda-toolkit-7.5.18-r1
+ dev-libs/boost
+ )
+ cpu? (
+ virtual/blas
+ virtual/cblas
+ virtual/lapacke
+ sci-libs/fftw:3.0
+ )
+ opencl? (
+ virtual/blas
+ virtual/cblas
+ virtual/lapacke
+ dev-libs/boost
+ dev-libs/boost-compute
+ >=sci-libs/clblas-2.4
+ >=sci-libs/clfft-2.6.1
+ )
+ graphics? (
+ media-libs/glew
+ >=media-libs/glfw-3.1.1
+ =sci-visualization/forge-3.2.2
+ )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-full-${PV}"
+BUILD_DIR="${S}/build"
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=("${FILESDIR}/${P}-FindLAPACKE.patch")
+
+# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
+ die "Compilation with gcc older than 4.7 is not supported."
+ fi
+ fi
+}
+
+src_unpack() {
+ default
+
+ if ! use nonfree; then
+ find "${WORKDIR}" -name "*_nonfree*" -delete || die
+ fi
+
+ if use test; then
+ mkdir -p "${BUILD_DIR}"/third_party/src/ || die
+ mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
+ fi
+}
+
+src_configure() {
+ if use cuda; then
+ addwrite /dev/nvidiactl
+ addwrite /dev/nvidia0
+ addwrite /dev/nvidia-uvm
+ fi
+
+ local mycmakeargs=(
+ $(cmake-utils_use_build cpu CPU)
+ $(cmake-utils_use_build cuda CUDA)
+ $(cmake-utils_use_build opencl OPENCL)
+ $(cmake-utils_use_build examples EXAMPLES)
+ $(cmake-utils_use_build test TEST)
+ $(cmake-utils_use_build graphics GRAPHICS)
+ $(cmake-utils_use_build nonfree NONFREE)
+ $(cmake-utils_use_build unified UNIFIED)
+ -DUSE_SYSTEM_BOOST_COMPUTE=ON
+ -DUSE_SYSTEM_CLBLAS=ON
+ -DUSE_SYSTEM_CLFFT=ON
+ -DUSE_SYSTEM_FORGE=ON
+ -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ dobin "${BUILD_DIR}/bin2cpp"
+}
diff --git a/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch b/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch
new file mode 100644
index 0000000..ab9b2f5
--- /dev/null
+++ b/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch
@@ -0,0 +1,28 @@
+https://github.com/arrayfire/arrayfire/issues/1419
+
+
+From 2691d99693d6185d4f322a7776b1ced0e76877d2 Mon Sep 17 00:00:00 2001
+From: Shehzan Mohammed <shehzan@arrayfire.com>
+Date: Wed, 18 May 2016 10:18:34 -0400
+Subject: [PATCH] BUGFIX Correctly handle lapacke found by package config
+
+---
+ CMakeModules/FindLAPACKE.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake
+index 5ecf7be..2ebd8dd 100644
+--- a/CMakeModules/FindLAPACKE.cmake
++++ b/CMakeModules/FindLAPACKE.cmake
+@@ -143,7 +143,7 @@ ELSE(PC_LAPACKE_FOUND)
+ ENDIF(LAPACKE_ROOT_DIR)
+ ENDIF(PC_LAPACKE_FOUND)
+
+-IF(LAPACKE_LIB AND LAPACK_LIB)
++IF(PC_LAPACKE_FOUND OR (LAPACKE_LIB AND LAPACK_LIB))
+ SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB})
+ ENDIF()
+ IF(LAPACKE_INCLUDES)
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/
@ 2015-09-19 12:51 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-09-19 12:51 UTC (permalink / raw
To: gentoo-commits
commit: c4d7001938b7ff967f4d9af2aee645fcecc91f85
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Sep 18 08:35:51 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 08:36:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4d70019
sci-libs/arrayfire: Drop old
Package-Manager: portage-2.2.20.1
sci-libs/arrayfire/ChangeLog | 7 ++
sci-libs/arrayfire/arrayfire-3.0.2.ebuild | 100 ---------------------
sci-libs/arrayfire/arrayfire-3.0_beta.ebuild | 94 -------------------
sci-libs/arrayfire/arrayfire-3.1.0.ebuild | 100 ---------------------
.../arrayfire-3.0_beta-FindBoostCompute.patch | 34 -------
.../files/arrayfire-3.0_beta-FindCBLAS.patch | 52 -----------
.../arrayfire-3.0_beta-opencl_CMakeLists.patch | 26 ------
7 files changed, 7 insertions(+), 406 deletions(-)
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index acf4051..d7a241b 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 18 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+ -arrayfire-3.0.2.ebuild, -arrayfire-3.0_beta.ebuild, -arrayfire-3.1.0.ebuild,
+ -files/arrayfire-3.0_beta-FindBoostCompute.patch,
+ -files/arrayfire-3.0_beta-FindCBLAS.patch,
+ -files/arrayfire-3.0_beta-opencl_CMakeLists.patch:
+ sci-libs/arrayfire: Drop old
+
*arrayfire-3.1.1-r1 (17 Sep 2015)
17 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
diff --git a/sci-libs/arrayfire/arrayfire-3.0.2.ebuild b/sci-libs/arrayfire/arrayfire-3.0.2.ebuild
deleted file mode 100644
index 7c43ce3..0000000
--- a/sci-libs/arrayfire/arrayfire-3.0.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-GTEST_PV="1.7.0"
-
-DESCRIPTION="A general purpose GPU library."
-HOMEPAGE="http://www.arrayfire.com/"
-SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2
-test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
-
-RDEPEND="
- >=sys-devel/gcc-4.7:*
- media-libs/freeimage
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-6.0
- dev-libs/boost
- )
- cpu? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- sci-libs/fftw:3.0
- )
- opencl? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- dev-libs/boost
- dev-libs/boost-compute
- >=sci-libs/clblas-2.4
- >=sci-libs/clfft-2.6.1
- )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-BUILD_DIR="${S}/build"
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}/${PN}"-9999-FindCBLAS.patch
- "${FILESDIR}/${PN}"-9999-Try-PkgConf-first-to-find-LAPACKE.patch
-)
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
- die "Compilation with gcc older than 4.7 is not supported."
- fi
- fi
-}
-
-src_unpack() {
- default
-
- if use test; then
- mkdir -p "${BUILD_DIR}"/third_party/src/ || die
- mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
- fi
-}
-
-src_configure() {
- if use cuda; then
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
- addwrite /dev/nvidia-uvm
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_build cpu CPU)
- $(cmake-utils_use_build cuda CUDA)
- $(cmake-utils_use_build opencl OPENCL)
- $(cmake-utils_use_build examples EXAMPLES)
- $(cmake-utils_use_build test TEST)
- -DUSE_SYSTEM_BOOST_COMPUTE=ON
- -DUSE_SYSTEM_CLBLAS=ON
- -DUSE_SYSTEM_CLFFT=ON
- -DBUILD_GRAPHICS=OFF
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- dobin "${BUILD_DIR}/bin2cpp"
-}
diff --git a/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild b/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild
deleted file mode 100644
index 75337f0..0000000
--- a/sci-libs/arrayfire/arrayfire-3.0_beta.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils git-r3
-
-GTEST_PV="1.7.0"
-
-DESCRIPTION="A general purpose GPU library."
-HOMEPAGE="http://www.arrayfire.com/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git git://github.com/${PN}/${PN}.git"
-SRC_URI="test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )"
-KEYWORDS="~amd64"
-EGIT_COMMIT="v3.0beta"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
-
-RDEPEND="
- >=sys-devel/gcc-4.7:*
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-6.0
- dev-libs/boost
- )
- cpu? (
- virtual/blas
- virtual/cblas
- sci-libs/fftw:3.0
- )
- opencl? (
- dev-libs/boost
- dev-libs/boost-compute
- sci-libs/clblas
- sci-libs/clfft
- )"
-DEPEND="${RDEPEND}"
-
-BUILD_DIR="${S}/build"
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}"/${P}-FindCBLAS.patch
- "${FILESDIR}"/${P}-FindBoostCompute.patch
- "${FILESDIR}"/${P}-opencl_CMakeLists.patch
-)
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
- die "Compilation with gcc older than 4.7 is not supported."
- fi
- fi
-}
-
-src_unpack() {
- git-r3_src_unpack
-
- if use test; then
- mkdir -p "${BUILD_DIR}"/third_party/src/ || die
- cd "${BUILD_DIR}"/third_party/src/ || die
- unpack ${A}
- mv "${BUILD_DIR}"/third_party/src/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
- fi
-}
-
-src_configure() {
- if use cuda; then
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
- addwrite /dev/nvidia-uvm
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_build cpu CPU)
- $(cmake-utils_use_build cuda CUDA)
- $(cmake-utils_use_build opencl OPENCL)
- $(cmake-utils_use_build examples EXAMPLES)
- $(cmake-utils_use_build test TEST)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- dobin "${BUILD_DIR}/bin2cpp"
-}
diff --git a/sci-libs/arrayfire/arrayfire-3.1.0.ebuild b/sci-libs/arrayfire/arrayfire-3.1.0.ebuild
deleted file mode 100644
index 4703028..0000000
--- a/sci-libs/arrayfire/arrayfire-3.1.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-GTEST_PV="1.7.0"
-
-DESCRIPTION="A general purpose GPU library."
-HOMEPAGE="http://www.arrayfire.com/"
-SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2
-test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+examples +cpu cuda opencl test"
-
-RDEPEND="
- >=sys-devel/gcc-4.7:*
- media-libs/freeimage
- cuda? (
- >=dev-util/nvidia-cuda-toolkit-6.0
- dev-libs/boost
- )
- cpu? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- sci-libs/fftw:3.0
- )
- opencl? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- dev-libs/boost
- dev-libs/boost-compute
- >=sci-libs/clblas-2.4
- >=sci-libs/clfft-2.6.1
- )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-full-${PV}"
-BUILD_DIR="${S}/build"
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}/${PN}"-9999-FindCBLAS.patch
- "${FILESDIR}/${PN}"-9999-Try-PkgConf-first-to-find-LAPACKE.patch
-)
-
-# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then
- die "Compilation with gcc older than 4.7 is not supported."
- fi
- fi
-}
-
-src_unpack() {
- default
-
- if use test; then
- mkdir -p "${BUILD_DIR}"/third_party/src/ || die
- mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
- fi
-}
-
-src_configure() {
- if use cuda; then
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
- addwrite /dev/nvidia-uvm
- fi
-
- local mycmakeargs=(
- $(cmake-utils_use_build cpu CPU)
- $(cmake-utils_use_build cuda CUDA)
- $(cmake-utils_use_build opencl OPENCL)
- $(cmake-utils_use_build examples EXAMPLES)
- $(cmake-utils_use_build test TEST)
- -DUSE_SYSTEM_BOOST_COMPUTE=ON
- -DUSE_SYSTEM_CLBLAS=ON
- -DUSE_SYSTEM_CLFFT=ON
- -DBUILD_GRAPHICS=OFF
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- dobin "${BUILD_DIR}/bin2cpp"
-}
diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch
deleted file mode 100644
index 3052df2..0000000
--- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Set BoostCompute inlcude dir.
-
-Patch by Marius Brehler.
-
---- CMakeModules/FindBoostCompute.cmake
-+++ CMakeModules/FindBoostCompute.cmake
-@@ -3,25 +3,10 @@
- # * BoostCompute_FOUND Flag for Boost Compute
- # * BoostCompute_INCLUDE_DIR Location of the Boost Compute headers
-
--# Look a directory above for the Boost Compute folder
--FIND_PATH( BoostCompute_SOURCE_DIR
-- NAMES include/boost/compute.hpp
-- PATH_SUFFIXES compute BoostCompute
-- DOC "Location of the Boost Compute source directory"
-- PATHS ${CMAKE_SOURCE_DIR}/..
-- ${CMAKE_SOURCE_DIR}/../..
-- /usr/local)
-
--FIND_PATH( BoostCompute_INCLUDE_DIR
-- NAMES boost/compute.hpp
-- DOC "Location of the Boost Compute include directory."
-- PATHS ${BoostCompute_SOURCE_DIR}/include)
-+set(BoostCompute_INCLUDE_DIR "/usr/include/compute")
-+SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" )
-
--IF(BoostCompute_INCLUDE_DIR AND BoostCompute_SOURCE_DIR)
-- SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" )
--ELSE()
-- SET( BoostCompute_FOUND OFF CACHE BOOL "BoostCompute Found" )
--ENDIF()
-
- IF(NOT BoostCompute_FOUND)
- MESSAGE(FATAL_ERROR, "Boost.Compute not found! Clone Boost.Compute from https://github.com/kylelutz/compute.git")
diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch
deleted file mode 100644
index 263c62a..0000000
--- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Use pkg-config to find cblas.
-
-Patch by Marius Brehler.
-
---- b/CMakeModules/FindCBLAS.cmake
-+++ a/CMakeModules/FindCBLAS.cmake
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for cblas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # Using FindCBLAS.cmake from the following repo
- # https://github.com/clementfarabet/THC/blob/master/COPYRIGHT.txt
-
-@@ -18,6 +24,29 @@ SET(CBLAS_LIBRARIES)
- SET(CBLAS_INCLUDE_DIR)
- SET(CBLAS_INCLUDE_FILE)
-
-+
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_CBLAS cblas)
-+if(PC_CBLAS_FOUND)
-+ foreach(PC_LIB ${PC_CBLAS_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_CBLAS_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_CBLAS_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND CBLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(CBLAS DEFAULT_MSG CBLAS_LIBRARIES)
-+ mark_as_advanced(CBLAS_LIBRARIES)
-+else(PC_CBLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for CBLAS found; starting more extensive search.")
-+
-+
-+
-+
-+
- # CBLAS in Intel mkl
- FIND_PACKAGE(MKL)
- IF (MKL_FOUND AND NOT CBLAS_LIBRARIES)
-@@ -203,3 +232,5 @@ IF(NOT CBLAS_FIND_QUIETLY)
- MESSAGE(STATUS "CBLAS library not found.")
- ENDIF(CBLAS_FOUND)
- ENDIF(NOT CBLAS_FIND_QUIETLY)
-+
-+endif(PC_CBLAS_FOUND)
diff --git a/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch
deleted file mode 100644
index 7279afa..0000000
--- a/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Do not install clFFT/clBLAS headers.
-
-Patch by Marius Brehler.
-
---- src/backend/opencl/CMakeLists.txt
-+++ src/backend/opencl/CMakeLists.txt
-@@ -18,9 +18,6 @@ ADD_DEFINITIONS(-DAF_OPENCL
- FIND_PACKAGE(CLBLAS REQUIRED)
- INCLUDE_DIRECTORIES(${CLBLAS_INCLUDE_DIRS})
- LINK_DIRECTORIES(${CLBLAS_LIBRARY_DIR})
--# Custom install command
--INSTALL(DIRECTORY "${CLBLAS_PACKAGE_DIR}/include/" DESTINATION include
-- COMPONENT headers)
- IF(UNIX)
- FILE(GLOB CLBLAS_LIBS "${CLBLAS_PACKAGE_DIR}/lib64/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
- ELSEIF(WIN32)
-@@ -33,9 +30,6 @@ INSTALL(FILES ${CLBLAS_LIBS} DESTINATION
- FIND_PACKAGE(clFFT REQUIRED)
- INCLUDE_DIRECTORIES(${CLFFT_INCLUDE_DIRS})
- LINK_DIRECTORIES(${CLFFT_LIBRARY_DIR})
--# Custom install command
--INSTALL(DIRECTORY "${CLFFT_BUILD_DIR}/package/include/" DESTINATION include
-- COMPONENT headers)
- IF(UNIX)
- FILE(GLOB CLFFT_LIBS "${CLFFT_BUILD_DIR}/package/lib64/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
- ELSE(UNIX)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/
@ 2015-09-15 13:34 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-09-15 13:34 UTC (permalink / raw
To: gentoo-commits
commit: b54eee7590728ac2045cd044f70eb041f610f7a6
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Sep 14 18:31:17 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 18:32:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b54eee75
sci-libs/arrayfire: Remove patches (merged upstream)
Package-Manager: portage-2.2.20.1
sci-libs/arrayfire/ChangeLog | 6 +
sci-libs/arrayfire/arrayfire-9999.ebuild | 5 -
.../arrayfire/files/arrayfire-9999-FindCBLAS.patch | 52 ------
...re-9999-Try-PkgConf-first-to-find-LAPACKE.patch | 182 ---------------------
4 files changed, 6 insertions(+), 239 deletions(-)
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 9eecff5..3c8c0e2 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 14 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+ -files/arrayfire-9999-FindCBLAS.patch,
+ -files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch,
+ arrayfire-9999.ebuild:
+ sci-libs/arrayfire: Remove patches (merged upstream)
+
*arrayfire-3.1.1 (14 Sep 2015)
14 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index b2fea92..c84ddd6 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -45,11 +45,6 @@ DEPEND="${RDEPEND}"
BUILD_DIR="${S}/build"
CMAKE_BUILD_TYPE=Release
-PATCHES=(
- "${FILESDIR}/${P}"-FindCBLAS.patch
- "${FILESDIR}/${P}"-Try-PkgConf-first-to-find-LAPACKE.patch
-)
-
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
# user is (usually) not in the video group
RESTRICT="userpriv"
diff --git a/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
deleted file mode 100644
index 7f757e8..0000000
--- a/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Use pkg-config to find cblas.
-
-Patch by Marius Brehler.
-
---- CMakeModules/FindCBLAS.cmake 2015-05-23 17:12:41.000000000 +0200
-+++ CMakeModules/FindCBLAS.cmake.new 2015-05-23 17:13:51.000000000 +0200
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for cblas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # Using FindCBLAS.cmake from the following repo
- # https://github.com/clementfarabet/THC/blob/master/COPYRIGHT.txt
-
-@@ -21,6 +27,29 @@ SET(CBLAS_INCLUDE_DIR CACHE STRING
- SET(CBLAS_INCLUDE_FILE CACHE STRING
- "CBLAS header name")
-
-+
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_CBLAS cblas)
-+if(PC_CBLAS_FOUND)
-+ foreach(PC_LIB ${PC_CBLAS_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_CBLAS_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_CBLAS_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND CBLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(CBLAS DEFAULT_MSG CBLAS_LIBRARIES)
-+ mark_as_advanced(CBLAS_LIBRARIES)
-+else(PC_CBLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for CBLAS found; starting more extensive search.")
-+
-+
-+
-+
-+
- SET(INTEL_MKL_ROOT_DIR CACHE STRING
- "Root directory of the Intel MKL")
-
-@@ -277,3 +306,5 @@ IF(NOT CBLAS_FIND_QUIETLY)
- MESSAGE(STATUS "CBLAS library not found.")
- ENDIF()
- ENDIF(NOT CBLAS_FIND_QUIETLY)
-+
-+endif(PC_CBLAS_FOUND)
diff --git a/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch b/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
deleted file mode 100644
index 549b7b8..0000000
--- a/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 0c64e3d30dce121fe41d0149592be3a0a605588a Mon Sep 17 00:00:00 2001
-From: Marius Brehler <marius.brehler@tu-dortmund.de>
-Date: Tue, 8 Sep 2015 09:50:12 +0200
-Subject: [PATCH] Try PkgConf first to find LAPACKE
-
----
- CMakeModules/FindLAPACKE.cmake | 145 ++++++++++++++++++++++++-----------------
- 1 file changed, 87 insertions(+), 58 deletions(-)
-
-diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake
-index 05d218a..3bdc273 100644
---- a/CMakeModules/FindLAPACKE.cmake
-+++ b/CMakeModules/FindLAPACKE.cmake
-@@ -18,70 +18,23 @@ FIND_PACKAGE(PkgConfig)
-
- #Determine from PKG
- IF(PKG_CONFIG_FOUND AND NOT LAPACKE_ROOT)
-- PKG_CHECK_MODULES( PKG_LAPACKE QUIET "lapacke")
-+ PKG_CHECK_MODULES( PC_LAPACKE QUIET "lapacke")
- ENDIF()
-
--IF(LAPACKE_ROOT)
-- #find libs
-- FIND_LIBRARY(
-- LAPACKE_LIB
-- NAMES "lapacke" "LAPACKE" "liblapacke"
-- PATHS ${LAPACKE_ROOT}
-- PATH_SUFFIXES "lib" "lib64"
-- DOC "LAPACKE Library"
-- NO_DEFAULT_PATH
-- )
-- FIND_LIBRARY(
-- LAPACK_LIB
-- NAMES "lapack" "LAPACK" "liblapack"
-- PATHS ${LAPACKE_ROOT}
-- PATH_SUFFIXES "lib" "lib64"
-- DOC "LAPACK Library"
-- NO_DEFAULT_PATH
-- )
-- FIND_PATH(
-- LAPACKE_INCLUDES
-- NAMES "lapacke.h"
-- PATHS ${LAPACKE_ROOT}
-- PATH_SUFFIXES "include"
-- DOC "LAPACKE Include Directory"
-- NO_DEFAULT_PATH
-- )
-+IF(PC_LAPACKE_FOUND)
-+ FOREACH(PC_LIB ${PC_LAPACKE_LIBRARIES})
-+ FIND_LIBRARY(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACKE_LIBRARY_DIRS} )
-+ IF (NOT ${PC_LIB}_LIBRARY)
-+ MESSAGE(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACKE_LIBRARY_DIRS}")
-+ ENDIF (NOT ${PC_LIB}_LIBRARY)
-+ LIST(APPEND LAPACKE_LIB ${${PC_LIB}_LIBRARY})
-+ ENDFOREACH(PC_LIB)
-
--ELSE()
-- FIND_LIBRARY(
-- LAPACKE_LIB
-- NAMES "lapacke" "liblapacke"
-- PATHS
-- ${PKG_LAPACKE_LIBRARY_DIRS}
-- ${LIB_INSTALL_DIR}
-- /usr/lib64
-- /usr/lib
-- /usr/local/lib64
-- /usr/local/lib
-- /sw/lib
-- /opt/local/lib
-- DOC "LAPACKE Library"
-- )
-- FIND_LIBRARY(
-- LAPACK_LIB
-- NAMES "lapack" "liblapack"
-- PATHS
-- ${PKG_LAPACKE_LIBRARY_DIRS}
-- ${LIB_INSTALL_DIR}
-- /usr/lib64
-- /usr/lib
-- /usr/local/lib64
-- /usr/local/lib
-- /sw/lib
-- /opt/local/lib
-- DOC "LAPACK Library"
-- )
- FIND_PATH(
- LAPACKE_INCLUDES
- NAMES "lapacke.h"
- PATHS
-- ${PKG_LAPACKE_INCLUDE_DIRS}
-+ ${PC_LAPACKE_INCLUDE_DIRS}
- ${INCLUDE_INSTALL_DIR}
- /usr/include
- /usr/local/include
-@@ -89,7 +42,83 @@ ELSE()
- /opt/local/include
- DOC "LAPACKE Include Directory"
- )
--ENDIF(LAPACKE_ROOT)
-+
-+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LAPACKE DEFAULT_MSG LAPACKE_LIB)
-+ MARK_AS_ADVANCED(LAPACKE_INCLUDES LAPACKE_LIB)
-+
-+ELSE(PC_LAPACKE_FOUND)
-+ MESSAGE(STATUS "No PkgConfig configuration for LAPACKE found; starting more extensive search.")
-+
-+ IF(LAPACKE_ROOT)
-+ #find libs
-+ FIND_LIBRARY(
-+ LAPACKE_LIB
-+ NAMES "lapacke" "LAPACKE" "liblapacke"
-+ PATHS ${LAPACKE_ROOT}
-+ PATH_SUFFIXES "lib" "lib64"
-+ DOC "LAPACKE Library"
-+ NO_DEFAULT_PATH
-+ )
-+ FIND_LIBRARY(
-+ LAPACK_LIB
-+ NAMES "lapack" "LAPACK" "liblapack"
-+ PATHS ${LAPACKE_ROOT}
-+ PATH_SUFFIXES "lib" "lib64"
-+ DOC "LAPACK Library"
-+ NO_DEFAULT_PATH
-+ )
-+ FIND_PATH(
-+ LAPACKE_INCLUDES
-+ NAMES "lapacke.h"
-+ PATHS ${LAPACKE_ROOT}
-+ PATH_SUFFIXES "include"
-+ DOC "LAPACKE Include Directory"
-+ NO_DEFAULT_PATH
-+ )
-+
-+ ELSE()
-+ FIND_LIBRARY(
-+ LAPACKE_LIB
-+ NAMES "lapacke" "liblapacke"
-+ PATHS
-+ ${PC_LAPACKE_LIBRARY_DIRS}
-+ ${LIB_INSTALL_DIR}
-+ /usr/lib64
-+ /usr/lib
-+ /usr/local/lib64
-+ /usr/local/lib
-+ /sw/lib
-+ /opt/local/lib
-+ DOC "LAPACKE Library"
-+ )
-+ FIND_LIBRARY(
-+ LAPACK_LIB
-+ NAMES "lapack" "liblapack"
-+ PATHS
-+ ${PC_LAPACKE_LIBRARY_DIRS}
-+ ${LIB_INSTALL_DIR}
-+ /usr/lib64
-+ /usr/lib
-+ /usr/local/lib64
-+ /usr/local/lib
-+ /sw/lib
-+ /opt/local/lib
-+ DOC "LAPACK Library"
-+ )
-+ FIND_PATH(
-+ LAPACKE_INCLUDES
-+ NAMES "lapacke.h"
-+ PATHS
-+ ${PC_LAPACKE_INCLUDE_DIRS}
-+ ${INCLUDE_INSTALL_DIR}
-+ /usr/include
-+ /usr/local/include
-+ /sw/include
-+ /opt/local/include
-+ DOC "LAPACKE Include Directory"
-+ )
-+ ENDIF(LAPACKE_ROOT)
-+ENDIF(PC_LAPACKE_FOUND)
-
- SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB})
- SET(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDES})
---
-2.4.6
-
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/
@ 2015-03-08 18:08 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-03-08 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 96db6869f3a26f1d8449086e21272ac7ba64d334
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Mar 8 09:49:44 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 8 09:49:44 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=96db6869
sci-libs/arrayfire: Update patches
Package-Manager: portage-2.2.14
sci-libs/arrayfire/ChangeLog | 8 ++++++++
sci-libs/arrayfire/arrayfire-9999.ebuild | 7 +++++--
...es.patch => arrayfire-0.9999-CMakeLists_examples.patch} | 0
...uild_gtest.patch => arrayfire-0.9999-build_gtest.patch} | 0
.../files/arrayfire-9999-CMakeLists_examples.patch | 14 ++++++++++++++
5 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 18acb43..8f534c6 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,14 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
+ +files/arrayfire-0.9999-CMakeLists_examples.patch,
+ +files/arrayfire-0.9999-build_gtest.patch,
+ +files/arrayfire-9999-CMakeLists_examples.patch,
+ -files/CMakeLists_examples.patch, -files/build_gtest.patch,
+ arrayfire-9999.ebuild:
+ Update patches
+
19 Feb 2015; Marius Brehler <marbre@linux.sungazer.de> arrayfire-9999.ebuild:
Fix SLOT operators
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index 5df0538..91c16ac 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -40,10 +40,13 @@ CMAKE_BUILD_TYPE=Release
PATCHES=(
"${FILESDIR}"/FindCBLAS.patch
- "${FILESDIR}"/CMakeLists_examples.patch
- "${FILESDIR}"/build_gtest.patch
+ "${FILESDIR}/${P}"-CMakeLists_examples.patch
)
+if [[ ${PV} == "0.9999" ]] ; then
+ PATCHES+=("${FILESDIR}/${P}"-build_gtest.patch)
+fi
+
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
# user is (usually) not in the video group
RESTRICT="userpriv"
diff --git a/sci-libs/arrayfire/files/CMakeLists_examples.patch b/sci-libs/arrayfire/files/arrayfire-0.9999-CMakeLists_examples.patch
similarity index 100%
rename from sci-libs/arrayfire/files/CMakeLists_examples.patch
rename to sci-libs/arrayfire/files/arrayfire-0.9999-CMakeLists_examples.patch
diff --git a/sci-libs/arrayfire/files/build_gtest.patch b/sci-libs/arrayfire/files/arrayfire-0.9999-build_gtest.patch
similarity index 100%
rename from sci-libs/arrayfire/files/build_gtest.patch
rename to sci-libs/arrayfire/files/arrayfire-0.9999-build_gtest.patch
diff --git a/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch b/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch
new file mode 100644
index 0000000..56885cb1
--- /dev/null
+++ b/sci-libs/arrayfire/files/arrayfire-9999-CMakeLists_examples.patch
@@ -0,0 +1,14 @@
+Adjust installation path of examples.
+
+Patch by Marius Brehler.
+
+--- examples/CMakeLists.txt
++++ examples/CMakeLists.txt_new
+@@ -18,6 +18,7 @@ MACRO(CREATE_EXAMPLES BACKEND)
+ COMPILE_FLAGS -DAF_${DEF_NAME}
+ OUTPUT_NAME ${EXAMPLE}_${BACKEND}
+ RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
++ INSTALL(TARGETS ${EXAMPLE_NAME} DESTINATION share/arrayfire/examples)
+ ENDFOREACH()
+ ENDMACRO(CREATE_EXAMPLES)
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/
@ 2015-01-10 18:03 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-01-10 18:03 UTC (permalink / raw
To: gentoo-commits
commit: fb0a0e645db8b5066be7bfcfdda8f3545637b2f9
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Jan 10 17:07:51 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 10 17:07:51 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb0a0e64
Download gtest instead of using svn during compile
---
sci-libs/arrayfire/arrayfire-9999.ebuild | 18 +++++++++--
sci-libs/arrayfire/files/build_gtest.patch | 51 ++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index 667ca0b..c055da7 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -4,11 +4,12 @@
EAPI=5
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 unpacker
DESCRIPTION="A general purpose GPU library."
HOMEPAGE="http://www.arrayfire.com/"
EGIT_REPO_URI="https://github.com/arrayfire/arrayfire.git"
+SRC_URI="test? ( https://googletest.googlecode.com/files/gtest-1.7.0.zip )"
KEYWORDS="~amd64"
LICENSE="ArrayFire"
@@ -22,15 +23,28 @@ RDEPEND="
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.0 )
sci-libs/fftw:3.0"
DEPEND="${RDEPEND}
- test? ( dev-vcs/subversion )"
+ test? ( app-arch/unzip )"
+BUILD_DIR="${S}/build"
CMAKE_BUILD_TYPE=Release
PATCHES=(
"${FILESDIR}"/FindCBLAS.patch
"${FILESDIR}"/CMakeLists_examples.patch
+ "${FILESDIR}"/build_gtest.patch
)
+src_unpack() {
+ git-r3_src_unpack
+
+ if use test; then
+ mkdir -p "${BUILD_DIR}"/third_party/src/ || die
+ cd "${BUILD_DIR}"/third_party/src/ || die
+ unpack_zip "${DISTDIR}/"gtest-1.7.0.zip
+ mv "${BUILD_DIR}"/third_party/src/gtest-1.7.0 "${BUILD_DIR}"/third_party/src/googletest || die
+ fi
+}
+
src_configure() {
if use cuda; then
addwrite /dev/nvidiactl
diff --git a/sci-libs/arrayfire/files/build_gtest.patch b/sci-libs/arrayfire/files/build_gtest.patch
new file mode 100644
index 0000000..24e4b07
--- /dev/null
+++ b/sci-libs/arrayfire/files/build_gtest.patch
@@ -0,0 +1,51 @@
+--- CMakeModules/build_gtest.cmake 2015-01-10 11:27:52.007076159 +0100
++++ CMakeModules/build_gtest.cmake 2015-01-10 17:36:23.000000000 +0100
+@@ -1,27 +1,4 @@
+-#Downloads and installs GTest into the third_party directory
+-
+-# We apply a patch to subversion, thus we need to find it.
+-FIND_PACKAGE(Subversion REQUIRED)
+-
+-# Create patch file for gtest with MSVC 2012
+-if(MSVC_VERSION EQUAL 1700)
+- file(WRITE "${CMAKE_BINARY_DIR}/gtest.patch" "Index: cmake/internal_utils.cmake\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" "===================================================================\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" "--- cmake/internal_utils.cmake (revision 660)\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" "+++ cmake/internal_utils.cmake (working copy)\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" "@@ -66,6 +66,9 @@\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" " # Resolved overload was found by argument-dependent lookup.\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" " set(cxx_base_flags \"\${cxx_base_flags} -wd4675\")\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" " endif()\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" "+ if (MSVC_VERSION EQUAL 1700)\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" "+ set(cxx_base_flags \"\${cxx_base_flags} -D_VARIADIC_MAX=10\")\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" "+ endif ()\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" " set(cxx_base_flags \"\${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32\")\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" " set(cxx_base_flags \"\${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN\")\n")
+- file(APPEND "${CMAKE_BINARY_DIR}/gtest.patch" " set(cxx_exception_flags \"-EHsc -D_HAS_EXCEPTIONS=1\")\n")
+-else()
+- file(WRITE "${CMAKE_BINARY_DIR}/gtest.patch" "")
+-endif()
++#Installs GTest into the third_party directory
+
+ # Enable ExternalProject CMake module
+ include(ExternalProject)
+@@ -37,10 +14,6 @@ set_directory_properties(PROPERTIES EP_P
+ # Add gtest
+ ExternalProject_Add(
+ googletest
+- SVN_REPOSITORY http://googletest.googlecode.com/svn/trunk/
+- SVN_REVISION -r 660
+- TIMEOUT 10
+- PATCH_COMMAND "${Subversion_SVN_EXECUTABLE}" patch "${CMAKE_BINARY_DIR}/gtest.patch" "${CMAKE_BINARY_DIR}/third_party/src/googletest"
+ # Force separate output paths for debug and release builds to allow easy
+ # identification of correct lib in subsequent TARGET_LINK_LIBRARIES commands
+ CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+@@ -54,8 +27,6 @@ ExternalProject_Add(
+ # Disable install step
+ INSTALL_COMMAND ""
+ # Wrap download, configure and build steps in a script to log output
+- LOG_DOWNLOAD 0
+- LOG_UPDATE 0
+ LOG_CONFIGURE 0
+ LOG_BUILD 0)
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-04-11 14:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-01 9:00 [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/, sci-libs/arrayfire/files/ Marius Brehler
-- strict thread matches above, loose matches on Subject: below --
2017-04-11 14:52 Marius Brehler
2016-05-19 7:14 Marius Brehler
2015-09-19 12:51 Justin Lecher
2015-09-15 13:34 Justin Lecher
2015-03-08 18:08 Justin Lecher
2015-01-10 18:03 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox