* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-01-15 6:53 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-01-15 6:53 UTC (permalink / raw
To: gentoo-commits
commit: d38cf774193acd09273a2253b23b9508e984e178
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Mon Jan 12 11:38:23 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 15 06:52:56 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d38cf774
sci-misc/kaldi: Live ebuild don't has keywords
Package-Manager: portage-2.2.15
---
sci-misc/kaldi/kaldi-0_p20150101.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-misc/kaldi/kaldi-0_p20150101.ebuild b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
index 6403bd8..78a5ab8 100644
--- a/sci-misc/kaldi/kaldi-0_p20150101.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
@@ -13,7 +13,7 @@ ESVN_REPO_URI="https://svn.code.sf.net/p/kaldi/code/trunk/src@4735"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc test threads"
-KEYWORDS="~amd64"
+KEYWORDS=""
RDEPEND="
media-libs/speex
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-01-15 6:53 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-01-15 6:53 UTC (permalink / raw
To: gentoo-commits
commit: d2b558b44bce35c0d29a40b16f4a2d076666e072
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Tue Jan 13 23:43:24 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 15 06:52:56 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2b558b4
sci-misc/kaldi: Comment about special case with upstream configure script
Package-Manager: portage-2.2.15
---
sci-misc/kaldi/kaldi-0_p20150101.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sci-misc/kaldi/kaldi-0_p20150101.ebuild b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
index 78a5ab8..9ef5703 100644
--- a/sci-misc/kaldi/kaldi-0_p20150101.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20150101.ebuild
@@ -30,6 +30,8 @@ src_prepare() {
}
src_configure() {
+ # Upstream's configure script is "hand-generated" and not autotools compatible,
+ # for this reason econf can not be used
./configure \
--shared \
--fst-root="${EPREFIX}/usr" \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-07-23 21:06 Jauhien Piatlicki
0 siblings, 0 replies; 9+ messages in thread
From: Jauhien Piatlicki @ 2015-07-23 21:06 UTC (permalink / raw
To: gentoo-commits
commit: 874fab10d1c447305b0d9909d13e1fd9baddc442
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Sat Jul 18 00:18:57 2015 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 00:18:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=874fab10
sci-misc/kaldi: version bump, switch to snapshots of the source
Package-Manager: portage-2.2.20
sci-misc/kaldi/ChangeLog | 6 ++++++
.../kaldi/{kaldi-0_p20150301.ebuild => kaldi-0_p20150709.ebuild} | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/sci-misc/kaldi/ChangeLog b/sci-misc/kaldi/ChangeLog
index 6639e7e..0fb8dc1 100644
--- a/sci-misc/kaldi/ChangeLog
+++ b/sci-misc/kaldi/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*kaldi-0_p20150709 (18 Jul 2015)
+
+ 18 Jul 2015; Pavel Denisov <pavel.a.denisov@gmail.com>
+ -kaldi-0_p20150301.ebuild, +kaldi-0_p20150709.ebuild:
+ Version bump, switch to snapshots of the source.
+
*kaldi-0_p20150301 (01 Mar 2015)
01 Mar 2015; Pavel Denisov <pavel.a.denisov@gmail.com>
diff --git a/sci-misc/kaldi/kaldi-0_p20150301.ebuild b/sci-misc/kaldi/kaldi-0_p20150709.ebuild
similarity index 91%
rename from sci-misc/kaldi/kaldi-0_p20150301.ebuild
rename to sci-misc/kaldi/kaldi-0_p20150709.ebuild
index 8ba100d..8ebf50a 100644
--- a/sci-misc/kaldi/kaldi-0_p20150301.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20150709.ebuild
@@ -4,16 +4,16 @@
EAPI="5"
-inherit eutils flag-o-matic subversion
+inherit eutils flag-o-matic
DESCRIPTION="A toolkit for speech recognition"
HOMEPAGE="http://kaldi.sourceforge.net/"
-ESVN_REPO_URI="https://svn.code.sf.net/p/kaldi/code/trunk/src@4927"
+SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc test threads"
-KEYWORDS=""
+KEYWORDS="~amd64"
RDEPEND="
media-libs/speex
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 92caf979dce6cfc34b8a57e03e394b14b40d833a
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Mon Nov 9 23:41:45 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 01:20:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=92caf979
sci-misc/kaldi: Fix IUSE
Package-Manager: portage-2.2.24
sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 128c268..63543d5 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc test threads atlas cuda"
+IUSE="doc test threads -atlas cuda"
KEYWORDS="~amd64"
RDEPEND="
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 6d0c42fa63e22a8d44d8b45b243da36ad11ee57e
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Mon Nov 9 23:55:51 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 01:20:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6d0c42fa
sci-misc/kaldi: Fix RESTRICT conditions
Package-Manager: portage-2.2.24
sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 63543d5..a72c370 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="!atlas? ( !threads )"
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
# user is (usually) not in the video group
-RESTRICT="cuda? ( userpriv )"
+RESTRICT="test? ( cuda? ( userpriv ) )"
src_prepare() {
epatch \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 9d956a08c867d1771a7a619dfb71d5d8274b8c93
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Thu Nov 19 01:15:59 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 01:45:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9d956a08
sci-misc/kaldi: Switch to user-selected BLAS/LAPACK
Package-Manager: portage-2.2.24
sci-misc/kaldi/kaldi-0_p20151106.ebuild | 88 ++++++++++++++++++++++-----------
sci-misc/kaldi/metadata.xml | 3 --
2 files changed, 58 insertions(+), 33 deletions(-)
diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 64fea67..e2e0bb6 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
DESCRIPTION="A toolkit for speech recognition"
HOMEPAGE="http://kaldi-asr.org/"
@@ -12,62 +12,90 @@ SRC_URI="http://gentoo.akreal.net/distfiles/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc test threads -atlas cuda"
+IUSE="doc test cuda"
KEYWORDS="~amd64"
RDEPEND="
media-libs/speex
+ virtual/cblas
virtual/lapack
virtual/lapacke
>=sci-misc/openfst-1.4.1
- atlas? ( sci-libs/atlas[threads=] )
- !atlas? ( sci-libs/openblas[-openmp,-threads] sci-libs/lapack-reference )
cuda? ( dev-util/nvidia-cuda-toolkit )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
-REQUIRED_USE="!atlas? ( !threads )"
-
# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage
# user is (usually) not in the video group
RESTRICT="test? ( cuda? ( userpriv ) )"
src_prepare() {
epatch \
- "${FILESDIR}"/configure.patch \
"${FILESDIR}"/Makefile.patch \
"${FILESDIR}"/default_rules.mk.a7d9824.patch
}
src_configure() {
- if use atlas; then
- myconf+=( --atlas-root="${EPREFIX}/usr/include/atlas" )
- if use threads; then
- myconf+=( --threaded-atlas=yes )
- fi
+ append-cxxflags \
+ -DKALDI_DOUBLEPRECISION=0 \
+ -DHAVE_POSIX_MEMALIGN \
+ -DHAVE_EXECINFO_H=1 \
+ -DHAVE_CXXABI_H \
+ -DHAVE_SPEEX \
+ -DHAVE_OPENFST_GE_10400 \
+ -std=c++0x \
+ -Wall \
+ -I.. \
+ -pthread \
+ -Wno-sign-compare \
+ -Wno-unused-local-typedefs \
+ -Winit-self \
+ -rdynamic \
+ -fPIC \
+ $($(tc-getPKG_CONFIG) --cflags cblas) \
+ $($(tc-getPKG_CONFIG) --cflags lapack)
+
+ append-libs \
+ -lspeex \
+ -lfst \
+ -lm \
+ -lpthread \
+ -ldl \
+ $($(tc-getPKG_CONFIG) --libs cblas) \
+ $($(tc-getPKG_CONFIG) --libs lapack)
+
+ local cblas_provider=$(eselect cblas show)
+
+ if [[ ${cblas_provider} =~ "atlas" ]]; then
+ append-cxxflags -DHAVE_ATLAS
+ elif [[ ${cblas_provider} =~ "mkl" ]]; then
+ append-cxxflags -DHAVE_MKL
+ elif [[ ${cblas_provider} =~ "openblas" ]]; then
+ append-cxxflags -DHAVE_OPENBLAS $($(tc-getPKG_CONFIG) --cflags lapacke)
else
- myconf+=( --openblas-root="${EPREFIX}/usr" )
- append-cxxflags "-I${EPREFIX}/usr/include/openblas"
- append-libs -lreflapack
+ die "Build with ${cblas_provider} CBLAS is not supported"
fi
- # Upstream's configure script is "hand-generated" and not autotools compatible,
- # for this reason econf can not be used
- ./configure \
- --shared \
- --fst-root="${EPREFIX}/usr" \
- $(use cuda && echo "--use-cuda=yes --cudatk-dir=${EPREFIX}/opt/cuda" \
- || echo --use-cuda=no) \
- "${myconf[@]}" || die "failed to run configure"
-
use test || append-cxxflags -DNDEBUG
- append-libs -lspeex
- sed -i \
- -e "s:-g # -O0 -DKALDI_PARANOID:-DHAVE_SPEEX ${CXXFLAGS} :" \
- -e "s:-lm -lpthread -ldl:-lm -lpthread -ldl ${LIBS} ${LDFLAGS}:" \
- -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = -O2:" \
- kaldi.mk || die "sed unix/kaldi.mk failed"
+ cat <<-EOF > kaldi.mk
+ KALDI_FLAVOR := dynamic
+ KALDILIBDIR := "${S}"/lib
+ CC = $(tc-getCXX)
+ RANLIB = $(tc-getRANLIB)
+ LDLIBS = ${LIBS}
+ EOF
+
+ if use cuda; then
+ cat <<-EOF >> kaldi.mk
+ CUDA = true
+ CUDATKDIR = "${EPREFIX}"/opt/cuda
+ EOF
+ cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk
+ sed -i \
+ -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = -O2:" \
+ kaldi.mk || die "sed unix/kaldi.mk failed"
+ fi
}
src_compile() {
diff --git a/sci-misc/kaldi/metadata.xml b/sci-misc/kaldi/metadata.xml
index ddeac84..3aa9b1d 100644
--- a/sci-misc/kaldi/metadata.xml
+++ b/sci-misc/kaldi/metadata.xml
@@ -14,9 +14,6 @@
<remote-id type="github">kaldi-asr/kaldi</remote-id>
</upstream>
<use>
- <flag name="atlas">
- Use <pkg>sci-libs/atlas</pkg> for math library.
- </flag>
<flag name="cuda">
Build with CUDA support.
</flag>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 24648b1c7fc42093d530c9937ea94be381e302ac
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Mon Nov 9 23:58:05 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 01:20:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=24648b1c
sci-misc/kaldi: Change dohtml to dodoc
Package-Manager: portage-2.2.24
sci-misc/kaldi/kaldi-0_p20151106.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index a72c370..64fea67 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -87,5 +87,5 @@ src_test() {
src_install() {
dolib.so $(make print-libfiles)
dobin $(make print-binfiles)
- use doc && dohtml -r html/*
+ use doc && dodoc -r html
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: f31b3eeaa38fdc2b33709436644c109e5ac6b5c7
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Fri Nov 20 00:16:01 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 00:16:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f31b3eea
sci-misc/kaldi: Use cuda eclass
Package-Manager: portage-2.2.24
sci-misc/kaldi/kaldi-0_p20151106.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index 9657cef..9a86cf6 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs cuda flag-o-matic
DESCRIPTION="A toolkit for speech recognition"
HOMEPAGE="http://kaldi-asr.org/"
@@ -99,7 +99,7 @@ src_configure() {
EOF
cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk
sed -i \
- -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = -O2:" \
+ -e "s:CUDA_FLAGS = -g:CUDA_FLAGS = ${NVCCFLAGS}:" \
kaldi.mk || die "sed unix/kaldi.mk failed"
fi
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 7fc25873fec545a84886b8520fad8a6d1e13e4f1
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Thu Nov 19 23:22:59 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 23:22:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fc25873
sci-misc/kaldi: Add pkg_pretend() to check for suitable CBLAS provider
Package-Manager: portage-2.2.24
sci-misc/kaldi/kaldi-0_p20151106.ebuild | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/sci-misc/kaldi/kaldi-0_p20151106.ebuild b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
index e2e0bb6..9657cef 100644
--- a/sci-misc/kaldi/kaldi-0_p20151106.ebuild
+++ b/sci-misc/kaldi/kaldi-0_p20151106.ebuild
@@ -29,6 +29,14 @@ DEPEND="${RDEPEND}
# user is (usually) not in the video group
RESTRICT="test? ( cuda? ( userpriv ) )"
+pkg_pretend() {
+ local cblas_provider=$(eselect cblas show)
+
+ if [[ ! ${cblas_provider} =~ (atlas|mkl|openblas) ]]; then
+ die "Build with '${cblas_provider}' CBLAS is not supported"
+ fi
+}
+
src_prepare() {
epatch \
"${FILESDIR}"/Makefile.patch \
@@ -66,14 +74,12 @@ src_configure() {
local cblas_provider=$(eselect cblas show)
- if [[ ${cblas_provider} =~ "atlas" ]]; then
+ if [[ ${cblas_provider} =~ atlas ]]; then
append-cxxflags -DHAVE_ATLAS
- elif [[ ${cblas_provider} =~ "mkl" ]]; then
+ elif [[ ${cblas_provider} =~ mkl ]]; then
append-cxxflags -DHAVE_MKL
- elif [[ ${cblas_provider} =~ "openblas" ]]; then
+ elif [[ ${cblas_provider} =~ openblas ]]; then
append-cxxflags -DHAVE_OPENBLAS $($(tc-getPKG_CONFIG) --cflags lapacke)
- else
- die "Build with ${cblas_provider} CBLAS is not supported"
fi
use test || append-cxxflags -DNDEBUG
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-11-20 11:39 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-20 11:39 [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2015-11-20 11:39 Justin Lecher
2015-11-20 11:39 Justin Lecher
2015-11-20 11:39 Justin Lecher
2015-11-20 11:39 Justin Lecher
2015-11-20 11:39 Justin Lecher
2015-07-23 21:06 Jauhien Piatlicki
2015-01-15 6:53 Justin Lecher
2015-01-15 6: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