complete package rewrite

2 files changed, 64 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15786256d760..4c96ecf764d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,34 @@
 pkgbase = fairseq-git
 	pkgdesc = Sequence modeling toolkit
-	pkgver = 0.11
-	pkgrel = 2
-	url = https://github.com/pytorch/fairseq
-	arch = i686
+	pkgver = 0.9.0.r1219.g9a00e033
+	pkgrel = 1
+	url = https://github.com/facebookresearch/fairseq
 	arch = x86_64
 	license = MIT
-	depends = cuda
-	depends = nccl
-	depends = python-antlr4
+	makedepends = cython
+	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-setuptools
+	makedepends = python-wheel
+	depends = python>=3.6
 	depends = python-bitarray
-	depends = python-hydra
+	depends = python-cffi
+	depends = python-hydra-core
+	depends = python-numpy
 	depends = python-omegaconf
 	depends = python-pytorch
+	depends = python-regex
+	depends = python-sacrebleu
+	depends = python-tqdm
+	depends = python-torchaudio
+	optdepends = cuda: Model training
+	optdepends = nccl: Model training
 	optdepends = python-apex: Faster training
 	provides = fairseq
 	conflicts = fairseq
-	source = git+https://github.com/pytorch/fairseq
+	source = fairseq::git+https://github.com/facebookresearch/fairseq
+	validpgpkeys = 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23
 	sha256sums = SKIP
 
 pkgname = fairseq-git
diff --git a/PKGBUILD b/PKGBUILD
index d389e101613f..67904f77e425 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,54 @@
-# Maintainer: Filip Graliński <filipg@amu.edu.pl>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Filip Graliński <filipg@amu.edu.pl>
 
 pkgname=fairseq-git
-pkgver=0.11
-pkgrel=2
+_pkg="${pkgname%-git}"
+pkgver=0.9.0.r1219.g9a00e033
+pkgrel=1
 pkgdesc="Sequence modeling toolkit"
-arch=('i686' 'x86_64')
-url="https://github.com/pytorch/fairseq"
+arch=('x86_64')
+url="https://github.com/facebookresearch/fairseq"
 license=('MIT')
-provides=('fairseq')
-conflicts=('fairseq')
-depends=('cuda'
-         'nccl'
-         'python-antlr4'
-         'python-bitarray'
-         'python-hydra'
-         'python-omegaconf'
-         'python-pytorch')
-optdepends=('python-apex: Faster training')
-source=("git+$url")
+depends=(
+	'python>=3.6'
+	'python-bitarray'
+	'python-cffi'
+	'python-hydra-core'
+	'python-numpy'
+	'python-omegaconf'
+	'python-pytorch'
+	'python-regex'
+	'python-sacrebleu'
+	'python-tqdm'
+	'python-torchaudio')
+optdepends=(
+	'cuda: Model training'
+	'nccl: Model training'
+	'python-apex: Faster training')
+makedepends=(
+	'cython'
+	'git'
+	'python-build'
+	'python-installer'
+	'python-setuptools'
+	'python-wheel')
+provides=("$_pkg")
+conflicts=("$_pkg")
+source=("$_pkg::git+$url")
 sha256sums=('SKIP')
+validpgpkeys=('5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23')
+
+pkgver() {
+	git -C "$_pkg" describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
+}
 
 build() {
-    cd fairseq
-    python setup.py build
+	cd "$_pkg"
+	python -m build --wheel --no-isolation
 }
 
 package() {
-    cd fairseq
-    python setup.py install --root="$pkgdir" --optimize=1
+	cd "$_pkg"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }