* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft-abi/files/, sci-libs/bigdft-abi/
@ 2013-06-27 10:08 Honza Macháček
0 siblings, 0 replies; 2+ messages in thread
From: Honza Macháček @ 2013-06-27 10:08 UTC (permalink / raw
To: gentoo-commits
commit: ea52a973abf0f6b89edd392461ddce36624a1087
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Thu Jun 27 10:08:15 2013 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Thu Jun 27 10:08:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ea52a973
In sci-libs/bigdft-abi-1.0.4-r1, CUDA support made compile.
---
sci-libs/bigdft-abi/ChangeLog | 8 ++++++++
...abi-1.0.4.ebuild => bigdft-abi-1.0.4-r1.ebuild} | 3 +++
.../files/bigdft-abi-1.0.4-CUDA_gethostname.patch | 22 ++++++++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/sci-libs/bigdft-abi/ChangeLog b/sci-libs/bigdft-abi/ChangeLog
index 8b17f1f..b1fc75c 100644
--- a/sci-libs/bigdft-abi/ChangeLog
+++ b/sci-libs/bigdft-abi/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*bigdft-abi-1.0.4-r1 (27 Jun 2013)
+
+ 27 Jun 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
+ -bigdft-abi-1.0.4.ebuild, +bigdft-abi-1.0.4-r1.ebuild,
+ +files/bigdft-abi-1.0.4-CUDA_gethostname.patch:
+ Added #include <unistd.h> to S_GPU/src/class_utils.h and
+ src/CUDA/check_cuda.h to know gethostname.
+
19 Jun 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
bigdft-abi-1.0.4.ebuild:
Filter LDFLAGS for cuda use not to break nvcc.
diff --git a/sci-libs/bigdft-abi/bigdft-abi-1.0.4.ebuild b/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r1.ebuild
similarity index 98%
rename from sci-libs/bigdft-abi/bigdft-abi-1.0.4.ebuild
rename to sci-libs/bigdft-abi/bigdft-abi-1.0.4-r1.ebuild
index 51f1e48..f466e90 100644
--- a/sci-libs/bigdft-abi/bigdft-abi-1.0.4.ebuild
+++ b/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r1.ebuild
@@ -76,6 +76,9 @@ pkg_setup() {
}
src_prepare() {
+ epatch \
+ "${FILESDIR}"/"${P}"-CUDA_gethostname.patch
+
tar -xjf "${FILESDIR}"/"${P}"-tests.tar.bz2 -C "${S}"/tests/DFT/
eautoreconf
}
diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-CUDA_gethostname.patch b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-CUDA_gethostname.patch
new file mode 100644
index 0000000..04c45b4
--- /dev/null
+++ b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-CUDA_gethostname.patch
@@ -0,0 +1,22 @@
+diff -Naurp bigdft-abi-1.0.4-orig/S_GPU/src/class_utils.h bigdft-abi-1.0.4/S_GPU/src/class_utils.h
+--- bigdft-abi-1.0.4-orig/S_GPU/src/class_utils.h 2012-07-09 14:43:33.000000000 +0000
++++ bigdft-abi-1.0.4/S_GPU/src/class_utils.h 2013-06-27 09:52:17.000000000 +0000
+@@ -32,6 +32,7 @@
+ #include <config.h>
+ #endif
+
++#include <unistd.h>
+ #include <sstream>
+
+ class deleter
+diff -Naurp bigdft-abi-1.0.4-orig/src/CUDA/check_cuda.h bigdft-abi-1.0.4/src/CUDA/check_cuda.h
+--- bigdft-abi-1.0.4-orig/src/CUDA/check_cuda.h 2012-07-09 14:43:33.000000000 +0000
++++ bigdft-abi-1.0.4/src/CUDA/check_cuda.h 2013-06-27 09:51:50.000000000 +0000
+@@ -1,6 +1,7 @@
+ #ifndef __checkcuda__
+ #define __checkcuda__
+
++#include <unistd.h>
+ #include <string>
+ #include <sstream>
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft-abi/files/, sci-libs/bigdft-abi/
@ 2014-06-27 13:27 Honza Macháček
0 siblings, 0 replies; 2+ messages in thread
From: Honza Macháček @ 2014-06-27 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 37071047f278b2e7d1d282bca001d053478af489
Author: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Fri Jun 27 13:27:13 2014 +0000
Commit: Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Fri Jun 27 13:27:13 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=37071047
The Abinit patches incorporated in sci-libs/bigdft-abi-1.0.4-r3.ebuild. When compiling against sci-libs/scalapack, made to use ScaLAPACK as BLACS as well, not to break sci-physics/abinit by defining fake BLACS routines. Testing removed to appease repoman and avoid copying of all the old test suite over the current broken version.
Package-Manager: portage-2.2.10
---
sci-libs/bigdft-abi/ChangeLog | 12 +++-
...-1.0.4-r2.ebuild => bigdft-abi-1.0.4-r3.ebuild} | 70 ++++++++++++---------
.../files/bigdft-abi-1.0.4-tests.tar.bz2 | Bin 402968 -> 0 bytes
sci-libs/bigdft-abi/metadata.xml | 14 ++++-
4 files changed, 62 insertions(+), 34 deletions(-)
diff --git a/sci-libs/bigdft-abi/ChangeLog b/sci-libs/bigdft-abi/ChangeLog
index c443870..8647391 100644
--- a/sci-libs/bigdft-abi/ChangeLog
+++ b/sci-libs/bigdft-abi/ChangeLog
@@ -1,7 +1,17 @@
# ChangeLog for sci-libs/bigdft-abi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*bigdft-abi-1.0.4-r3 (27 Jun 2014)
+
+ 27 Jun 2014; Honza Macháček <Hloupy.Honza@centrum.cz>
+ +bigdft-abi-1.0.4-r3.ebuild:
+ The Abinit patches incorporated in sci-libs/bigdft-abi-1.0.4-r3.ebuild. When
+ compiling against sci-libs/scalapack, made to use ScaLAPACK as BLACS as well,
+ not to break sci-physics/abinit by defining fake BLACS routines. Testing removed
+ to appease repoman and avoid copying of all the old test suite over the current
+ broken version.
+
23 Sep 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
bigdft-abi-1.0.4-r2.ebuild, +metadata.xml:
Previously announced change actually done. Added a metadata file. Dealing
diff --git a/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r2.ebuild b/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r3.ebuild
similarity index 78%
rename from sci-libs/bigdft-abi/bigdft-abi-1.0.4-r2.ebuild
rename to sci-libs/bigdft-abi/bigdft-abi-1.0.4-r3.ebuild
index 98d8212..511361c 100644
--- a/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r2.ebuild
+++ b/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://forge.abinit.org/fallbacks/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cuda doc etsf_io mpi netcdf openmp opencl test"
+IUSE="cuda doc etsf_io glib mpi netcdf openmp opencl scalapack test"
RDEPEND="
>=sci-libs/libxc-1.2.0-r1[fortran]
@@ -27,12 +27,14 @@ RDEPEND="
mpi? ( virtual/mpi )
cuda? ( dev-util/nvidia-cuda-sdk )
opencl? ( virtual/opencl )
+ glib? ( >=dev-libs/glib-2.22 )
etsf_io? ( >=sci-libs/etsf_io-1.0.3-r2 )
netcdf? ( || (
sci-libs/netcdf[fortran]
sci-libs/netcdf-fortran
)
- )"
+ )
+ scalapack? ( virtual/scalapack )"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/autoconf-2.59
@@ -72,43 +74,54 @@ pkg_setup() {
if use openmp; then FORTRAN_NEED_OPENMP=1; fi
fortran-2_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/"${P}"-CUDA_gethostname.patch
- tar -xjf "${FILESDIR}"/"${P}"-tests.tar.bz2 -C "${S}"/tests/DFT/
- eautoreconf
-}
-
-src_configure() {
- local openmp=""
if use openmp; then
# based on _fortran-has-openmp() of fortran-2.eclass
+ local openmp=""
local fcode=ebuild-openmp-flags.f
local _fc=$(tc-getFC)
+ pushd "${T}"
cat <<- EOF > "${fcode}"
1 call omp_get_num_threads
2 end
EOF
for openmp in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
- ${_fc} ${openmp} "${fcode}" -o "${fcode}.x" && break
+ "${_fc}" "${openmp}" "${fcode}" -o "${fcode}.x" && break
done
rm -f "${fcode}.*"
+ popd
+
+ append-flags "${openmp}"
fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/"${P}"-0002.patch \
+ "${FILESDIR}"/"${P}"-0003.patch \
+ "${FILESDIR}"/"${P}"-0004.patch \
+ "${FILESDIR}"/"${P}"-0005.patch \
+ "${FILESDIR}"/"${P}"-0006.patch \
+ "${FILESDIR}"/"${P}"-0007.patch \
+ "${FILESDIR}"/"${P}"-CUDA_gethostname.patch
+
+ eautoreconf
+}
+
+src_configure() {
local modules="${EPREFIX}/usr/include"
-# local Imodules="-I${modules}"
- local Imodules=""
local netcdff_libs="-lnetcdff"
filter-flags '-m*' '-O*' "-pipe"
local nvcflags="${CFLAGS}"
_filter-var nvcflags '-m*' '-O*' "-pipe" "-W*"
use cuda && filter-ldflags '-m*' '-O*' "-pipe" "-W*"
+ local mylapack="lapack"
+ use scalapack && mylapack="scalapack"
local myeconfargs=(
$(use_enable mpi)
--enable-optimised-convolution
@@ -119,10 +132,8 @@ src_configure() {
--disable-internal-libyaml
--enable-internal-libabinit
--with-moduledir="${modules}"
- --with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l lapack) \
- $($(tc-getPKG_CONFIG) --libs-only-l blas)"
- --with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L lapack) \
- $($(tc-getPKG_CONFIG) --libs-only-L blas)"
+ --with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l "${mylapack}")"
+ --with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L "${mylapack}")"
--with-libxc="yes"
--disable-internal-libxc
$(use_enable cuda cuda-gpu)
@@ -131,8 +142,13 @@ src_configure() {
$(use_enable opencl)
$(use_with etsf_io etsf-io)
"$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")"
+ $(use_with glib gobject)
+ $(use_with scalapack)
+ $(use_with scalapack scalapack-path "${EPREFIX}/usr/$(get_libdir)")
+ $(use_with scalapack blacs)
+ $(use_with scalapack blacs-path "${EPREFIX}/usr/$(get_libdir)")
PKG_CONFIG="$(tc-getPKG_CONFIG)"
- FCFLAGS="${FCFLAGS} ${openmp} ${Imodules}"
+ FCFLAGS="${FCFLAGS}"
LD="$(tc-getLD)"
CPP="$(tc-getCPP)"
)
@@ -155,15 +171,7 @@ src_compile() {
}
src_test() {
- if use test; then
- #autotools-utils_src_test() expanded
- _check_build_dir
- pushd "${BUILD_DIR}" > /dev/null || die
- # Run default src_test as defined in ebuild.sh
- cd tests
- emake -j1 check
- popd > /dev/null
- fi
+ ewarn "The tests broken upstream. NOT testing"
}
src_install() {
diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-tests.tar.bz2 b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-tests.tar.bz2
deleted file mode 100644
index 40f7ca5..0000000
Binary files a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-tests.tar.bz2 and /dev/null differ
diff --git a/sci-libs/bigdft-abi/metadata.xml b/sci-libs/bigdft-abi/metadata.xml
index f3d1274..8b5a755 100644
--- a/sci-libs/bigdft-abi/metadata.xml
+++ b/sci-libs/bigdft-abi/metadata.xml
@@ -15,10 +15,20 @@ to serve as a library for sci-physics/abinit.
<use>
<flag name="etsf_io">
Enable support for reading and writing the European Theoretical
- Spectroscopy facility (ETSF) file format.
+ Spectroscopy facility (ETSF) file format
</flag>
</use>
<use>
- <flag name="opencl">Enable support for OpenCL GPU acceleration.</flag>
+ <flag name="glib">
+ Compile with GLib Object System support
+ </flag>
+ </use>
+ <use>
+ <flag name="opencl">Enable support for OpenCL GPU acceleration</flag>
+ </use>
+ <use>
+ <flag name="scalapack">
+ Use ScaLAPACK, a subset of LAPACK routines redesigned for heterogenous computing
+ </flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-27 13:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-27 10:08 [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft-abi/files/, sci-libs/bigdft-abi/ Honza Macháček
-- strict thread matches above, loose matches on Subject: below --
2014-06-27 13:27 Honza Macháček
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox