Index: /issm/trunk/externalpackages/scotch/gmap_mex.c
===================================================================
--- /issm/trunk/externalpackages/scotch/gmap_mex.c (revision 3616)
+++ /issm/trunk/externalpackages/scotch/gmap_mex.c (revision 3617)
@@ -1,111 +1,55 @@
-/* Copyright 2004,2007,2008 ENSEIRB, INRIA & CNRS
-**
-** This file is part of the Scotch software package for static mapping,
-** graph partitioning and sparse matrix ordering.
-**
-** This software is governed by the CeCILL-C license under French law
-** and abiding by the rules of distribution of free software. You can
-** use, modify and/or redistribute the software under the terms of the
-** CeCILL-C license as circulated by CEA, CNRS and INRIA at the following
-** URL: "http://www.cecill.info".
-**
-** As a counterpart to the access to the source code and rights to copy,
-** modify and redistribute granted by the license, users are provided
-** only with a limited warranty and the software's author, the holder of
-** the economic rights, and the successive licensors have only limited
-** liability.
-**
-** In this respect, the user's attention is drawn to the risks associated
-** with loading, using, modifying and/or developing or reproducing the
-** software by the user in light of its specific status of free software,
-** that may mean that it is complicated to manipulate, and that also
-** therefore means that it is reserved for developers and experienced
-** professionals having in-depth computer knowledge. Users are therefore
-** encouraged to load and test the software's suitability as regards
-** their requirements in conditions enabling the security of their
-** systems and/or data to be ensured and, more generally, to use and
-** operate it in the same conditions as regards security.
-**
-** The fact that you are presently reading this means that you have had
-** knowledge of the CeCILL-C license and that you accept its terms.
-*/
-/************************************************************/
-/** **/
-/** NAME : gmap.c **/
-/** **/
-/** AUTHOR : Francois PELLEGRINI **/
-/** **/
-/** FUNCTION : Part of a graph mapping software. **/
-/** This module contains the main function. **/
-/** **/
-/** DATES : # Version 0.0 : from : 05 jan 1993 **/
-/** to 12 may 1993 **/
-/** # Version 1.1 : from : 15 oct 1993 **/
-/** to 15 oct 1993 **/
-/** # Version 1.3 : from : 06 apr 1994 **/
-/** to 18 may 1994 **/
-/** # Version 2.0 : from : 06 jun 1994 **/
-/** to 17 nov 1994 **/
-/** # Version 2.1 : from : 07 apr 1995 **/
-/** to 18 jun 1995 **/
-/** # Version 3.0 : from : 01 jul 1995 **/
-/** to 02 oct 1995 **/
-/** # Version 3.1 : from : 07 nov 1995 **/
-/** to 25 apr 1996 **/
-/** # Version 3.2 : from : 24 sep 1996 **/
-/** to 26 may 1998 **/
-/** # Version 3.3 : from : 19 oct 1998 **/
-/** to : 30 mar 1999 **/
-/** # Version 3.4 : from : 03 feb 2000 **/
-/** to : 03 feb 2000 **/
-/** # Version 4.0 : from : 16 jan 2004 **/
-/** to : 27 dec 2004 **/
-/** # Version 5.0 : from : 23 dec 2007 **/
-/** to : 18 jun 2008 **/
-/** **/
-/************************************************************/
-
-/*
-** The defines and includes.
-*/
-
-#define GMAP
-
-#include "module.h"
-#include "common.h"
-#include "scotch.h"
-#include "gmap.h"
-
-/*
-** The static variables.
-*/
-
-static int C_partNbr = 2; /* Default number of parts */
-static int C_paraNum = 0; /* Number of parameters */
-static int C_paraNbr = 0; /* No parameters for mapping */
-static int C_fileNum = 0; /* Number of file in arg list */
-static int C_fileNbr = 4; /* Number of files for mapping */
-static File C_fileTab[C_FILENBR] = { /* File array */
- { "-", NULL, "r" },
- { "-", NULL, "r" },
- { "-", NULL, "w" },
- { "-", NULL, "w" } };
-
-static const char * C_usageList[] = { /* Usage */
- "gmap [ []]]] ",
- "gpart [] [ []]] ",
- " -h : Display this help",
- " -m : Set mapping strategy (see user's manual)",
- " -s : Force unity weights on :",
- " e : edges",
- " v : vertices",
- " -V : Print program version and copyright",
- " -v : Set verbose mode to :",
- " m : mapping information",
- " s : strategy information",
- " t : timing information",
- "",
- "See default strategy with option '-vs'",
- NULL };
+
+#define THISFUNCTION "Gmap"
+
+/* Gmap structures and prototypes */
+
+#ifdef MATLAB
+ #include "mat.h"
+ #include "mex.h"
+ #include "matrix.h"
+
+ #define printf mexPrintf
+ #define fprintf(file,...) (file == stdout || file == stderr ? mexPrintf(__VA_ARGS__) : fprintf(file,__VA_ARGS__))
+ #define malloc mxMalloc
+ #define calloc mxCalloc
+ #define realloc mxRealloc
+ #define free mxFree
+ #define exit(status) mexErrMsgTxt("exit=" #status)
+#endif
+
+void GmapUsage( void );
+
+
+/* Input Arguments */
+
+#define ADJMAT_IN prhs[0]
+#define VERTLB_IN prhs[1]
+#define VERTWT_IN prhs[2]
+#define EDGEWT_IN prhs[3]
+#define ARCHTYP_IN prhs[4]
+#define ARCHPAR_IN prhs[5]
+#define REQ_ARGS 6
+
+/* Output Arguments */
+
+#define RETURN_OUT plhs[0]
+#define MAPTAB_OUT plhs[1]
+
+
+int
+gmapx (
+ int (**pmaptabi)[2],
+ int argcm,
+ char *argvm[],
+ int nvi,
+ int ne2i,
+ int *ir,
+ int *jc,
+ int *vli,
+ int *vwi,
+ int *ewi,
+ char archtyp[],
+ int nai,
+ int *api);
/******************************/
@@ -116,352 +60,208 @@
void mexFunction( int nlhs,
- mxArray *plhs[],
- int nrhs,
- const mxArray *prhs[] )
+ mxArray *plhs[],
+ int nrhs,
+ const mxArray *prhs[] )
{
- int argcm;
- char argvm[21][257];
- SCOTCH_Graph grafdat; /* Source graph */
- SCOTCH_Num grafflag; /* Source graph properties */
- SCOTCH_Arch archdat; /* Target architecture */
- SCOTCH_Strat stradat; /* Mapping strategy */
- SCOTCH_Mapping mapdat; /* Mapping data */
- Clock runtime[2]; /* Timing variables */
- SCOTCH_Num nvert =0;
- SCOTCH_Num nedge2=0;
- SCOTCH_Num* adjir =NULL;
- SCOTCH_Num* adjjc =NULL;
- mwIndex *ir=NULL,*jc=NULL;
- double *vld=NULL,*vwd=NULL,*ewd=NULL,*apd=NULL;
- SCOTCH_Num* vertlab=NULL;
- SCOTCH_Num* vertwgt=NULL;
- SCOTCH_Num* edgewgt=NULL;
- char archtyp[256];
- SCOTCH_Num napar =0;
- SCOTCH_Num* archpar=NULL;
- SCOTCH_Num (*maptab)[2]=NULL;
- double* maptabm;
- int flagval;
- int i,j,k;
-
-/* check static variables from previous runs */
-
- if (C_paraNum > 0 || C_fileNum > 0)
- mexErrMsgTxt("gmap_mex still in memory -- clear gmap_mex and try again.\n");
-
-/* load matlab argument list */
-
- if (!mxIsNumeric(prhs[0]) || (!mxIsEmpty(prhs[0]) && !mxIsSparse(prhs[0]))) {
- mexPrintf("%s -- Adjacency matrix must be numeric and sparse.\n","gmap_mex");
- mexErrMsgTxt(" ");
- }
- else {
- nvert =mxGetM(prhs[0]);
- nedge2=mxGetNzmax(prhs[0]);
- ir =mxGetIr(prhs[0]);
- adjir = (SCOTCH_Num *) malloc(mxGetNzmax(prhs[0])*sizeof(SCOTCH_Num));
- for (i=0; i= 5) && (strncmp (argvm[0] + i - 5, "gpart", 5) == 0)) {
- flagval |= C_FLAGPART;
- C_paraNbr = 1; /* One more parameter */
- C_fileNbr = 3; /* One less file to provide */
- errorProg ("gpart");
- }
- else
- errorProg ("gmap");
-
- intRandInit ();
-
- if ((argcm >= 2) && (argvm[1][0] == '?')) { /* If need for help */
- usagePrint (stdout, C_usageList);
-/* return (0); */
- plhs[0]=mxCreateDoubleMatrix(1, 1, mxREAL);
- *mxGetPr(plhs[0])=0.;
+ int argcm;
+ char **argvm=NULL;
+ int nvert =0,nedge2=0,napar =0;
+ mwIndex *ir=NULL,*jc=NULL;
+ int *adjir=NULL,*adjjc=NULL;
+ double *vld=NULL,*vwd=NULL,*ewd=NULL,*apd=NULL;
+ int *vli=NULL,*vwi=NULL,*ewi=NULL,*api=NULL;
+ char *archtyp=NULL;
+ int (*maptabi)[2]=NULL;
+ double* maptabd=NULL;
+ int i,j,k,ierr;
+
+ /* Check for proper number of arguments */
+
+ if (nrhs == 0 && nlhs == 0) {
+ GmapUsage();
+ return;
+ }
+ else if (nrhs < 6 || nlhs > 2) {
+ GmapUsage();
+ mexErrMsgTxt(" ");
+ }
+
+/* load matlab argument list and convert to integer (note that converting here
+ and in the x-layer is inefficient, but it makes the x-layer more general) */
+
+ if (!mxIsNumeric(ADJMAT_IN) || (!mxIsEmpty(ADJMAT_IN) && !mxIsSparse(ADJMAT_IN))) {
+ mexPrintf("%s -- Adjacency matrix must be numeric and sparse.\n",THISFUNCTION);
+ mexErrMsgTxt(" ");
+ }
+ else {
+ nvert =mxGetM(ADJMAT_IN);
+ nedge2=mxGetNzmax(ADJMAT_IN);
+ if (mxGetNzmax(ADJMAT_IN)) {
+ ir =mxGetIr(ADJMAT_IN);
+ adjir = (int *) malloc(mxGetNzmax(ADJMAT_IN)*sizeof(int));
+ for (i=0; i=0; i--)
+ free(argvm[i]);
+ if (api) free(api);
+ if (archtyp) free(archtyp);
+ if (ewi) free(ewi);
+ if (vwi) free(vwi);
+ if (vli) free(vli);
+ if (adjjc) free(adjjc);
+ if (adjir) free(adjir);
+
+ RETURN_OUT=mxCreateDoubleMatrix(1, 1, mxREAL);
+ *mxGetPr(RETURN_OUT)=ierr;
+
+ return;
+}
+
+void GmapUsage( void )
+{
+
+ mexPrintf("\n");
+ mexPrintf("Usage: [return,maptab]=Gmap_mex(adjmat,vertlb,vertwt,edgewt,archtyp,archpar,\n");
+ mexPrintf(" Scotch-specific parameters);\n");
+ mexPrintf("\n");
+
return;
- }
-
- grafflag = 0; /* Use vertex and edge weights */
- SCOTCH_stratInit (&stradat); /* Set default mapping strategy */
-
- printf("point 0: C_FILENBR=%d, C_fileNbr=%d, C_paraNbr=%d\n",
- C_FILENBR,C_fileNbr,C_paraNbr);
- for (i = 0; i < C_FILENBR; i ++) /* Set default stream pointers */
- C_fileTab[i].pntr = (C_fileTab[i].mode[0] == 'r') ? stdin : stdout;
- for (i = 1; i < argcm; i ++) { /* Loop for all option codes */
- printf("point 1: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
- i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
- if ((argvm[i][0] != '-') || (argvm[i][1] == '\0') || (argvm[i][1] == '.')) { /* If found a file name */
- printf("point 2: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
- i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
- if (C_paraNum < C_paraNbr) { /* If number of parameters not reached */
- if ((C_partNbr = atoi (argvm[i])) < 1) /* Get the number of parts */
- errorPrint ("main: invalid number of parts (\"%s\")", argvm[i]);
- C_paraNum ++;
- continue; /* Process the other parameters */
- }
- printf("point 3: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
- i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
- if (C_fileNum < C_fileNbr) /* A file name has been given */
- C_fileTab[C_fileNum ++].name = argvm[i];
- else
- errorPrint ("main: too many file names given");
- printf("point 4: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
- i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
- }
- else { /* If found an option name */
- switch (argvm[i][1]) {
- case 'H' : /* Give the usage message */
- case 'h' :
- usagePrint (stdout, C_usageList);
-/* return (0); */
- plhs[0]=mxCreateDoubleMatrix(1, 1, mxREAL);
- *mxGetPr(plhs[0])=0.;
- return;
- case 'M' :
- case 'm' :
- SCOTCH_stratExit (&stradat);
- SCOTCH_stratInit (&stradat);
- SCOTCH_stratGraphMap (&stradat, &argvm[i][2]);
- break;
- case 'S' :
- case 's' : /* Source graph parameters */
- for (j = 2; argvm[i][j] != '\0'; j ++) {
- switch (argvm[i][j]) {
- case 'E' :
- case 'e' :
- grafflag |= 2; /* Do not load edge weights */
- break;
- case 'V' :
- case 'v' :
- grafflag |= 1; /* Do not load vertex weights */
- break;
- default :
- errorPrint ("main: invalid source graph option (\"%c\")", argvm[i][j]);
- }
- }
- break;
- case 'V' :
- fprintf (stderr, "gmap/gpart, version %s - F. Pellegrini\n", SCOTCH_VERSION);
- fprintf (stderr, "Copyright 2004,2007,2008 ENSEIRB, INRIA & CNRS, France\n");
- fprintf (stderr, "This software is libre/free software under CeCILL-C -- see the user's manual for more information\n");
-/* return (0); */
- plhs[0]=mxCreateDoubleMatrix(1, 1, mxREAL);
- *mxGetPr(plhs[0])=0.;
- return;
- case 'v' : /* Output control info */
- for (j = 2; argvm[i][j] != '\0'; j ++) {
- switch (argvm[i][j]) {
- case 'M' :
- case 'm' :
- flagval |= C_FLAGVERBMAP;
- break;
- case 'S' :
- case 's' :
- flagval |= C_FLAGVERBSTR;
- break;
- case 'T' :
- case 't' :
- flagval |= C_FLAGVERBTIM;
- break;
- default :
- errorPrint ("main: unprocessed parameter \"%c\" in \"%s\"", argvm[i][j], argvm[i]);
- }
- }
- break;
- default :
- errorPrint ("main: unprocessed option (\"%s\")", argvm[i]);
- }
- }
- }
- printf("point 5\n");
- if ((flagval & C_FLAGPART) != 0) { /* If program run as the partitioner */
- C_fileTab[3].name = C_fileTab[2].name; /* Put provided file names at their right place */
- C_fileTab[2].name = C_fileTab[1].name;
- C_fileTab[1].name = "-";
- }
- printf("point 6\n");
-
- fileBlockOpen (C_fileTab, C_FILENBR); /* Open all files */
- for (i=0; i [ []]]] ",
+ "gpart [] [ []]] ",
+ " -h : Display this help",
+ " -m : Set mapping strategy (see user's manual)",
+ " -s : Force unity weights on :",
+ " e : edges",
+ " v : vertices",
+ " -V : Print program version and copyright",
+ " -v : Set verbose mode to :",
+ " m : mapping information",
+ " s : strategy information",
+ " t : timing information",
+ "",
+ "See default strategy with option '-vs'",
+ NULL };
+
+/******************************/
+/* */
+/* This is the main function. */
+/* */
+/******************************/
+
+int
+gmapx (
+ int (**pmaptabi)[2],
+ int argcm,
+ char *argvm[],
+ int nvi,
+ int ne2i,
+ int *ir,
+ int *jc,
+ int *vli,
+ int *vwi,
+ int *ewi,
+ char archtyp[],
+ int nai,
+ int *api)
+{
+ SCOTCH_Graph grafdat; /* Source graph */
+ SCOTCH_Num grafflag; /* Source graph properties */
+ SCOTCH_Arch archdat; /* Target architecture */
+ SCOTCH_Strat stradat; /* Mapping strategy */
+ SCOTCH_Mapping mapdat; /* Mapping data */
+ Clock runtime[2]; /* Timing variables */
+ SCOTCH_Num nvert =0;
+ SCOTCH_Num nedge2=0;
+ SCOTCH_Num* adjir =NULL;
+ SCOTCH_Num* adjjc =NULL;
+ SCOTCH_Num* vertlab=NULL;
+ SCOTCH_Num* vertwgt=NULL;
+ SCOTCH_Num* edgewgt=NULL;
+ SCOTCH_Num napar =0;
+ SCOTCH_Num* archpar=NULL;
+ SCOTCH_Num (*maptab)[2]=NULL;
+ int (*maptabi)[2]=NULL;
+ int flagval;
+ int i,j,k;
+
+/* check static variables from previous runs */
+
+ if (C_paraNum > 0 || C_fileNum > 0) {
+ printf("gmap_mex still in memory -- clear gmap_mex and try again.\n");
+ return(1);
+ }
+
+/* convert input arguments to scotch data types */
+
+ nvert =(SCOTCH_Num)nvi;
+ nedge2=(SCOTCH_Num)ne2i;
+
+ if (ir && jc) {
+ adjir = (SCOTCH_Num *) malloc(nedge2*sizeof(SCOTCH_Num));
+ for (i=0; i= 5) && (strncmp (argvm[0] + i - 5, "gpart", 5) == 0)) {
+ flagval |= C_FLAGPART;
+ C_paraNbr = 1; /* One more parameter */
+ C_fileNbr = 3; /* One less file to provide */
+ errorProg ("gpart");
+ }
+ else
+ errorProg ("gmap");
+
+ intRandInit ();
+
+ if ((argcm >= 2) && (argvm[1][0] == '?')) { /* If need for help */
+ usagePrint (stdout, C_usageList);
+ return (0);
+ }
+
+ grafflag = 0; /* Use vertex and edge weights */
+ SCOTCH_stratInit (&stradat); /* Set default mapping strategy */
+
+ printf("point 0: C_FILENBR=%d, C_fileNbr=%d, C_paraNbr=%d\n",
+ C_FILENBR,C_fileNbr,C_paraNbr);
+ for (i = 0; i < C_FILENBR; i ++) /* Set default stream pointers */
+ C_fileTab[i].pntr = (C_fileTab[i].mode[0] == 'r') ? stdin : stdout;
+ for (i = 1; i < argcm; i ++) { /* Loop for all option codes */
+ printf("point 1: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
+ i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
+ if ((argvm[i][0] != '-') || (argvm[i][1] == '\0') || (argvm[i][1] == '.')) { /* If found a file name */
+ printf("point 2: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
+ i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
+ if (C_paraNum < C_paraNbr) { /* If number of parameters not reached */
+ if ((C_partNbr = atoi (argvm[i])) < 1) /* Get the number of parts */
+ errorPrint ("main: invalid number of parts (\"%s\")", argvm[i]);
+ C_paraNum ++;
+ continue; /* Process the other parameters */
+ }
+ printf("point 3: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
+ i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
+ if (C_fileNum < C_fileNbr) /* A file name has been given */
+ C_fileTab[C_fileNum ++].name = argvm[i];
+ else
+ errorPrint ("main: too many file names given");
+ printf("point 4: i=%d; C_fileNbr=%d, C_fileNum=%d, C_paraNbr=%d, C_paraNum=%d\n",
+ i,C_fileNbr,C_fileNum,C_paraNbr,C_paraNum);
+ }
+ else { /* If found an option name */
+ switch (argvm[i][1]) {
+ case 'H' : /* Give the usage message */
+ case 'h' :
+ usagePrint (stdout, C_usageList);
+ return (0);
+ case 'M' :
+ case 'm' :
+ SCOTCH_stratExit (&stradat);
+ SCOTCH_stratInit (&stradat);
+ SCOTCH_stratGraphMap (&stradat, &argvm[i][2]);
+ break;
+ case 'S' :
+ case 's' : /* Source graph parameters */
+ for (j = 2; argvm[i][j] != '\0'; j ++) {
+ switch (argvm[i][j]) {
+ case 'E' :
+ case 'e' :
+ grafflag |= 2; /* Do not load edge weights */
+ break;
+ case 'V' :
+ case 'v' :
+ grafflag |= 1; /* Do not load vertex weights */
+ break;
+ default :
+ errorPrint ("main: invalid source graph option (\"%c\")", argvm[i][j]);
+ }
+ }
+ break;
+ case 'V' :
+ fprintf (stderr, "gmap/gpart, version %s - F. Pellegrini\n", SCOTCH_VERSION);
+ fprintf (stderr, "Copyright 2004,2007,2008 ENSEIRB, INRIA & CNRS, France\n");
+ fprintf (stderr, "This software is libre/free software under CeCILL-C -- see the user's manual for more information\n");
+ return (0);
+ case 'v' : /* Output control info */
+ for (j = 2; argvm[i][j] != '\0'; j ++) {
+ switch (argvm[i][j]) {
+ case 'M' :
+ case 'm' :
+ flagval |= C_FLAGVERBMAP;
+ break;
+ case 'S' :
+ case 's' :
+ flagval |= C_FLAGVERBSTR;
+ break;
+ case 'T' :
+ case 't' :
+ flagval |= C_FLAGVERBTIM;
+ break;
+ default :
+ errorPrint ("main: unprocessed parameter \"%c\" in \"%s\"", argvm[i][j], argvm[i]);
+ }
+ }
+ break;
+ default :
+ errorPrint ("main: unprocessed option (\"%s\")", argvm[i]);
+ }
+ }
+ }
+ printf("point 5\n");
+ if ((flagval & C_FLAGPART) != 0) { /* If program run as the partitioner */
+ C_fileTab[3].name = C_fileTab[2].name; /* Put provided file names at their right place */
+ C_fileTab[2].name = C_fileTab[1].name;
+ C_fileTab[1].name = "-";
+ }
+ printf("point 6\n");
+
+ fileBlockOpen (C_fileTab, C_FILENBR); /* Open all files */
+ for (i=0; i