diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | 010-nvidia-vpf-fix-pytorch-extension.patch | 28 | ||||
| -rw-r--r-- | 010-nvidia-vpf-remove-unwanted-pip-build-deps.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 51 |
4 files changed, 44 insertions, 67 deletions
@@ -1,25 +1,30 @@ pkgbase = nvidia-vpf-git pkgdesc = NVIDIA Video Processing Framework (git version) - pkgver = 1.1.1.r1.g869316d + pkgver = 2.0.0.r12.g82b51e7 pkgrel = 1 url = https://github.com/NVIDIA/VideoProcessingFramework/ arch = x86_64 - license = Apache + license = Apache-2.0 makedepends = git makedepends = cmake - makedepends = nvidia-sdk + makedepends = python-build + makedepends = python-scikit-build + makedepends = python-fsspec + makedepends = python-installer + makedepends = python-pytorch-cuda makedepends = python-setuptools + makedepends = python-wheel depends = cuda depends = nvidia-utils depends = ffmpeg depends = python - depends = python-pytorch-cuda + depends = python-numpy + optdepends = python-pytorch-cuda: for Torch extension (PytorchNvCodec) provides = nvidia-vpf conflicts = nvidia-vpf - options = !emptydirs source = git+https://github.com/NVIDIA/VideoProcessingFramework.git - source = 010-nvidia-vpf-fix-pytorch-extension.patch + source = 010-nvidia-vpf-remove-unwanted-pip-build-deps.patch sha256sums = SKIP - sha256sums = 65630bb49c2180c0c8a42baf56d5ca3af502c32cd49e83dabff3b54abfd870eb + sha256sums = ad1dcb990b59946f699c1fcfd201c995c0ff8b5800557710e874a0bae2fbfa85 pkgname = nvidia-vpf-git diff --git a/010-nvidia-vpf-fix-pytorch-extension.patch b/010-nvidia-vpf-fix-pytorch-extension.patch deleted file mode 100644 index 60bac06ca1c4..000000000000 --- a/010-nvidia-vpf-fix-pytorch-extension.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,11 +68,17 @@ if(GENERATE_PYTORCH_EXTENSION) - #Extension will be built using torch.utils.cpp_extension; - #So we just launch python script; - add_custom_command( OUTPUT Pytorch_Nv_Codec -- COMMAND cd ${PYTORCH_EXTENSION_SOURCES_DIR} && python setup.py build --build-lib="${CMAKE_INSTALL_PREFIX}") -+ COMMAND cd ${PYTORCH_EXTENSION_SOURCES_DIR} && python setup.py build --build-lib="${CMAKE_CURRENT_BINARY_DIR}/PytorchNvCodec") - - add_custom_target( PytorchNvCodec - DEPENDS Pytorch_Nv_Codec) - add_dependencies(PyNvCodec PytorchNvCodec) -+ -+ find_package(Python 3.4 COMPONENTS Interpreter REQUIRED) -+ execute_process(COMMAND ${Python_EXECUTABLE} -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))" -+ OUTPUT_VARIABLE PYTHON_EXTENSION_SUFFIX -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PytorchNvCodec/PytorchNvCodec${PYTHON_EXTENSION_SUFFIX} DESTINATION bin) - endif(GENERATE_PYTORCH_EXTENSION) - - if(ENABLE_TESTS) -@@ -83,4 +89,4 @@ if(ENABLE_TESTS) - foreach(TEST_ASSET ${TEST_ASSETS}) - install(FILES ${TEST_ASSET} DESTINATION bin) - endforeach() --endif(ENABLE_TESTS) -\ No newline at end of file -+endif(ENABLE_TESTS) diff --git a/010-nvidia-vpf-remove-unwanted-pip-build-deps.patch b/010-nvidia-vpf-remove-unwanted-pip-build-deps.patch new file mode 100644 index 000000000000..a42944c7c5c4 --- /dev/null +++ b/010-nvidia-vpf-remove-unwanted-pip-build-deps.patch @@ -0,0 +1,13 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -4,8 +4,8 @@ requires = [ + "scikit-build", + "numpy", + ## out-comment not install cmake/ninja via pip +- "cmake>=3.21", +- "ninja; platform_system!='Windows'" ++ #"cmake>=3.21", ++ #"ninja; platform_system!='Windows'" + ] + build-backend = "setuptools.build_meta" + @@ -1,55 +1,42 @@ # Maintainer: Daniel Bermond <dbermond@archlinux.org> pkgname=nvidia-vpf-git -pkgver=1.1.1.r1.g869316d +pkgver=2.0.0.r12.g82b51e7 pkgrel=1 pkgdesc='NVIDIA Video Processing Framework (git version)' arch=('x86_64') url='https://github.com/NVIDIA/VideoProcessingFramework/' -license=('Apache') -depends=('cuda' 'nvidia-utils' 'ffmpeg' 'python' 'python-pytorch-cuda') -makedepends=('git' 'cmake' 'nvidia-sdk' 'python-setuptools') +license=('Apache-2.0') +depends=('cuda' 'nvidia-utils' 'ffmpeg' 'python' 'python-numpy') +optdepends=('python-pytorch-cuda: for Torch extension (PytorchNvCodec)') +makedepends=('git' 'cmake' 'python-build' 'python-scikit-build' 'python-fsspec' + 'python-installer' 'python-pytorch-cuda' 'python-setuptools' 'python-wheel') provides=('nvidia-vpf') conflicts=('nvidia-vpf') -options=('!emptydirs') source=('git+https://github.com/NVIDIA/VideoProcessingFramework.git' - '010-nvidia-vpf-fix-pytorch-extension.patch') + '010-nvidia-vpf-remove-unwanted-pip-build-deps.patch') sha256sums=('SKIP' - '65630bb49c2180c0c8a42baf56d5ca3af502c32cd49e83dabff3b54abfd870eb') + 'ad1dcb990b59946f699c1fcfd201c995c0ff8b5800557710e874a0bae2fbfa85') prepare() { - patch -d VideoProcessingFramework -Np1 -i "${srcdir}/010-nvidia-vpf-fix-pytorch-extension.patch" + patch -d VideoProcessingFramework -Np1 -i "${srcdir}/010-nvidia-vpf-remove-unwanted-pip-build-deps.patch" } pkgver() { - git -C VideoProcessingFramework describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^ver_//' + git -C VideoProcessingFramework describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^ver_//;s/^v//' } build() { - export CUDA_HOME='/opt/cuda' - export CXXFLAGS+=' -I/opt/cuda/include' - export LDFLAGS+=' -L/opt/cuda/lib64' - cmake -B build -S VideoProcessingFramework \ - -DCMAKE_BUILD_TYPE:STRING='None' \ - -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ - -DCMAKE_CUDA_COMPILER:FILEPATH='/opt/cuda/bin/nvcc' \ - -DCMAKE_SKIP_RPATH:BOOL='YES' \ - -DGENERATE_PYTHON_BINDINGS:BOOL='TRUE' \ - -DGENERATE_PYTORCH_EXTENSION:BOOL='TRUE' \ - -DVIDEO_CODEC_SDK_INCLUDE_DIR:PATH='/usr/include/nvidia-sdk' \ - -Wno-dev - make -C build + export CMAKE_GENERATOR='Unix Makefiles' + + cd VideoProcessingFramework + python -m build --wheel --no-isolation + + cd src/PytorchNvCodec + python -m build --wheel --no-isolation } package() { - make -C build DESTDIR="$pkgdir" install - - local _sitepkg - _sitepkg="$(python -c 'import site; print(site.getsitepackages()[0])')" - install -d -m755 "$pkgdir"{"$_sitepkg",/usr/share/nvidia-vpf/samples} - mv "${pkgdir}/usr/bin"/Py{,torch}NvCodec"$(python-config --extension-suffix)" "${pkgdir}${_sitepkg}" - mv "${pkgdir}/usr/bin"/*.so* "${pkgdir}/usr/lib" - mv "${pkgdir}/usr/bin"/*.py "${pkgdir}/usr/share/nvidia-vpf/samples" - rm "${pkgdir}/usr/bin"/*.mp4 - chmod a+x "${pkgdir}/usr/share/nvidia-vpf/samples"/*.py + python -m installer --destdir="$pkgdir" VideoProcessingFramework/dist/*.whl + python -m installer --destdir="$pkgdir" VideoProcessingFramework/src/PytorchNvCodec/dist/*.whl } |