Skip to content

Commit be67143

Browse files
suvorovraingsvgit
authored andcommitted
refactor: remove lagraph from build system
1 parent b485b4f commit be67143

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

.gitmodules

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "vendor/GraphBLAS"]
22
path = vendor/GraphBLAS
3-
url = https://github.com/DrTimothyAldenDavis/GraphBLAS.git
4-
[submodule "vendor/LAGraph"]
5-
path = vendor/LAGraph
6-
url = https://github.com/GraphBLAS/LAGraph.git
3+
url = https://github.com/DrTimothyAldenDavis/GraphBLAS.git

Makefile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
LIBPATH := $(shell dirname "$(realpath "$(lastword $(MAKEFILE_LIST))")")
22
GRAPH_BLAS_PATH := $(LIBPATH)/vendor/GraphBLAS
3-
LAGRAPH_PATH := $(LIBPATH)/vendor/LAGraph
43
BUILD := $(GRAPH_BLAS_PATH)/build
5-
LAGRAPH_BUILD := $(LAGRAPH_PATH)/build
64
JOBS := $(shell nproc)
75

8-
build: graphblas lagraph src
6+
build: graphblas src
97
graphblas:
108
mkdir -p $(BUILD) && \
119
cd $(GRAPH_BLAS_PATH) &&\
@@ -14,20 +12,11 @@ graphblas:
1412
-G Ninja -B build
1513
cmake --build $(BUILD) --parallel $(JOBS)
1614

17-
lagraph:
18-
mkdir -p $(LAGRAPH_BUILD) && \
19-
cd $(LAGRAPH_PATH) && \
20-
cmake -DGraphBLAS_DIR=$(BUILD) \
21-
-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
22-
-DCMAKE_BUILD_TYPE=Release \
23-
-G Ninja -B build
24-
cmake --build $(LAGRAPH_BUILD) --parallel $(JOBS)
25-
2615
clean:
27-
rm -rf $(BUILD)/* $(LAGRAPH_BUILD)/* ./build
16+
rm -rf $(BUILD)/* ./build
2817
src:
2918
mkdir -p build
30-
gcc src/main.c -I./vendor/GraphBLAS/Include -I./vendor/LAGraph/include -L./vendor/LAGraph/build/src -L./vendor/GraphBLAS/build -llagraph -lgraphblas -lm -o build/main
19+
gcc src/main.c -I./vendor/GraphBLAS/Include -L./vendor/GraphBLAS/build -lgraphblas -lm -o build/main
3120

3221
.PHONY: all build lagraph clean src
3322

src/main.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include <stdio.h>
22
#include <stdint.h>
33
#include "../vendor/GraphBLAS/Include/GraphBLAS.h"
4-
#include "../vendor/LAGraph/include/LAGraph.h"
5-
#include "../vendor/LAGraph/include/LAGraphX.h"
64

75
#define TRY(method) \
86
{ \
@@ -17,7 +15,6 @@
1715
}
1816

1917
#define VERTICES_NUMBER 12
20-
char msg[LAGRAPH_MSG_LEN];
2118

2219
typedef enum
2320
{
@@ -496,5 +493,5 @@ int main()
496493
GrB_free(&user);
497494
GrB_free(&card);
498495
GrB_free(&tx_edge);
499-
LAGraph_Finalize(msg);
496+
GrB_finalize();
500497
}

0 commit comments

Comments
 (0)