[med-svn] [Git][med-team/emmax][master] 2 commits: Drop paths.patch, not needed

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / emmax


Commits:
75d8eb6d by Sébastien Villemot at 2023-12-22T12:10:03+01:00
Drop paths.patch, not needed

- - - - -
3d76eaf8 by Sébastien Villemot at 2023-12-22T12:18:04+01:00
Fix lapacke.patch

- - - - -


3 changed files:

- debian/patches/lapacke.patch
- − debian/patches/paths.patch
- debian/patches/series


Changes:

=====================================
debian/patches/lapacke.patch
=====================================
@@ -1,23 +1,84 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Tue, 28 Nov 2023 17:29:11 +0100
+Description: Use LAPACKE instead of ATLAS
+Author: Sébastien Villemot <sebastien at debian.org>
 Bug-Debian: https://bugs.debian.org/1056671
-Description: 
-
+Forwarded: no
+Last-Update: 2023-12-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/makefile
++++ b/makefile
+@@ -7,7 +7,7 @@ LIBFLAGS = -Wall
+ 
+ COMPFLAGS = ${INCFLAGS} -O2 -Wall -g  $(CFLAGS) $(CPPFLAGS)
+ CC = gcc
+-CLIBS = -L/usr/lib/atlas-base -L/usr/lib/lapack/ -llapack_atlas -llapack -lcblas -lblas -latlas -lcblas -lm -lz $(LDFLAGS)
++CLIBS = -llapacke -llapack -lblas -lm -lz $(LDFLAGS)
+ 
+ all: emmax emmax-kin
+ 
 --- a/emmax.c
 +++ b/emmax.c
-@@ -1747,13 +1747,13 @@ int matrix_invert(int n, double *X, doub
+@@ -7,7 +7,7 @@
+ #include <float.h>
+ #include <time.h>
+ #include <cblas.h>
+-#include <clapack.h>
++#include <lapacke.h>
+ #include <zlib.h>
+ //#include "lapack_wrapper.h"
+ 
+@@ -1629,15 +1629,10 @@ int dsyevd (char JOBZ, char UPLO, int N,
+ 	    double *W, 
+ 	    double *WORK, int LWORK, int *IWORK, int LIWORK) 
+ {
+-  extern  void  dsyevd_ (char *JOBZp, char *UPLOp, int *Np,
+-			 double *A, int *LDAp, 
+-			 double *W, 
+-			 double *WORK, int *LWORKp, int *IWORK, int *LIWORKp,
+-			 int *INFOp);
+   int  INFO;
+-  dsyevd_ (&JOBZ, &UPLO, &N, A, &LDA, 
+-	   W, 
+-           WORK, &LWORK, IWORK, &LIWORK, &INFO);
++  LAPACK_dsyevd (&JOBZ, &UPLO, &N, A, &LDA, 
++                 W, 
++                 WORK, &LWORK, IWORK, &LIWORK, &INFO);
+   
+   return  INFO;
+ }
+@@ -1648,16 +1643,10 @@ int dsyevr (char JOBZ, char RANGE, char
+ 	    double *W, double *Z, int LDZ, int *ISUPPZ,
+ 	    double *WORK, int LWORK, int *IWORK, int LIWORK) 
+ {
+-  extern  void  dsyevr_ (char *JOBZp, char *RANGEp, char *UPLOp, int *Np,
+-			 double *A, int *LDAp, double *VLp, double *VUp,
+-			 int *ILp, int *IUp, double *ABSTOLp, int *Mp,
+-			 double *W, double *Z, int *LDZp, int *ISUPPZ,
+-			 double *WORK, int *LWORKp, int *IWORK, int *LIWORKp,
+-			 int *INFOp);
+   int  INFO;
+-  dsyevr_ (&JOBZ, &RANGE, &UPLO, &N, A, &LDA, &VL, &VU,
+-           &IL, &IU, &ABSTOL, M, W, Z, &LDZ, ISUPPZ,
+-           WORK, &LWORK, IWORK, &LIWORK, &INFO);
++  LAPACK_dsyevr (&JOBZ, &RANGE, &UPLO, &N, A, &LDA, &VL, &VU,
++                 &IL, &IU, &ABSTOL, M, W, Z, &LDZ, ISUPPZ,
++                 WORK, &LWORK, IWORK, &LIWORK, &INFO);
+   
+   return  INFO;
+ }
+@@ -1747,13 +1736,13 @@ int matrix_invert(int n, double *X, doub
    }
    
    /*  Turn Y into its LU form, store pivot matrix  */
 -  info = clapack_dgetrf (CblasColMajor, n, n, Y, n, ipiv);
-+  info = LAPACK_dgetrf (CblasColMajor, n, n, Y, n, ipiv);
++  info = LAPACKE_dgetrf (LAPACK_COL_MAJOR, n, n, Y, n, ipiv);
    
    /*  Don't bother continuing when illegal argument (info<0) or singularity (info>0) occurs  */
    if (info!=0) return info;
    
    /*  Feed this to the lapack inversion routine.  */
 -  info = clapack_dgetri (CblasColMajor, n, Y, n, ipiv);
-+  info = LAPACK_dgetri (CblasColMajor, n, Y, n, ipiv);
++  info = LAPACKE_dgetri (LAPACK_COL_MAJOR, n, Y, n, ipiv);
    
    /*  Cleanup and exit  */
    free(ipiv);


=====================================
debian/patches/paths.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Author: Steffen Moeller
-Last-Update: 2013-06-11 09:09:19 +0000
-Description: Fix header path of clapack.h
-
-Index: emmax-0~beta.20100307/emmax.c
-===================================================================
---- emmax-0~beta.20100307.orig/emmax.c
-+++ emmax-0~beta.20100307/emmax.c
-@@ -7,7 +7,7 @@
- #include <float.h>
- #include <time.h>
- #include <cblas.h>
--#include <clapack.h>
-+#include <lapack.h>
- #include <zlib.h>
- //#include "lapack_wrapper.h"
- 


=====================================
debian/patches/series
=====================================
@@ -1,5 +1,4 @@
 dynamic.patch
-paths.patch
 aborts.patch
 install.patch
 clean.patch



View it on GitLab: https://salsa.debian.org/med-team/emmax/-/compare/ab4a6f2cc69f30bf1bd273ced219912fb3b07119...3d76eaf852fc8f44b18e6cd167268b626236289b

-- 
View it on GitLab: https://salsa.debian.org/med-team/emmax/-/compare/ab4a6f2cc69f30bf1bd273ced219912fb3b07119...3d76eaf852fc8f44b18e6cd167268b626236289b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231222/bfd6b941/attachment-0001.htm>