From d49bb9924741212e56923a8cfb1f64c514af4f2d Mon Sep 17 00:00:00 2001 From: Tim Davis Date: Sun, 24 Dec 2023 05:15:54 -0600 Subject: [PATCH] METIS: do not use angle brackets for non-system #include files --- CHOLMOD/SuiteSparse_metis/GKlib/GKlib.h | 32 +++++++++---------- CHOLMOD/SuiteSparse_metis/GKlib/blas.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/csr.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/error.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/evaluate.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/fkvkselect.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/fs.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/getopt.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/graph.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/htable.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/io.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/itemsets.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/mcore.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/memory.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/omp.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/pdb.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/pqueue.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/random.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/rw.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/seq.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/sort.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/string.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/test/fis.c | 2 +- .../SuiteSparse_metis/GKlib/test/gkgraph.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/test/gksort.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/test/rw.c | 2 +- .../SuiteSparse_metis/GKlib/test/strings.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/timers.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/tokenizer.c | 2 +- CHOLMOD/SuiteSparse_metis/GKlib/util.c | 2 +- CHOLMOD/SuiteSparse_metis/libmetis/metislib.h | 16 +++++----- CHOLMOD/SuiteSparse_metis/programs/metisbin.h | 4 +-- 32 files changed, 55 insertions(+), 55 deletions(-) diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/GKlib.h b/CHOLMOD/SuiteSparse_metis/GKlib/GKlib.h index 49c584e3d6..430589b637 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/GKlib.h +++ b/CHOLMOD/SuiteSparse_metis/GKlib/GKlib.h @@ -98,22 +98,22 @@ -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include +#include "gk_types.h" +#include "gk_struct.h" +#include "gk_externs.h" +#include "gk_defs.h" +#include "gk_macros.h" +#include "gk_getopt.h" + +#include "gk_mksort.h" +#include "gk_mkblas.h" +#include "gk_mkmemory.h" +#include "gk_mkpqueue.h" +#include "gk_mkpqueue2.h" +#include "gk_mkrandom.h" +#include "gk_mkutils.h" + +#include "gk_proto.h" #endif /* GKlib.h */ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/blas.c b/CHOLMOD/SuiteSparse_metis/GKlib/blas.c index b65cd02648..04e5006bf8 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/blas.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/blas.c @@ -15,7 +15,7 @@ which is used for code generation. \version\verbatim $Id: blas.c 11848 2012-04-20 13:47:37Z karypis $ \endverbatim */ -#include +#include "GKlib.h" diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/csr.c b/CHOLMOD/SuiteSparse_metis/GKlib/csr.c index a19d793bdc..c8f2592fd9 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/csr.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/csr.c @@ -7,7 +7,7 @@ * \version\verbatim $Id: csr.c 13437 2013-01-11 21:54:10Z karypis $ \endverbatim */ -#include +#include "GKlib.h" #define OMPMINOPS 50000 diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/error.c b/CHOLMOD/SuiteSparse_metis/GKlib/error.c index f658b6d0f0..83738c433c 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/error.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/error.c @@ -13,7 +13,7 @@ This file contains functions dealing with error reporting and termination #define _GK_ERROR_C_ /* this is needed to properly declare the gk_jub* variables as an extern function in GKlib.h */ -#include +#include "GKlib.h" /* These are the jmp_buf for the graceful exit in case of severe errors. diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/evaluate.c b/CHOLMOD/SuiteSparse_metis/GKlib/evaluate.c index ce805ced9e..f0be5b4e07 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/evaluate.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/evaluate.c @@ -7,7 +7,7 @@ \version\verbatim $Id: evaluate.c 13328 2012-12-31 14:57:40Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /********************************************************************** * This function computes the max accuracy score of a ranked list, diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/fkvkselect.c b/CHOLMOD/SuiteSparse_metis/GKlib/fkvkselect.c index b1238ce653..a2cbac406c 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/fkvkselect.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/fkvkselect.c @@ -8,7 +8,7 @@ */ -#include +#include "GKlib.h" /* Byte-wise swap two items of size SIZE. */ #define QSSWAP(a, b, stmp) do { stmp = (a); (a) = (b); (b) = stmp; } while (0) diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/fs.c b/CHOLMOD/SuiteSparse_metis/GKlib/fs.c index 35e4b97b29..707f309771 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/fs.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/fs.c @@ -11,7 +11,7 @@ the filesystem in a portable way. */ -#include +#include "GKlib.h" diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/getopt.c b/CHOLMOD/SuiteSparse_metis/GKlib/getopt.c index 437befc867..b0941513da 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/getopt.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/getopt.c @@ -34,7 +34,7 @@ So, do read the documentation here. /*************************************************************************/ -#include +#include "GKlib.h" /*************************************************************************/ /* Local function prototypes */ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/graph.c b/CHOLMOD/SuiteSparse_metis/GKlib/graph.c index 209581865e..d0b0f6d6dc 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/graph.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/graph.c @@ -7,7 +7,7 @@ * \version\verbatim $Id: graph.c 13328 2012-12-31 14:57:40Z karypis $ \endverbatim */ -#include +#include "GKlib.h" #define OMPMINOPS 50000 diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/htable.c b/CHOLMOD/SuiteSparse_metis/GKlib/htable.c index 078e11434d..666708fc61 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/htable.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/htable.c @@ -8,7 +8,7 @@ * */ -#include +#include "GKlib.h" /****************************************************************************** * This function creates the hash-table diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/io.c b/CHOLMOD/SuiteSparse_metis/GKlib/io.c index caaedcb59c..8fb67412a3 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/io.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/io.c @@ -16,7 +16,7 @@ This file contains various functions that perform I/O. #undef _GNU_SOURCE #endif -#include +#include "GKlib.h" /************************************************************************* * This function opens a file diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/itemsets.c b/CHOLMOD/SuiteSparse_metis/GKlib/itemsets.c index 65b5af40d0..d83f4e0ebc 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/itemsets.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/itemsets.c @@ -10,7 +10,7 @@ * \version\verbatim $Id: itemsets.c 11075 2011-11-11 22:31:52Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*-------------------------------------------------------------*/ /*! Data structures for use within this module */ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/mcore.c b/CHOLMOD/SuiteSparse_metis/GKlib/mcore.c index 6442e03a9a..d76e4b1d52 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/mcore.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/mcore.c @@ -8,7 +8,7 @@ \version $Id: mcore.c 13953 2013-03-30 16:20:07Z karypis $ */ -#include +#include "GKlib.h" /*************************************************************************/ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/memory.c b/CHOLMOD/SuiteSparse_metis/GKlib/memory.c index fbc38e7b88..9f9b8d16a8 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/memory.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/memory.c @@ -13,7 +13,7 @@ can be used to define other memory allocation routines. */ -#include +#include "GKlib.h" /* This is for the global mcore that tracks all heap allocations */ static __thread gk_mcore_t *gkmcore = NULL; diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/omp.c b/CHOLMOD/SuiteSparse_metis/GKlib/omp.c index bdd543acf4..afee639823 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/omp.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/omp.c @@ -7,7 +7,7 @@ * */ -#include +#include "GKlib.h" #ifdef GK_NOOPENMP /* remove those for now */ #if !defined(_OPENMP) diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/pdb.c b/CHOLMOD/SuiteSparse_metis/GKlib/pdb.c index b4d222653e..319a7622c4 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/pdb.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/pdb.c @@ -10,7 +10,7 @@ Pdb reader (parser). Loads arrays of pointers for easy backbone access. \version $Id: pdb.c 10711 2011-08-31 22:23:04Z karypis $ */ /************************************************************************/ -#include +#include "GKlib.h" /************************************************************************/ /*! \brief Converts three-letter amino acid codes to one-leter codes. diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/pqueue.c b/CHOLMOD/SuiteSparse_metis/GKlib/pqueue.c index 2fb8515d21..5d3bcb193b 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/pqueue.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/pqueue.c @@ -9,7 +9,7 @@ The priority queues are generated using the GK_MKPQUEUE macro. \version\verbatim $Id: pqueue.c 10711 2011-08-31 22:23:04Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*************************************************************************/ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/random.c b/CHOLMOD/SuiteSparse_metis/GKlib/random.c index fd89a0ca97..796023c8e2 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/random.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/random.c @@ -8,7 +8,7 @@ \version\verbatim $Id: random.c 11793 2012-04-04 21:03:02Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*************************************************************************/ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/rw.c b/CHOLMOD/SuiteSparse_metis/GKlib/rw.c index 7cd4391a04..ab008e515d 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/rw.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/rw.c @@ -8,7 +8,7 @@ * \version\verbatim $Id: rw.c 11078 2011-11-12 00:20:44Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*************************************************************************/ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/seq.c b/CHOLMOD/SuiteSparse_metis/GKlib/seq.c index f267a3ea02..97ee2d43a3 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/seq.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/seq.c @@ -8,7 +8,7 @@ */ -#include +#include "GKlib.h" diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/sort.c b/CHOLMOD/SuiteSparse_metis/GKlib/sort.c index bde30f5a59..a822a7ca48 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/sort.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/sort.c @@ -13,7 +13,7 @@ these routines where defined. \version\verbatim $Id: sort.c 10796 2011-09-23 21:33:09Z karypis $ \endverbatim */ -#include +#include "GKlib.h" diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/string.c b/CHOLMOD/SuiteSparse_metis/GKlib/string.c index 5d28452ba8..83f0c2188e 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/string.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/string.c @@ -13,7 +13,7 @@ of standard functions (but with enhanced functionality). */ /************************************************************************/ -#include +#include "GKlib.h" diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/test/fis.c b/CHOLMOD/SuiteSparse_metis/GKlib/test/fis.c index 084a4b6a1f..387d6fcc9b 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/test/fis.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/test/fis.c @@ -7,7 +7,7 @@ \version \verbatim $Id: fis.c 11075 2011-11-11 22:31:52Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*************************************************************************/ /*! Data structures for the code */ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/test/gkgraph.c b/CHOLMOD/SuiteSparse_metis/GKlib/test/gkgraph.c index 233620d9b9..b5e678b487 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/test/gkgraph.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/test/gkgraph.c @@ -7,7 +7,7 @@ \version \verbatim $Id: gkgraph.c 11408 2012-01-25 15:05:58Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*************************************************************************/ /*! Data structures for the code */ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/test/gksort.c b/CHOLMOD/SuiteSparse_metis/GKlib/test/gksort.c index 65438368f3..0ec38b7647 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/test/gksort.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/test/gksort.c @@ -7,7 +7,7 @@ \version\verbatim $Id: gksort.c 11058 2011-11-10 00:02:50Z karypis $ \endverbatim */ -#include +#include "GKlib.h" #define N 10000 diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/test/rw.c b/CHOLMOD/SuiteSparse_metis/GKlib/test/rw.c index e338f89ddd..8d446e59bd 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/test/rw.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/test/rw.c @@ -7,7 +7,7 @@ \version \verbatim $Id: rw.c 11387 2012-01-21 23:36:23Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*************************************************************************/ /*! Data structures for the code */ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/test/strings.c b/CHOLMOD/SuiteSparse_metis/GKlib/test/strings.c index b241d3ff02..369d2a6c19 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/test/strings.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/test/strings.c @@ -7,7 +7,7 @@ \version\verbatim $Id: strings.c 10711 2011-08-31 22:23:04Z karypis $ \endverbatim */ -#include +#include "GKlib.h" /*************************************************************************/ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/timers.c b/CHOLMOD/SuiteSparse_metis/GKlib/timers.c index bb8f29620a..aeef65faba 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/timers.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/timers.c @@ -8,7 +8,7 @@ */ -#include +#include "GKlib.h" diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/tokenizer.c b/CHOLMOD/SuiteSparse_metis/GKlib/tokenizer.c index 5efd262db9..2850378bf7 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/tokenizer.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/tokenizer.c @@ -12,7 +12,7 @@ split function. */ -#include +#include "GKlib.h" /************************************************************************ diff --git a/CHOLMOD/SuiteSparse_metis/GKlib/util.c b/CHOLMOD/SuiteSparse_metis/GKlib/util.c index e75d68b51b..ae770756ee 100644 --- a/CHOLMOD/SuiteSparse_metis/GKlib/util.c +++ b/CHOLMOD/SuiteSparse_metis/GKlib/util.c @@ -8,7 +8,7 @@ */ -#include +#include "GKlib.h" diff --git a/CHOLMOD/SuiteSparse_metis/libmetis/metislib.h b/CHOLMOD/SuiteSparse_metis/libmetis/metislib.h index 93d48f0113..385c405b58 100644 --- a/CHOLMOD/SuiteSparse_metis/libmetis/metislib.h +++ b/CHOLMOD/SuiteSparse_metis/libmetis/metislib.h @@ -14,21 +14,21 @@ #ifndef _LIBMETIS_METISLIB_H_ #define _LIBMETIS_METISLIB_H_ -#include +#include "GKlib.h" #if defined(ENABLE_OPENMP) #include #endif -#include -#include -#include +#include "metis.h" +#include "rename.h" +#include "gklib_defs.h" -#include -#include -#include -#include +#include "defs.h" +#include "struct.h" +#include "macros.h" +#include "proto.h" #if defined(COMPILER_MSC) diff --git a/CHOLMOD/SuiteSparse_metis/programs/metisbin.h b/CHOLMOD/SuiteSparse_metis/programs/metisbin.h index 330b0f4eb0..8b2511ea0a 100644 --- a/CHOLMOD/SuiteSparse_metis/programs/metisbin.h +++ b/CHOLMOD/SuiteSparse_metis/programs/metisbin.h @@ -7,7 +7,7 @@ * George */ -#include +#include "GKlib.h" #include #include #include @@ -27,7 +27,7 @@ #endif -#include +#include "metis.h" #include "../libmetis/rename.h" #include "../libmetis/gklib_defs.h" #include "../libmetis/defs.h"