diff --git a/LAGraph/Acknowledgments.txt b/LAGraph/Acknowledgments.txt index ecb4359f8..815f4e01f 100644 --- a/LAGraph/Acknowledgments.txt +++ b/LAGraph/Acknowledgments.txt @@ -16,7 +16,7 @@ THIS WORK IS FUNDED IN PART BY: THIS WORK BUILDS UPON THE FOLLOWING PRIOR WORKS: 1. SuiteSparse:GraphBLAS, (http://faculty.cse.tamu.edu/davis/GraphBLAS.html) - Copyright 2017-2022 Timothy A. Davis (Author), AldenMath.com. + Copyright 2017-2023 Timothy A. Davis (Author), AldenMath.com. By Tim Davis, Texas A&M University. Note that while SuiteSparse:GraphBLAS is itself under the Apache 2 license, any contributions derived from SuiteSparse:GraphBLAS and incorporated by the Author into LAGraph are diff --git a/LAGraph/config/LAGraph.pc.in b/LAGraph/config/LAGraph.pc.in index 3e57a6b38..4ca18e254 100644 --- a/LAGraph/config/LAGraph.pc.in +++ b/LAGraph/config/LAGraph.pc.in @@ -1,5 +1,4 @@ -# LAGraph, Copyright (c) 2019-2023, Timothy A. Davis. -# All Rights Reserved. +# LAGraph, Copyright (c) 2019-2023, LAGraph Contributors. All Rights Reserved. # SPDX-License-Identifier: BSD-2-Clause prefix=@prefix@ diff --git a/LAGraph/config/LAGraphConfig.cmake.in b/LAGraph/config/LAGraphConfig.cmake.in index 97bfd6ed7..b40409918 100644 --- a/LAGraph/config/LAGraphConfig.cmake.in +++ b/LAGraph/config/LAGraphConfig.cmake.in @@ -4,7 +4,8 @@ # The following copyright and license applies to just this file only, not to # the library itself: -# LAGraphConfig.cmake, Copyright (c) 2023, Timothy A. Davis. All Rights Reserved. +# LAGraphConfig.cmake, Copyright (c) 2019-2023, LAGraph Contributors. All +# Rights Reserved. # SPDX-License-Identifier: BSD-3-clause #------------------------------------------------------------------------------- diff --git a/LAGraph/src/test/test_Xinit.c b/LAGraph/src/test/test_Xinit.c index 9981e0d70..a968cdd8c 100644 --- a/LAGraph/src/test/test_Xinit.c +++ b/LAGraph/src/test/test_Xinit.c @@ -17,7 +17,10 @@ #include "LAGraph_test.h" #include "LAGraphX.h" -#include "LG_init.h" + +// functions defined in LAGr_Init.c: +LAGRAPH_PUBLIC void LG_set_LAGr_Init_has_been_called (bool setting) ; +LAGRAPH_PUBLIC bool LG_get_LAGr_Init_has_been_called (void) ; //------------------------------------------------------------------------------ // global variables diff --git a/LAGraph/src/utility/LAGr_Init.c b/LAGraph/src/utility/LAGr_Init.c index 7fdfde8c2..31f3e449a 100644 --- a/LAGraph/src/utility/LAGr_Init.c +++ b/LAGraph/src/utility/LAGr_Init.c @@ -31,10 +31,12 @@ static bool LG_LAGr_Init_has_been_called = false ; -// LG_LAGr_Init_has_been_called is only modified or accessed by these two -// routines (even in this file): +// LG_LAGr_Init_has_been_called is only modified or accessed by the following +// two routines (even in this file). The two functions are made accessible via +// LAGRAPH_PUBLIC, only for testing purposes by src/test/test_Xinit.c. -#include "LG_init.h" +LAGRAPH_PUBLIC void LG_set_LAGr_Init_has_been_called (bool setting) ; +LAGRAPH_PUBLIC bool LG_get_LAGr_Init_has_been_called (void) ; LAGRAPH_PUBLIC void LG_set_LAGr_Init_has_been_called (bool setting) diff --git a/LAGraph/src/utility/LG_init.h b/LAGraph/src/utility/LG_init.h deleted file mode 100644 index 73ac9ff8a..000000000 --- a/LAGraph/src/utility/LG_init.h +++ /dev/null @@ -1,32 +0,0 @@ -//------------------------------------------------------------------------------ -// LG_init.h: include file for use within LAGraph itself -//------------------------------------------------------------------------------ - -// LAGraph, (c) 2019-2023 by The LAGraph Contributors, All Rights Reserved. -// SPDX-License-Identifier: BSD-2-Clause -// -// For additional details (including references to third party source code and -// other files) see the LICENSE file or contact permission@sei.cmu.edu. See -// Contributors.txt for a full list of contributors. Created, in part, with -// funding and support from the U.S. Government (see Acknowledgments.txt file). -// DM22-0790 - -// Contributed by Timothy A. Davis, Texas A&M University - -//------------------------------------------------------------------------------ - -// These definitions are not meant for the user application that relies on -// LAGraph and/or GraphBLAS. LG_* methods are for internal use in LAGraph. - -#ifndef LG_INIT_H -#define LG_INIT_H - -//------------------------------------------------------------------------------ -// definitions used in LAGr_Init.c and for testing -//------------------------------------------------------------------------------ - -LAGRAPH_PUBLIC void LG_set_LAGr_Init_has_been_called (bool setting) ; -LAGRAPH_PUBLIC bool LG_get_LAGr_Init_has_been_called (void) ; - -#endif -