r46462 - in /packages/superlu-dist/trunk/debian/patches: dreadrhs.patch examples.diff make.inc.diff make.inc.patch series

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Fri Jan 17 13:25:39 UTC 2014


Author: trophime-guest
Date: Fri Jan 17 13:25:39 2014
New Revision: 46462

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46462
Log:
update to 3.3

Removed:
    packages/superlu-dist/trunk/debian/patches/make.inc.patch
Modified:
    packages/superlu-dist/trunk/debian/patches/dreadrhs.patch
    packages/superlu-dist/trunk/debian/patches/examples.diff
    packages/superlu-dist/trunk/debian/patches/make.inc.diff
    packages/superlu-dist/trunk/debian/patches/series

Modified: packages/superlu-dist/trunk/debian/patches/dreadrhs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu-dist/trunk/debian/patches/dreadrhs.patch?rev=46462&op=diff
==============================================================================
--- packages/superlu-dist/trunk/debian/patches/dreadrhs.patch	(original)
+++ packages/superlu-dist/trunk/debian/patches/dreadrhs.patch	Fri Jan 17 13:25:39 2014
@@ -1,7 +1,7 @@
-Index: superlu-dist-3.2/SRC/dreadMM.c
+Index: superlu-dist-3.3/SRC/dreadMM.c
 ===================================================================
---- superlu-dist-3.2.orig/SRC/dreadMM.c	2013-01-15 11:16:48.546261066 +0100
-+++ superlu-dist-3.2/SRC/dreadMM.c	2013-01-15 11:22:35.590275452 +0100
+--- superlu-dist-3.3.orig/SRC/dreadMM.c	2014-01-17 13:53:35.514156908 +0100
++++ superlu-dist-3.3/SRC/dreadMM.c	2014-01-17 13:53:35.510156724 +0100
 @@ -213,20 +213,3 @@
  }
  
@@ -23,10 +23,10 @@
 -}
 -
 -
-Index: superlu-dist-3.2/SRC/dreadrhs.c
+Index: superlu-dist-3.3/SRC/dreadrhs.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ superlu-dist-3.2/SRC/dreadrhs.c	2013-01-15 11:22:35.590275452 +0100
++++ superlu-dist-3.3/SRC/dreadrhs.c	2014-01-17 13:53:35.510156724 +0100
 @@ -0,0 +1,17 @@
 +#include <stdio.h>
 +
@@ -45,10 +45,10 @@
 +    /*        readpair_(j, &b[i]);*/
 +    fclose(fp);
 +}
-Index: superlu-dist-3.2/SRC/dreadtriple.c
+Index: superlu-dist-3.3/SRC/dreadtriple.c
 ===================================================================
---- superlu-dist-3.2.orig/SRC/dreadtriple.c	2013-01-15 11:16:48.546261066 +0100
-+++ superlu-dist-3.2/SRC/dreadtriple.c	2013-01-15 11:22:35.594275453 +0100
+--- superlu-dist-3.3.orig/SRC/dreadtriple.c	2014-01-17 13:53:35.514156908 +0100
++++ superlu-dist-3.3/SRC/dreadtriple.c	2014-01-17 13:53:35.510156724 +0100
 @@ -150,21 +150,5 @@
  }
  
@@ -71,10 +71,10 @@
 -}
  
  
-Index: superlu-dist-3.2/SRC/Makefile
+Index: superlu-dist-3.3/SRC/Makefile
 ===================================================================
---- superlu-dist-3.2.orig/SRC/Makefile	2013-01-15 11:16:48.546261066 +0100
-+++ superlu-dist-3.2/SRC/Makefile	2013-01-15 11:22:35.594275453 +0100
+--- superlu-dist-3.3.orig/SRC/Makefile	2014-01-17 13:53:35.514156908 +0100
++++ superlu-dist-3.3/SRC/Makefile	2014-01-17 13:53:35.510156724 +0100
 @@ -52,7 +52,7 @@
  	  pdgstrs1.o pdgssvx_ABglobal.o pdgsrfs_ABXglobal.o pdgsmv_AXglobal.o\
  	  pdgssvx.o pdgstrs.o pddistribute.o pdlangs.o pdutil.o \
@@ -93,10 +93,10 @@
  
  all:  double complex16
  
-Index: superlu-dist-3.2/SRC/zreadrhs.c
+Index: superlu-dist-3.3/SRC/zreadrhs.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ superlu-dist-3.2/SRC/zreadrhs.c	2013-01-15 11:22:35.594275453 +0100
++++ superlu-dist-3.3/SRC/zreadrhs.c	2014-01-17 13:53:35.510156724 +0100
 @@ -0,0 +1,18 @@
 +#include <stdio.h>
 +#include "dcomplex.h"
@@ -116,10 +116,10 @@
 +}
 +
 +
-Index: superlu-dist-3.2/SRC/zreadtriple.c
+Index: superlu-dist-3.3/SRC/zreadtriple.c
 ===================================================================
---- superlu-dist-3.2.orig/SRC/zreadtriple.c	2013-01-15 11:16:48.546261066 +0100
-+++ superlu-dist-3.2/SRC/zreadtriple.c	2013-01-15 11:22:35.594275453 +0100
+--- superlu-dist-3.3.orig/SRC/zreadtriple.c	2014-01-17 13:53:35.514156908 +0100
++++ superlu-dist-3.3/SRC/zreadtriple.c	2014-01-17 13:53:35.510156724 +0100
 @@ -149,19 +149,5 @@
  }
  
@@ -140,10 +140,10 @@
 -}
  
  
-Index: superlu-dist-3.2/SRC/zreadMM.c
+Index: superlu-dist-3.3/SRC/zreadMM.c
 ===================================================================
---- superlu-dist-3.2.orig/SRC/zreadMM.c	2013-01-15 11:07:56.622239015 +0100
-+++ superlu-dist-3.2/SRC/zreadMM.c	2013-01-15 11:24:00.598278986 +0100
+--- superlu-dist-3.3.orig/SRC/zreadMM.c	2014-01-17 13:53:35.514156908 +0100
++++ superlu-dist-3.3/SRC/zreadMM.c	2014-01-17 13:53:35.510156724 +0100
 @@ -212,18 +212,4 @@
  }
  
@@ -163,10 +163,10 @@
 -}
 -
  
-Index: superlu-dist-3.2/EXAMPLE/zreadtriple.c
+Index: superlu-dist-3.3/EXAMPLE/zreadtriple.c
 ===================================================================
---- superlu-dist-3.2.orig/EXAMPLE/zreadtriple.c	2012-10-24 21:46:19.000000000 +0200
-+++ superlu-dist-3.2/EXAMPLE/zreadtriple.c	2013-01-15 11:24:40.546280649 +0100
+--- superlu-dist-3.3.orig/EXAMPLE/zreadtriple.c	2014-01-17 13:53:35.514156908 +0100
++++ superlu-dist-3.3/EXAMPLE/zreadtriple.c	2014-01-17 13:53:35.510156724 +0100
 @@ -149,19 +149,5 @@
  }
  

Modified: packages/superlu-dist/trunk/debian/patches/examples.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu-dist/trunk/debian/patches/examples.diff?rev=46462&op=diff
==============================================================================
--- packages/superlu-dist/trunk/debian/patches/examples.diff	(original)
+++ packages/superlu-dist/trunk/debian/patches/examples.diff	Fri Jan 17 13:25:39 2014
@@ -1,7 +1,7 @@
-Index: superlu-dist-3.2/EXAMPLE/Makefile
+Index: superlu-dist-3.3/EXAMPLE/Makefile
 ===================================================================
---- superlu-dist-3.2.orig/EXAMPLE/Makefile	2012-10-24 21:46:18.000000000 +0200
-+++ superlu-dist-3.2/EXAMPLE/Makefile	2013-01-15 09:51:13.698048185 +0100
+--- superlu-dist-3.3.orig/EXAMPLE/Makefile	2014-01-17 13:53:28.729845692 +0100
++++ superlu-dist-3.3/EXAMPLE/Makefile	2014-01-17 13:53:28.725845508 +0100
 @@ -137,4 +137,8 @@
  	rm -f *.o p[dz]drive p[dz]drive[1-9] \
  	p[dz]drive_ABglobal p[dz]drive[1-9]_ABglobal
@@ -11,10 +11,10 @@
 +	./testing.bat
 +
  
-Index: superlu-dist-3.2/EXAMPLE/test.bat
+Index: superlu-dist-3.3/EXAMPLE/test.bat
 ===================================================================
---- superlu-dist-3.2.orig/EXAMPLE/test.bat	2012-10-24 21:46:19.000000000 +0200
-+++ superlu-dist-3.2/EXAMPLE/test.bat	2013-01-15 09:53:32.710053951 +0100
+--- superlu-dist-3.3.orig/EXAMPLE/test.bat	2014-01-17 13:53:28.729845692 +0100
++++ superlu-dist-3.3/EXAMPLE/test.bat	2014-01-17 13:53:28.725845508 +0100
 @@ -9,8 +9,9 @@
  #PBS -e test.err
  #PBS -m e

Modified: packages/superlu-dist/trunk/debian/patches/make.inc.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu-dist/trunk/debian/patches/make.inc.diff?rev=46462&op=diff
==============================================================================
--- packages/superlu-dist/trunk/debian/patches/make.inc.diff	(original)
+++ packages/superlu-dist/trunk/debian/patches/make.inc.diff	Fri Jan 17 13:25:39 2014
@@ -1,24 +1,25 @@
-Index: superlu-dist-3.2/make.inc
+Index: superlu-dist-3.3/make.inc
 ===================================================================
---- superlu-dist-3.2.orig/make.inc	2012-10-24 21:46:19.000000000 +0200
-+++ superlu-dist-3.2/make.inc	2013-01-15 10:18:14.386115381 +0100
+--- superlu-dist-3.3.orig/make.inc	2014-01-17 13:58:45.960398096 +0100
++++ superlu-dist-3.3/make.inc	2014-01-17 13:59:05.941314695 +0100
 @@ -17,26 +17,26 @@
  #
  #  The machine (platform) identifier to append to the library names
  #
 -PLAT		= _xe6
-+PLAT		= 
++PLAT		=
  
  #
  #  The name of the libraries to be created/linked to
  #
--DSuperLUroot 	= ${HOME}/Release_Codes/SuperLU_DIST-branch
--DSUPERLULIB   	= $(DSuperLUroot)/lib/libsuperlu_dist_3.0.a
-+#DSuperLUroot 	= ${HOME}/Release_Codes/SuperLU_DIST_3.2
+-DSuperLUroot 	= ${HOME}/Release_Codes/SuperLU_DIST_3.3
+-DSUPERLULIB   	= $(DSuperLUroot)/lib/libsuperlu_dist_3.3.a
++#DSuperLUroot 	= ${HOME}/Release_Codes/SuperLU_DIST_3.3
 +DSUPERLULIB   	= $(DSuperLUroot)/lib/libsuperlu-dist.a
  #
- BLASDEF	     	= -DUSE_VENDOR_BLAS
+-BLASDEF	     	= -DUSE_VENDOR_BLAS
 -BLASLIB	        =
++BLASDEF	     	= 
 +BLASLIB	        = -lblas
  #
  ## parmetis 4.x.x, 32-bit integer
@@ -36,7 +37,7 @@
  
  # Define all the libraries
  LIBS	     	= $(DSUPERLULIB) $(BLASLIB) $(PARMETISLIB) $(METISLIB) $(FLIBS)
-@@ -51,21 +51,24 @@
+@@ -51,21 +51,20 @@
  
  ############################################################################
  # C compiler setup
@@ -45,12 +46,9 @@
  # CFLAGS should be set to be the C flags that include optimization
 -CFLAGS          = -fast -Mipa=fast,safe \
 -		-DDEBUGlevel=0 -DPRNTlevel=1 -DPROFlevel=0 \
-+CFLAGS          =  -fPIC -pipe -O3 \
+-#		-D_LONGINT
++CFLAGS          = -fPIC -pipe -O3 \
 +		-DDEBUGlevel=0 -DPRNTlevel=1 -DPROFlevel=0
-+		#
-+#CFLAGS          =  -fPIC -fast -Mipa=fast,safe \
-+#		-DDEBUGlevel=0 -DPRNTlevel=1 -DPROFlevel=0 \
- #		-D_LONGINT
  #
  # NOOPTS should be set to be the C flags that turn off any optimization
  NOOPTS		= -O0
@@ -58,8 +56,8 @@
  # FORTRAN compiler setup
 -FORTRAN         = ftn
 -F90FLAGS	= -fast -Mipa=fast,safe
-+FORTRAN         = mpif77
-+F90FLAGS	=  -fPIC -pipe -O3 #-Mipa=fast,safe
++FORTRAN         = pmif77
++F90FLAGS	= -fPIC -pipe -O3
  ############################################################################
  LOADER	        = $(CC)
 -LOADOPTS	= -fast

Modified: packages/superlu-dist/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu-dist/trunk/debian/patches/series?rev=46462&op=diff
==============================================================================
--- packages/superlu-dist/trunk/debian/patches/series	(original)
+++ packages/superlu-dist/trunk/debian/patches/series	Fri Jan 17 13:25:39 2014
@@ -1,4 +1,3 @@
 make.inc.diff
-#make.inc.patch
 examples.diff
 dreadrhs.patch




More information about the debian-science-commits mailing list