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.

Sign up for GitHub

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

Jump to bottom

V1.1 branch #243

Merged
merged 43 commits into from
Dec 30, 2023
Merged

V1.1 branch #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
58d229e
LAGraph v1.1.0: changes required for SuiteSparse integration
DrTimothyAldenDavis Nov 29, 2023
575c387
LAGraph v1.1: allow it to use GraphBLAS v7.1.0 or later
DrTimothyAldenDavis Nov 29, 2023
852485f
ditto
DrTimothyAldenDavis Nov 29, 2023
3d8fb25
remove /usr/local/include
DrTimothyAldenDavis Nov 29, 2023
2a760e6
comments
DrTimothyAldenDavis Nov 29, 2023
049205a
change name of project from "lagraph" to "LAGraph"
DrTimothyAldenDavis Nov 29, 2023
37823e3
GraphBLAS version: check in LAGraph.h, not find_package
DrTimothyAldenDavis Nov 30, 2023
f5eade2
add manual workflow trigger
DrTimothyAldenDavis Nov 30, 2023
4a73cba
include files for C++
DrTimothyAldenDavis Nov 30, 2023
72c9c39
fix some issues with other versions of GraphBLAS (vanilla case)
DrTimothyAldenDavis Nov 30, 2023
01f7a58
sync
DrTimothyAldenDavis Dec 5, 2023
482897a
creating GraphBLAS:: target for older GraphBLAS
DrTimothyAldenDavis Dec 5, 2023
1f11d73
workaround for GraphBLAS 8.2.x
DrTimothyAldenDavis Dec 5, 2023
8d0a627
sync
DrTimothyAldenDavis Dec 5, 2023
de51a91
sync again
DrTimothyAldenDavis Dec 5, 2023
a92165c
full test coverage
DrTimothyAldenDavis Dec 5, 2023
e0ca734
make LG_init_has_been_called a static value
DrTimothyAldenDavis Dec 6, 2023
d5c547a
replace LAGr_Reset with LG_get/set
DrTimothyAldenDavis Dec 6, 2023
b177d27
sync
DrTimothyAldenDavis Dec 6, 2023
a667148
only add /Include workaround if the directory exists
DrTimothyAldenDavis Dec 6, 2023
a81ffa5
diagnostics in FindGraphBLAS.cmake
DrTimothyAldenDavis Dec 6, 2023
199e050
turn of LAGRAPH_DUMP
DrTimothyAldenDavis Dec 6, 2023
c23fa85
more FindGraphBLAS
DrTimothyAldenDavis Dec 6, 2023
d12f65e
FindGraphBLAS: for module case, no default path (to avoid stumbling i…
DrTimothyAldenDavis Dec 6, 2023
6a797b9
readme for LAGraph/src/benchmark
DrTimothyAldenDavis Dec 8, 2023
17ef14c
revise *.pc, handle "undef I"
DrTimothyAldenDavis Dec 9, 2023
55ad380
updates to build system
DrTimothyAldenDavis Dec 9, 2023
f7a2d5d
Update config/LAGraph.pc.in
DrTimothyAldenDavis Dec 12, 2023
edcdfe1
Dec 13 LAGraph meeting: fix copyright, remove LG_init.h
DrTimothyAldenDavis Dec 13, 2023
a5d2eea
set RPATH for compiled binaries
DrTimothyAldenDavis Dec 13, 2023
221146e
cleanup comments
DrTimothyAldenDavis Dec 13, 2023
15a49b3
sync with SuiteSparse 7.4.0
DrTimothyAldenDavis Dec 20, 2023
ac7f239
fix local_install
DrTimothyAldenDavis Dec 20, 2023
210fc10
consistent use of _USE_ and _HAS_ variables
DrTimothyAldenDavis Dec 22, 2023
283f27f
Merge branch 'v1.1_branch' of https://github.com/GraphBLAS/LAGraph in…
DrTimothyAldenDavis Dec 22, 2023
54e4c96
typo in SuiteSparsePolicy.cmake
DrTimothyAldenDavis Dec 22, 2023
1041a57
SUITESPARSE_USE_STRICT
DrTimothyAldenDavis Dec 22, 2023
deeb691
SUITESPARSE_USE_OPENMP option moved to SuiteSparsePolicy.cmake
DrTimothyAldenDavis Dec 22, 2023
4284b1b
policy
DrTimothyAldenDavis Dec 23, 2023
c7653aa
openmp policy
DrTimothyAldenDavis Dec 24, 2023
6997192
report openmp
DrTimothyAldenDavis Dec 24, 2023
c636bc0
remove "set ( CMAKE_MACOSX_RPATH TRUE )" from all cmake scripts
DrTimothyAldenDavis Dec 25, 2023
3f0cf78
cmake reports
DrTimothyAldenDavis Dec 29, 2023
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
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: LAGraph CI

on: [push, pull_request]
on:
workflow_dispatch:
push:
branches-ignore:
- '**/*dev2'
michelp marked this conversation as resolved.
Show resolved Hide resolved
pull_request:

jobs:
linux:
Expand Down
2 changes: 1 addition & 1 deletion Acknowledgments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading