From 2d606f83eba6ece868792f9095d8d5837dddbc554002279b69dd668768027ce7 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 23 Jul 2024 13:10:03 +0000 Subject: [PATCH] make flavors conflicting OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/python-torch?expand=0&rev=33 --- python-torch.spec | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/python-torch.spec b/python-torch.spec index 914930b..e81625e 100644 --- a/python-torch.spec +++ b/python-torch.spec @@ -1,7 +1,7 @@ # # spec file for package python-torch # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,7 +55,6 @@ %define package_name %{pname}%{?pkg_suffix} %endif - %define FP16_version 4dfe081 %define FXdiv_version b408327 %define QNNPACK_version 7d2a4e9 @@ -125,8 +124,8 @@ Source29: https://github.com/pytorch/tensorpipe/archive/%{tensorpipe}.tar. Source30: https://github.com/google/libnop/archive/%{libnop}.tar.gz#/libnop-%{libnop}.tar.gz -Patch1: skip-third-party-check.patch -Patch2: fix-setup.patch +Patch1: skip-third-party-check.patch +Patch2: fix-setup.patch # A python call to cmake fails with a return code of 1 on this arch, disable it for now. # and 32-bit arm is not supported @@ -136,7 +135,6 @@ BuildRequires: %{python_module Gloo} %ifarch x86_64 BuildRequires: %{python_module PeachPy} %endif -BuildRequires: %{python_module py-cpuinfo} BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module devel} BuildRequires: %{python_module hypothesis} @@ -145,6 +143,7 @@ BuildRequires: %{python_module opcodes} BuildRequires: %{python_module pip} BuildRequires: %{python_module protobuf} BuildRequires: %{python_module psutil} +BuildRequires: %{python_module py-cpuinfo} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module typing_extensions} BuildRequires: %{python_module typing} @@ -165,13 +164,13 @@ BuildRequires: glog-devel BuildRequires: gtest BuildRequires: leveldb-devel BuildRequires: libnuma-devel -BuildRequires: libuv-devel BuildRequires: libopenblas_pthreads-devel +BuildRequires: libuv-devel BuildRequires: lmdb-devel BuildRequires: ninja BuildRequires: openblas-devel -BuildRequires: openssl-devel BuildRequires: opencv-devel +BuildRequires: openssl-devel BuildRequires: protobuf-c BuildRequires: protobuf-devel BuildRequires: python-rpm-macros @@ -192,19 +191,21 @@ BuildRequires: libnccl-devel %endif %if %{with openmpi4} BuildRequires: openmpi4-devel +Conflicts: %{python_module torch} %endif %if %{with vulkan} +BuildRequires: VulkanMemoryAllocator-devel BuildRequires: shaderc BuildRequires: vulkan-devel -BuildRequires: VulkanMemoryAllocator-devel +Conflicts: %{python_module torch} %endif Requires: python-numpy Requires: python-protobuf Requires: python-six Requires: python-typing_extensions -Provides: python-caffe2 = %version -Provides: python-pytorch = %version +Provides: python-caffe2%{?pkg_suffix} = %version +Provides: python-pytorch%{?pkg_suffix} = %version %if "%flavor" == "" ExclusiveArch: do_not_build @@ -256,6 +257,12 @@ This example files can be used to start an own pytorch/caffe2 project. %package -n libtorch%{?pkg_suffix} Summary: Library which used by %{name} Group: Development/Libraries/Python +%if %{with openmpi4} +Conflicts: libtorch +%endif +%if %{with vulkan} +Conflicts: libtorch +%endif %description -n libtorch%{?pkg_suffix} Library which is used by %{name} @@ -289,7 +296,7 @@ rmdir eigen/ %make_depend_src %{SOURCE27} %make_depend_src %{SOURCE28} %make_depend_src %{SOURCE29} -# getting the vendoring of the vendored source working, this is +# getting the vendoring of the vendored source working, this is # insanity at the next level. My onlu exuse is that libnop is header only rmdir tensorpipe/third_party/libnop %make_depend_src %{SOURCE30} tensorpipe/third_party/libnop