r38279 - in /packages/pastix/trunk/debian: config-mpi-nosmp.in config-seq-nosmp.in patches/ patches/scotch-include-guard.patch rules
saramito-guest at users.alioth.debian.org
saramito-guest at users.alioth.debian.org
Mon Mar 28 22:04:31 UTC 2011
Author: saramito-guest
Date: Mon Mar 28 22:04:24 2011
New Revision: 38279
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38279
Log:
lib: fusion seq+mpi
Added:
packages/pastix/trunk/debian/patches/
packages/pastix/trunk/debian/patches/scotch-include-guard.patch
Modified:
packages/pastix/trunk/debian/config-mpi-nosmp.in
packages/pastix/trunk/debian/config-seq-nosmp.in
packages/pastix/trunk/debian/rules
Modified: packages/pastix/trunk/debian/config-mpi-nosmp.in
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/config-mpi-nosmp.in?rev=38279&op=diff
==============================================================================
--- packages/pastix/trunk/debian/config-mpi-nosmp.in (original)
+++ packages/pastix/trunk/debian/config-mpi-nosmp.in Mon Mar 28 22:04:24 2011
@@ -111,7 +111,7 @@
#EXTRALIB := $(EXTRALIB) -L$(METIS_HOME) -lmetis
# Scotch always needed to compile
-SCOTCH_HOME ?= /usr
+SCOTCH_HOME ?= /home/saramito/sys
SCOTCH_INC ?= $(SCOTCH_HOME)/include/scotch
SCOTCH_LIB ?= $(SCOTCH_HOME)/lib
# uncomment on of this blocks
Modified: packages/pastix/trunk/debian/config-seq-nosmp.in
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/config-seq-nosmp.in?rev=38279&op=diff
==============================================================================
--- packages/pastix/trunk/debian/config-seq-nosmp.in (original)
+++ packages/pastix/trunk/debian/config-seq-nosmp.in Mon Mar 28 22:04:24 2011
@@ -109,7 +109,7 @@
#EXTRALIB := $(EXTRALIB) -L$(METIS_HOME) -lmetis
# Scotch always needed to compile
-SCOTCH_HOME ?= /usr
+SCOTCH_HOME ?= /home/saramito/sys
SCOTCH_INC ?= $(SCOTCH_HOME)/include/scotch
SCOTCH_LIB ?= $(SCOTCH_HOME)/lib
# uncomment on of this blocks
Added: packages/pastix/trunk/debian/patches/scotch-include-guard.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/patches/scotch-include-guard.patch?rev=38279&op=file
==============================================================================
--- packages/pastix/trunk/debian/patches/scotch-include-guard.patch (added)
+++ packages/pastix/trunk/debian/patches/scotch-include-guard.patch Mon Mar 28 22:04:24 2011
@@ -1,0 +1,220 @@
+*** ./src/order/src/order.h.orig 2011-03-27 20:25:00.000000000 +0200
+--- ./src/order/src/order.h 2011-03-28 06:22:51.000000000 +0200
+***************
+*** 40,45 ****
+--- 40,66 ----
+
+ #define ORDER_H
+
++ #ifndef NO_MPI
++ # ifdef FORCE_NOMPI
++ # include "nompi.h"
++ # else
++ # include <mpi.h>
++ # endif /* FORCE_NOMPI */
++ #else
++ # define MPI_Comm int
++ #endif /* NO_MPI */
++
++ #ifdef WITH_SCOTCH
++ # ifndef _PASTIX_HAVE_SCOTCH_H
++ # define _PASTIX_HAVE_SCOTCH_H
++ # ifdef DISTRIBUTED
++ # include "ptscotch.h"
++ # else
++ # include "scotch.h"
++ # endif
++ # endif /* _PASTIX_HAVE_SCOTCH_H */
++ #endif /* WITH_SCOTCH */
++
+ /*
+ ** The type and structure definitions.
+ */
+*** ./src/sopalin/src/murge.c.orig 2011-03-28 05:47:29.000000000 +0200
+--- ./src/sopalin/src/murge.c 2011-03-28 06:28:45.000000000 +0200
+***************
+*** 56,66 ****
+ #include "sopalin_define.h"
+
+ #ifdef WITH_SCOTCH
+! #ifdef DISTRIBUTED
+! #include "ptscotch.h"
+! #else
+! #include "scotch.h"
+! #endif /* DISTRIBUTED */
+ #endif /* WITH_SCOTCH */
+
+ #include "ftgt.h"
+--- 56,69 ----
+ #include "sopalin_define.h"
+
+ #ifdef WITH_SCOTCH
+! # ifndef _PASTIX_HAVE_SCOTCH_H
+! # define _PASTIX_HAVE_SCOTCH_H
+! # ifdef DISTRIBUTED
+! # include "ptscotch.h"
+! # else
+! # include "scotch.h"
+! # endif
+! # endif /* _PASTIX_HAVE_SCOTCH_H */
+ #endif /* WITH_SCOTCH */
+
+ #include "ftgt.h"
+*** ./src/sopalin/src/pastix.c.orig 2011-03-28 05:44:55.000000000 +0200
+--- ./src/sopalin/src/pastix.c 2011-03-28 06:27:17.000000000 +0200
+***************
+*** 65,78 ****
+ #include "sopalin_define.h"
+
+ #ifdef WITH_SCOTCH
+! #ifdef DISTRIBUTED
+! #include "ptscotch.h"
+! #else
+! #include "scotch.h"
+! #endif /* DISTRIBUTED */
+ #endif /* WITH_SCOTCH */
+
+-
+ #include "dof.h"
+ #include "ftgt.h"
+ #include "symbol.h"
+--- 65,80 ----
+ #include "sopalin_define.h"
+
+ #ifdef WITH_SCOTCH
+! # ifndef _PASTIX_HAVE_SCOTCH_H
+! # define _PASTIX_HAVE_SCOTCH_H
+! # ifdef DISTRIBUTED
+! # include "ptscotch.h"
+! # else
+! # include "scotch.h"
+! # endif
+! # endif /* _PASTIX_HAVE_SCOTCH_H */
+ #endif /* WITH_SCOTCH */
+
+ #include "dof.h"
+ #include "ftgt.h"
+ #include "symbol.h"
+*** ./src/sopalin/src/bordi.c.orig 2011-03-28 05:43:56.000000000 +0200
+--- ./src/sopalin/src/bordi.c 2011-03-28 06:26:50.000000000 +0200
+***************
+*** 56,69 ****
+
+ #include <assert.h>
+ #include "common_pastix.h"
+ #ifdef WITH_SCOTCH
+! #ifdef DISTRIBUTED
+! #include <mpi.h>
+! #include "ptscotch.h"
+! #else
+! #include "scotch.h"
+! #endif
+! #endif
+ #include "dof.h"
+ #include "symbol.h"
+ #include "order.h"
+--- 56,74 ----
+
+ #include <assert.h>
+ #include "common_pastix.h"
++
+ #ifdef WITH_SCOTCH
+! # ifndef _PASTIX_HAVE_SCOTCH_H
+! # define _PASTIX_HAVE_SCOTCH_H
+! # ifdef DISTRIBUTED
+! # include <mpi.h>
+! # include "ptscotch.h"
+! # else
+! # include "scotch.h"
+! # endif
+! # endif /* _PASTIX_HAVE_SCOTCH_H */
+! #endif /* WITH_SCOTCH */
+!
+ #include "dof.h"
+ #include "symbol.h"
+ #include "order.h"
+*** ./src/fax/src/symbol_faxi_graph.c.orig 2011-03-27 20:48:27.000000000 +0200
+--- ./src/fax/src/symbol_faxi_graph.c 2011-03-28 06:25:55.000000000 +0200
+***************
+*** 56,68 ****
+ #define SYMBOL_FAXI_INCLUDED
+
+ #include "common_pastix.h"
+ #ifdef WITH_SCOTCH
+! #ifdef DISTRIBUTED
+! #include <mpi.h>
+! #include "ptscotch.h"
+! #else
+! #include "scotch.h"
+! #endif
+ #include "symbol.h"
+ #include "order.h"
+ #include "fax.h"
+--- 56,73 ----
+ #define SYMBOL_FAXI_INCLUDED
+
+ #include "common_pastix.h"
++
+ #ifdef WITH_SCOTCH
+! # ifndef _PASTIX_HAVE_SCOTCH_H
+! # define _PASTIX_HAVE_SCOTCH_H
+! # ifdef DISTRIBUTED
+! # include <mpi.h>
+! # include "ptscotch.h"
+! # else
+! # include "scotch.h"
+! # endif
+! # endif /* _PASTIX_HAVE_SCOTCH_H */
+!
+ #include "symbol.h"
+ #include "order.h"
+ #include "fax.h"
+*** ./src/fax/src/symbol_fax_graph.c.orig 2011-03-27 20:44:27.000000000 +0200
+--- ./src/fax/src/symbol_fax_graph.c 2011-03-28 06:25:46.000000000 +0200
+***************
+*** 58,74 ****
+ #define SYMBOL_FAX_GRAPH
+
+ #include "common_pastix.h"
+! #ifdef WITH_SCOTCH
+! #ifdef FORCE_NOMPI
+! #include "nompi.h"
+! #else
+! #include <mpi.h>
+! #endif
+! #ifdef DISTRIBUTED
+! #include "ptscotch.h"
+ #else
+! #include "scotch.h"
+! #endif
+ #include "symbol.h"
+ #include "order.h"
+ #include "fax.h"
+--- 58,84 ----
+ #define SYMBOL_FAX_GRAPH
+
+ #include "common_pastix.h"
+!
+! #ifndef NO_MPI
+! # ifdef FORCE_NOMPI
+! # include "nompi.h"
+! # else
+! # include <mpi.h>
+! # endif /* FORCE_NOMPI */
+ #else
+! # define MPI_Comm int
+! #endif /* NO_MPI */
+!
+! #ifdef WITH_SCOTCH
+! # ifndef _PASTIX_HAVE_SCOTCH_H
+! # define _PASTIX_HAVE_SCOTCH_H
+! # ifdef DISTRIBUTED
+! # include "ptscotch.h"
+! # else
+! # include "scotch.h"
+! # endif
+! # endif /* _PASTIX_HAVE_SCOTCH_H */
+!
+ #include "symbol.h"
+ #include "order.h"
+ #include "fax.h"
Modified: packages/pastix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/rules?rev=38279&op=diff
==============================================================================
--- packages/pastix/trunk/debian/rules (original)
+++ packages/pastix/trunk/debian/rules Mon Mar 28 22:04:24 2011
@@ -55,13 +55,16 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
- rm -f ChangeLog
+ test -f src/config.in || cp debian/config-seq-nosmp.in src/config.in
+ cd src; $(MAKE) clean; cd ..
rm -f src/config.in
+ rm -f src/sopalin/src/murge_fortran.c
rm -f `find src/ -name "*.d"`
rm -f `find src/ -name "*.tmp"`
rm -rf install_seq_nosmp
rm -rf install_mpi_nosmp
+ rm -f ChangeLog
+ rm -f build-stamp configure-stamp
dh_clean
rm -Rf $(TMPDIR)
More information about the debian-science-commits
mailing list