* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/files/, sci-libs/arrayfire/
@ 2015-05-23 15:53 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-05-23 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 515eacebe71737b1aa2ee946b3cf5d97f79787f8
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat May 23 15:41:19 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat May 23 15:41:19 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=515eaceb
sci-libs/arrayfire: Split up ebuilds to fix 9999
Package-Manager: portage-2.2.18
sci-libs/arrayfire/ChangeLog | 9 +++++++++
sci-libs/arrayfire/arrayfire-9999.ebuild | 15 +++++----------
sci-libs/arrayfire/files/FindBoostCompute.cmake | 18 ++++++++++++++++++
...tch => arrayfire-3.0_beta-FindBoostCompute.patch} | 0
...BLAS.patch => arrayfire-3.0_beta-FindCBLAS.patch} | 0
...ch => arrayfire-3.0_beta-opencl_CMakeLists.patch} | 0
...indCBLAS.patch => arrayfire-9999-FindCBLAS.patch} | 20 ++++++++++----------
7 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 0ba6260..6123184 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,15 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 23 May 2015; Marius Brehler <marbre@linux.sungazer.de>
+ +files/FindBoostCompute.cmake,
+ +files/arrayfire-3.0_beta-FindBoostCompute.patch,
+ +files/arrayfire-3.0_beta-FindCBLAS.patch,
+ +files/arrayfire-3.0_beta-opencl_CMakeLists.patch,
+ +files/arrayfire-9999-FindCBLAS.patch, -files/FindBoostCompute.patch,
+ -files/FindCBLAS.patch, -files/opencl_CMakeLists.patch, arrayfire-9999.ebuild:
+ Split up ebuilds to fix 9999
+
24 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
-files/arrayfire-0.9999-build_gtest.patch:
Drop patch, fixed upstream
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index dda442e..b976a15 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -13,13 +13,6 @@ 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=""
-if [[ ${PV} == "0.9999" ]] ; then
- # the remote HEAD points to devel, but we want to pull the master instead
- EGIT_BRANCH="master"
-elif [[ ${PV} == "3.0_beta" ]] ; then
- EGIT_COMMIT="v3.0beta"
- KEYWORDS="~amd64"
-fi
LICENSE="BSD"
SLOT="0"
@@ -34,6 +27,7 @@ RDEPEND="
cpu? (
virtual/blas
virtual/cblas
+ virtual/lapacke
sci-libs/fftw:3.0
)
opencl? (
@@ -48,9 +42,7 @@ BUILD_DIR="${S}/build"
CMAKE_BUILD_TYPE=Release
PATCHES=(
- "${FILESDIR}"/FindCBLAS.patch
- "${FILESDIR}"/FindBoostCompute.patch
- "${FILESDIR}"/opencl_CMakeLists.patch
+ "${FILESDIR}"/${P}-FindCBLAS.patch
)
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
@@ -74,6 +66,9 @@ src_unpack() {
unpack ${A}
mv "${BUILD_DIR}"/third_party/src/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
fi
+
+ rm "${S}"/CMakeModules/build_boost_compute.cmake || die
+ cp "${FILESDIR}"/FindBoostCompute.cmake "${S}"/CMakeModules/ || die
}
src_configure() {
diff --git a/sci-libs/arrayfire/files/FindBoostCompute.cmake b/sci-libs/arrayfire/files/FindBoostCompute.cmake
new file mode 100644
index 0000000..d98ea4b
--- /dev/null
+++ b/sci-libs/arrayfire/files/FindBoostCompute.cmake
@@ -0,0 +1,18 @@
+# Downloads and builds the Boost Compute library from github.com
+# Defines the following variables
+# * BoostCompute_FOUND Flag for Boost Compute
+# * BoostCompute_INCLUDE_DIR Location of the Boost Compute headers
+
+
+set(BoostCompute_INCLUDE_DIR "/usr/include/compute")
+SET( BoostCompute_FOUND ON CACHE BOOL "BoostCompute Found" )
+
+
+IF(NOT BoostCompute_FOUND)
+ MESSAGE(FATAL_ERROR, "Boost.Compute not found! Clone Boost.Compute from https://github.com/kylelutz/compute.git")
+ENDIF(NOT BoostCompute_FOUND)
+
+MARK_AS_ADVANCED(
+ BoostCompute_FOUND
+ BoostCompute_INCLUDE_DIR
+ )
diff --git a/sci-libs/arrayfire/files/FindBoostCompute.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch
similarity index 100%
rename from sci-libs/arrayfire/files/FindBoostCompute.patch
rename to sci-libs/arrayfire/files/arrayfire-3.0_beta-FindBoostCompute.patch
diff --git a/sci-libs/arrayfire/files/FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch
similarity index 100%
copy from sci-libs/arrayfire/files/FindCBLAS.patch
copy to sci-libs/arrayfire/files/arrayfire-3.0_beta-FindCBLAS.patch
diff --git a/sci-libs/arrayfire/files/opencl_CMakeLists.patch b/sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch
similarity index 100%
rename from sci-libs/arrayfire/files/opencl_CMakeLists.patch
rename to sci-libs/arrayfire/files/arrayfire-3.0_beta-opencl_CMakeLists.patch
diff --git a/sci-libs/arrayfire/files/FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
similarity index 75%
rename from sci-libs/arrayfire/files/FindCBLAS.patch
rename to sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
index 263c62a..7f757e8 100644
--- a/sci-libs/arrayfire/files/FindCBLAS.patch
+++ b/sci-libs/arrayfire/files/arrayfire-9999-FindCBLAS.patch
@@ -2,8 +2,8 @@ Use pkg-config to find cblas.
Patch by Marius Brehler.
---- b/CMakeModules/FindCBLAS.cmake
-+++ a/CMakeModules/FindCBLAS.cmake
+--- 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
@@ -14,9 +14,9 @@ Patch by Marius Brehler.
# 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)
+@@ -21,6 +27,29 @@ SET(CBLAS_INCLUDE_DIR CACHE STRING
+ SET(CBLAS_INCLUDE_FILE CACHE STRING
+ "CBLAS header name")
+
+#
@@ -41,12 +41,12 @@ Patch by Marius Brehler.
+
+
+
- # CBLAS in Intel mkl
- FIND_PACKAGE(MKL)
- IF (MKL_FOUND AND NOT CBLAS_LIBRARIES)
-@@ -203,3 +232,5 @@ IF(NOT CBLAS_FIND_QUIETLY)
+ 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(CBLAS_FOUND)
+ ENDIF()
ENDIF(NOT CBLAS_FIND_QUIETLY)
+
+endif(PC_CBLAS_FOUND)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/files/, sci-libs/arrayfire/
@ 2015-09-09 7:11 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-09-09 7:11 UTC (permalink / raw
To: gentoo-commits
commit: 41d6ecc7e3f377ee124e747d623fac7c1650d00f
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Sep 8 10:49:01 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 10:49:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=41d6ecc7
sci-libs/arrayfire: Fix issue #463
Package-Manager: portage-2.2.20.1
sci-libs/arrayfire/ChangeLog | 5 +
sci-libs/arrayfire/arrayfire-9999.ebuild | 11 +-
...re-9999-Try-PkgConf-first-to-find-LAPACKE.patch | 182 +++++++++++++++++++++
3 files changed, 195 insertions(+), 3 deletions(-)
diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index 994387a..22c0ef3 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -2,6 +2,11 @@
# $Id$
08 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+ +files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch,
+ arrayfire-9999.ebuild:
+ sci-libs/arrayfire: Fix issue #463
+
+ 08 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
-arrayfire-0.9999.ebuild:
sci-libs/arrayfire: Drop 0.9999, because releases are available
diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild
index e337177..5eb95c7 100644
--- a/sci-libs/arrayfire/arrayfire-9999.ebuild
+++ b/sci-libs/arrayfire/arrayfire-9999.ebuild
@@ -20,6 +20,7 @@ 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
@@ -31,6 +32,9 @@ RDEPEND="
sci-libs/fftw:3.0
)
opencl? (
+ virtual/blas
+ virtual/cblas
+ virtual/lapacke
dev-libs/boost
dev-libs/boost-compute
sci-libs/clblas
@@ -43,6 +47,7 @@ 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
@@ -66,9 +71,6 @@ src_unpack() {
unpack ${A}
mv "${BUILD_DIR}"/third_party/src/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die
fi
-
- rm "${S}"/CMakeModules/build_boost_compute.cmake || die
- cp "${FILESDIR}"/FindBoostCompute.cmake "${S}"/CMakeModules/ || die
}
src_configure() {
@@ -85,6 +87,9 @@ src_configure() {
$(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
}
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
new file mode 100644
index 0000000..549b7b8
--- /dev/null
+++ b/sci-libs/arrayfire/files/arrayfire-9999-Try-PkgConf-first-to-find-LAPACKE.patch
@@ -0,0 +1,182 @@
+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] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/files/, sci-libs/arrayfire/
@ 2017-01-03 9:16 Marius Brehler
0 siblings, 0 replies; 3+ messages in thread
From: Marius Brehler @ 2017-01-03 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 2b45c47e0027abe02020ea299c6f12a35481a86e
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Jan 2 08:42:55 2017 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon Jan 2 08:42:55 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2b45c47e
sci-libs/arrayfire: Drop old
Package-Manager: portage-2.3.0
sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild | 113 ---------------------
.../files/arrayfire-3.4.1-FindCBLAS.patch | 37 -------
2 files changed, 150 deletions(-)
diff --git a/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild b/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
deleted file mode 100644
index 563042a..0000000
--- a/sci-libs/arrayfire/arrayfire-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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://github.com/google/googletest/archive/release-${GTEST_PV}.zip -> 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-8.0.44
- dev-libs/boost
- )
- cpu? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- sci-libs/fftw:3.0
- )
- opencl? (
- virtual/blas
- virtual/cblas
- virtual/lapacke
- >=sci-libs/clblas-2.4
- >=sci-libs/clfft-2.6.1
- >=dev-libs/boost-1.61.0
- dev-libs/opencl-clhpp
- )
- graphics? (
- media-libs/glbinding
- >=media-libs/glfw-3.1.1
- =sci-visualization/forge-0.9.0
- )"
-DEPEND="${RDEPEND}"
-
-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"
-
-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=(
- -DBUILD_CPU="$(usex cpu)"
- -DBUILD_CUDA="$(usex cuda)"
- -DBUILD_OPENCL="$(usex opencl)"
- -DBUILD_EXAMPLES="$(usex examples)"
- -DBUILD_TEST="$(usex test)"
- -DBUILD_GRAPHICS="$(usex graphics)"
- -DBUILD_NONFREE="$(usex nonfree)"
- -DBUILD_UNIFIED="$(usex unified)"
- -DUSE_SYSTEM_BOOST_COMPUTE=ON
- -DUSE_SYSTEM_CL2HPP=ON
- -DUSE_SYSTEM_CLBLAS=ON
- -DUSE_SYSTEM_CLFFT=ON
- -DUSE_SYSTEM_FORGE=ON
- -DUSE_SYSTEM_GLBINDING=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.4.1-FindCBLAS.patch b/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
deleted file mode 100644
index b75569f..0000000
--- a/sci-libs/arrayfire/files/arrayfire-3.4.1-FindCBLAS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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] 3+ messages in thread
end of thread, other threads:[~2017-01-03 9:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-09 7:11 [gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/files/, sci-libs/arrayfire/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2017-01-03 9:16 Marius Brehler
2015-05-23 15:53 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox