Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

METIS: do not use angle brackets for non-system #include files #631

Merged
merged 2 commits into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHOLMOD/MATLAB/cholmod2.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void mexFunction
char str [LEN] ;
str [0] = '\0' ;
mxGetString (pargin [nargin-1], str, LEN) ;
if (str [0] == 's') ;
if (str [0] == 's')
{
dtype = CHOLMOD_SINGLE ;
mxdtype = mxSINGLE_CLASS ;
Expand Down
32 changes: 16 additions & 16 deletions CHOLMOD/SuiteSparse_metis/GKlib/GKlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,22 @@



#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>
#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 */
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/blas.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <GKlib.h>
#include "GKlib.h"



Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/csr.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* \version\verbatim $Id: csr.c 13437 2013-01-11 21:54:10Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

#define OMPMINOPS 50000

Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/error.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <GKlib.h>
#include "GKlib.h"


/* These are the jmp_buf for the graceful exit in case of severe errors.
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/evaluate.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
\version\verbatim $Id: evaluate.c 13328 2012-12-31 14:57:40Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

/**********************************************************************
* This function computes the max accuracy score of a ranked list,
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/fkvkselect.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/


#include <GKlib.h>
#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)
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ the filesystem in a portable way.
*/


#include <GKlib.h>
#include "GKlib.h"



Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/getopt.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ So, do read the documentation here.
/*************************************************************************/


#include <GKlib.h>
#include "GKlib.h"

/*************************************************************************/
/* Local function prototypes */
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/graph.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* \version\verbatim $Id: graph.c 13328 2012-12-31 14:57:40Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

#define OMPMINOPS 50000

Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/htable.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*/

#include <GKlib.h>
#include "GKlib.h"

/******************************************************************************
* This function creates the hash-table
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This file contains various functions that perform I/O.
#undef _GNU_SOURCE
#endif

#include <GKlib.h>
#include "GKlib.h"

/*************************************************************************
* This function opens a file
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/itemsets.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* \version\verbatim $Id: itemsets.c 11075 2011-11-11 22:31:52Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

/*-------------------------------------------------------------*/
/*! Data structures for use within this module */
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/mcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\version $Id: mcore.c 13953 2013-03-30 16:20:07Z karypis $
*/

#include <GKlib.h>
#include "GKlib.h"


/*************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ can be used to define other memory allocation routines.
*/


#include <GKlib.h>
#include "GKlib.h"

/* This is for the global mcore that tracks all heap allocations */
static __thread gk_mcore_t *gkmcore = NULL;
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/omp.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
*/

#include <GKlib.h>
#include "GKlib.h"

#ifdef GK_NOOPENMP /* remove those for now */
#if !defined(_OPENMP)
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/pdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <GKlib.h>
#include "GKlib.h"

/************************************************************************/
/*! \brief Converts three-letter amino acid codes to one-leter codes.
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/pqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <GKlib.h>
#include "GKlib.h"


/*************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/random.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\version\verbatim $Id: random.c 11793 2012-04-04 21:03:02Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"


/*************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* \version\verbatim $Id: rw.c 11078 2011-11-12 00:20:44Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"


/*************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/seq.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/


#include <GKlib.h>
#include "GKlib.h"



Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/sort.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ these routines where defined.
\version\verbatim $Id: sort.c 10796 2011-09-23 21:33:09Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"



Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/string.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ of standard functions (but with enhanced functionality).
*/
/************************************************************************/

#include <GKlib.h>
#include "GKlib.h"



Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/test/fis.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
\version \verbatim $Id: fis.c 11075 2011-11-11 22:31:52Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

/*************************************************************************/
/*! Data structures for the code */
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/test/gkgraph.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
\version \verbatim $Id: gkgraph.c 11408 2012-01-25 15:05:58Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

/*************************************************************************/
/*! Data structures for the code */
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/test/gksort.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
\version\verbatim $Id: gksort.c 11058 2011-11-10 00:02:50Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

#define N 10000

Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/test/rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
\version \verbatim $Id: rw.c 11387 2012-01-21 23:36:23Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"

/*************************************************************************/
/*! Data structures for the code */
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/test/strings.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
\version\verbatim $Id: strings.c 10711 2011-08-31 22:23:04Z karypis $ \endverbatim
*/

#include <GKlib.h>
#include "GKlib.h"


/*************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/


#include <GKlib.h>
#include "GKlib.h"



Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/tokenizer.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ split function.
*/


#include <GKlib.h>
#include "GKlib.h"


/************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/SuiteSparse_metis/GKlib/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/


#include <GKlib.h>
#include "GKlib.h"



Expand Down
16 changes: 8 additions & 8 deletions CHOLMOD/SuiteSparse_metis/libmetis/metislib.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
#ifndef _LIBMETIS_METISLIB_H_
#define _LIBMETIS_METISLIB_H_

#include <GKlib.h>
#include "GKlib.h"

#if defined(ENABLE_OPENMP)
#include <omp.h>
#endif


#include <metis.h>
#include <rename.h>
#include <gklib_defs.h>
#include "metis.h"
#include "rename.h"
#include "gklib_defs.h"

#include <defs.h>
#include <struct.h>
#include <macros.h>
#include <proto.h>
#include "defs.h"
#include "struct.h"
#include "macros.h"
#include "proto.h"


#if defined(COMPILER_MSC)
Expand Down
4 changes: 2 additions & 2 deletions CHOLMOD/SuiteSparse_metis/programs/metisbin.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* George
*/

#include <GKlib.h>
#include "GKlib.h"
#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
Expand All @@ -27,7 +27,7 @@
#endif


#include <metis.h>
#include "metis.h"
#include "../libmetis/rename.h"
#include "../libmetis/gklib_defs.h"
#include "../libmetis/defs.h"
Expand Down