6.0.3

src/Makefile

@@ -32,7 +32,7 @@
 
 VERSION	= 6
 RELEASE = 0
-PATCHLEVEL = 2
+PATCHLEVEL = 3
 
 .PHONY				:	clean	default	install	ptscotch	realclean	required	scotch
 

src/check/Makefile

@@ -77,6 +77,8 @@ realclean			:	clean
 					test_scotch_graph_order		\
 					test_scotch_graph_part_ovl	\
 					test_scotch_dgraph_band		\
+					test_scotch_dgraph_check	\
+					test_scotch_dgraph_coarsen	\
 					test_scotch_dgraph_grow		\
 					test_scotch_dgraph_redist	\
 					test_strat_par			\
@@ -95,7 +97,9 @@ CHECKSCOTCH = 		check_common_thread			\
 			check_prog_gpart_remap
 
 CHECKPTSCOTCH = 	check_strat_par				\
+			check_scotch_dgraph_check		\
 			check_scotch_dgraph_band		\
+			check_scotch_dgraph_coarsen		\
 			check_scotch_dgraph_grow		\
 			check_scotch_dgraph_redist		\
 
@@ -184,13 +188,31 @@ test_strat_par			:	test_strat_par.c		\
 ##
 
 check_scotch_dgraph_band	:	test_scotch_dgraph_band
-					$(EXECP) ./test_scotch_dgraph_band data/bump.grf
+					$(EXECP) ./test_scotch_dgraph_band data/bump_b1.grf
 
 test_scotch_dgraph_band		:	test_scotch_dgraph_band.c	\
 					$(SCOTCHLIBDIR)/libptscotch$(LIB)
 
 ##
 
+check_scotch_dgraph_coarsen	:	test_scotch_dgraph_coarsen
+					$(EXECP) ./test_scotch_dgraph_coarsen data/bump.grf
+					$(EXECP) ./test_scotch_dgraph_coarsen data/bump_b1.grf
+
+test_scotch_dgraph_coarsen	:	test_scotch_dgraph_coarsen.c	\
+					$(SCOTCHLIBDIR)/libptscotch$(LIB)
+
+##
+
+check_scotch_dgraph_check	:	test_scotch_dgraph_check
+					$(EXECP) ./test_scotch_dgraph_check data/bump.grf
+					$(EXECP) ./test_scotch_dgraph_check data/bump_b1.grf
+
+test_scotch_dgraph_check	:	test_scotch_dgraph_check.c	\
+					$(SCOTCHLIBDIR)/libptscotch$(LIB)
+
+##
+
 check_scotch_dgraph_grow	:	test_scotch_dgraph_grow
 					$(EXECP) ./test_scotch_dgraph_grow data/bump.grf
 

src/check/test_scotch_dgraph_band.c

@@ -133,7 +133,7 @@ char *              argv[])
   }
 
   if (SCOTCH_dgraphInit (&grafdat, proccomm) != 0) { /* Initialize source graph */
-    errorPrint ("main: cannot initialize graph");
+    errorPrint ("main: cannot initialize graph (1)");
     return     (1);
   }
 
@@ -152,11 +152,6 @@ char *              argv[])
   if (file != NULL)
     fclose (file);
 
-  if (SCOTCH_dgraphCheck (&grafdat) != 0) {
-    errorPrint ("main: invalid graph");
-    return     (1);
-  }
-
   if (MPI_Barrier (proccomm) != MPI_SUCCESS) {    /* Synchronize for debug */
     errorPrint ("main: cannot communicate");
     return     (1);
@@ -170,7 +165,7 @@ char *              argv[])
   }
 
   if (SCOTCH_dgraphInit (&bandgrafdat, proccomm) != 0) { /* Initialize band graph */
-    errorPrint ("main: cannot initialize graph");
+    errorPrint ("main: cannot initialize graph (2)");
     return     (1);
   }
 

src/check/test_scotch_dgraph_check.c

@@ -0,0 +1,160 @@
+/* Copyright 2014 IPB, Universite de Bordeaux, 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       : test_scotch_dgraph_check.c              **/
+/**                                                        **/
+/**   AUTHOR     : Francois PELLEGRINI                     **/
+/**                                                        **/
+/**   FUNCTION   : This module tests the operation of      **/
+/**                the SCOTCH_dgraphCheck() routine.       **/
+/**                                                        **/
+/**   DATES      : # Version 6.0  : from : 28 sep 2014     **/
+/**                                 to     28 sep 2014     **/
+/**                                                        **/
+/************************************************************/
+
+/*
+**  The defines and includes.
+*/
+
+#include <mpi.h>
+#include <stdio.h>
+#if (((defined __STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || (defined HAVE_STDINT_H))
+#include <stdint.h>
+#endif /* (((defined __STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || (defined HAVE_STDINT_H)) */
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <pthread.h>
+#include <unistd.h>
+
+#include "ptscotch.h"
+
+#define errorProg                   SCOTCH_errorProg
+#define errorPrint                  SCOTCH_errorPrint
+
+/*********************/
+/*                   */
+/* The main routine. */
+/*                   */
+/*********************/
+
+int
+main (
+
+int                 argc,
+char *              argv[])
+{
+  MPI_Comm            proccomm;
+  int                 procglbnbr;                 /* Number of processes sharing graph data */
+  int                 proclocnum;                 /* Number of this process                 */
+  SCOTCH_Dgraph       grafdat;
+  FILE *              file;
+#ifdef SCOTCH_PTHREAD
+  int                 thrdlvlreqval;
+  int                 thrdlvlproval;
+#endif /* SCOTCH_PTHREAD */
+
+  errorProg (argv[0]);
+
+#ifdef SCOTCH_PTHREAD
+  thrdlvlreqval = MPI_THREAD_MULTIPLE;
+  if (MPI_Init_thread (&argc, &argv, thrdlvlreqval, &thrdlvlproval) != MPI_SUCCESS)
+    errorPrint ("main: Cannot initialize (1)");
+  if (thrdlvlreqval > thrdlvlproval)
+    errorPrint ("main: MPI implementation is not thread-safe: recompile without SCOTCH_PTHREAD");
+#else /* SCOTCH_PTHREAD */
+  if (MPI_Init (&argc, &argv) != MPI_SUCCESS)
+    errorPrint ("main: Cannot initialize (2)");
+#endif /* SCOTCH_PTHREAD */
+
+  if (argc != 2) {
+    errorPrint ("main: invalid number of parameters");
+    exit       (1);
+  }
+
+  proccomm = MPI_COMM_WORLD;
+  MPI_Comm_size (proccomm, &procglbnbr);          /* Get communicator data */
+  MPI_Comm_rank (proccomm, &proclocnum);
+
+  fprintf (stderr, "Proc %2d of %2d, pid %d\n", proclocnum, procglbnbr, getpid ());
+
+#ifndef SCOTCH_CHECK_AUTO
+  if (proclocnum == 0) {                          /* Synchronize on keybord input */
+    char           c;
+
+    printf ("Waiting for key press...\n");
+    scanf ("%c", &c);
+  }
+#endif /* SCOTCH_CHECK_AUTO */
+
+  if (MPI_Barrier (proccomm) != MPI_SUCCESS) {    /* Synchronize for debug */
+    errorPrint ("main: cannot communicate");
+    return     (1);
+  }
+
+  if (SCOTCH_dgraphInit (&grafdat, proccomm) != 0) { /* Initialize source graph */
+    errorPrint ("main: cannot initialize graph");
+    return     (1);
+  }
+
+  file = NULL;
+  if ((proclocnum == 0) &&
+      ((file = fopen (argv[1], "r")) == NULL)) {
+    errorPrint ("main: cannot open graph file");
+    return     (1);
+  }
+
+  if (SCOTCH_dgraphLoad (&grafdat, file, 0, 0) != 0) {
+    errorPrint ("main: cannot load graph");
+    return     (1);
+  }
+
+  if (file != NULL)
+    fclose (file);
+
+  if (SCOTCH_dgraphCheck (&grafdat) != 0) {
+    errorPrint ("main: invalid graph");
+    return     (1);
+  }
+
+  if (MPI_Barrier (proccomm) != MPI_SUCCESS) {    /* Synchronize for debug */
+    errorPrint ("main: cannot communicate");
+    return     (1);
+  }
+
+  SCOTCH_dgraphExit (&grafdat);
+
+  MPI_Finalize ();
+  exit         (0);
+}