#8 Build against FlexiBLAS
Merged 3 years ago by churchyard. Opened 3 years ago by iucar.
rpms/ iucar/octave master  into  master

file modified
+17 -6
@@ -12,6 +12,15 @@ 

  %bcond_with qt5

  %endif

  

+ %if 0%{?fedora} >= 33

+ %bcond_without flexiblas

+ %endif

+ %if %{with flexiblas}

+ %global blaslib flexiblas

+ %else

+ %global blaslib openblas

+ %endif

+ 

  # Compile with ILP64 BLAS - not yet working

  %bcond_with blas64

  
@@ -28,7 +37,7 @@ 

  Name:           octave

  Epoch:          6

  Version:        5.2.0

- Release:        6%{?dist}

+ Release:        7%{?dist}

  Summary:        A high-level language for numerical computations

  License:        GPLv3+

  URL:            http://www.octave.org
@@ -75,7 +84,7 @@ 

  %endif

  

  BuildRequires:  arpack-devel

- BuildRequires:  openblas-devel

+ BuildRequires:  %{blaslib}-devel

  BuildRequires:  bison

  BuildRequires:  bzip2-devel

  BuildRequires:  curl-devel
@@ -189,7 +198,7 @@ 

  Requires:       gcc-gfortran

  Requires:       fftw-devel%{?_isa}

  Requires:       hdf5-devel%{?_isa}

- Requires:       openblas-devel%{?_isa}

+ Requires:       %{blaslib}-devel%{?_isa}

  Requires:       readline-devel%{?_isa}

  Requires:       zlib-devel

  Requires:       libappstream-glib
@@ -251,9 +260,7 @@ 

   --enable-float-truncate \

   %{?disabledocs} \

   --disable-silent-rules \

- %if %{with blas64}

-  --with-blas=openblas64 \

- %endif

+  --with-blas=%{blaslib}%{?with_blas64:64}  \

   --with-java-includedir=/usr/lib/jvm/java/include \

   --with-java-libdir=$libjvm \

   --with-qrupdate \
@@ -381,6 +388,7 @@ 

  $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf :99 &

  sleep 2

  export DISPLAY=:99

+ export FLEXIBLAS=netlib

  make check %{?el7:|| :}

  

  %ldconfig_scriptlets
@@ -431,6 +439,9 @@ 

  %{_pkgdocdir}/refcard*.pdf

  

  %changelog

+ * Thu Aug 13 2020 Iñaki Úcar <iucar@fedoraproject.org> - 5.2.0-7

+ - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager

+ 

  * Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 5.2.0-6

  - Drop unnecessary (apparently unused) BuildRequires: xorg-x11-apps

  

This PR is part of a F33 System-Wide Change Proposal that aims to set FlexiBLAS
as the default BLAS/LAPACK manager for all consumers of these APIs. For further
information, see https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager

You'll find a successful scratch build for this PR in
https://koji.fedoraproject.org/koji/taskinfo?taskID=49204297

I kindly ask you to merge this PR and build the package in rawhide and F33. Please,
report any issues you may found in https://bugzilla.redhat.com/show_bug.cgi?id=1860504

@orion This is my proposal to adapt octave. It is inspired on what you did for GMT, but simplifies a few things. Please, feel free to close this and adapt it yourself, or directly modify this PR. Otherwise, if you are busy, let us know and we could invoke @decathorpe.

@orion Are you ok with the changes, do you need more time?

Pull-Request has been merged by churchyard

3 years ago