Skip to content

Commit 734b56b

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
authored
Merge pull request #544 from DrTimothyAldenDavis/dev
nvToolsExt -> nvtx3, and use size_t in GPUQREngine in 2 new(size_t,..) operators
2 parents d6ab220 + f38d677 commit 734b56b

File tree

14 files changed

+334
-2324
lines changed

14 files changed

+334
-2324
lines changed

‎CHOLMOD/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,13 +504,13 @@ if ( SUITESPARSE_CUDA )
504504
endif ( )
505505
if ( BUILD_SHARED_LIBS )
506506
target_link_libraries ( CHOLMOD PRIVATE CUDA::nvrtc CUDA::cudart_static
507-
CUDA::nvToolsExt CUDA::cublas )
507+
CUDA::nvtx3 CUDA::cublas )
508508
target_include_directories ( CHOLMOD INTERFACE
509509
$<TARGET_PROPERTY:CUDA::cublas,INTERFACE_INCLUDE_DIRECTORIES> )
510510
endif ( )
511511
if ( BUILD_STATIC_LIBS )
512512
target_link_libraries ( CHOLMOD_static PUBLIC CUDA::nvrtc CUDA::cudart_static
513-
CUDA::nvToolsExt CUDA::cublas )
513+
CUDA::nvtx3 CUDA::cublas )
514514
endif ( )
515515

516516
set ( old_CMAKE_EXTRA_INCLUDE_FILES CMAKE_EXTRA_INCLUDE_FILES )
@@ -804,7 +804,7 @@ add_test ( NAME CHOLMOD_int64_single_supernodal
804804
if ( WIN32 AND BUILD_SHARED_LIBS )
805805
# Set PATH to pick up the necessary libraries for all tests
806806

807-
set ( CHOLMOD_CTEST_NAMES
807+
set ( CHOLMOD_CTEST_NAMES
808808
CHOLMOD_int32_double_bcsstk01 CHOLMOD_int64_double_bcsstk01 CHOLMOD_int32_single_bcsstk01 CHOLMOD_int64_single_bcsstk01
809809
CHOLMOD_int32_double_lp_afiro CHOLMOD_int64_double_lp_afiro CHOLMOD_int32_single_lp_afiro CHOLMOD_int64_single_lp_afiro
810810
CHOLMOD_int32_double_can24 CHOLMOD_int64_double_can24 CHOLMOD_int32_single_can24 CHOLMOD_int64_single_can24

‎CHOLMOD/GPU/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ endif ( )
9090

9191
if ( BUILD_SHARED_LIBS )
9292
target_link_libraries ( CHOLMOD_CUDA PRIVATE CUDA::nvrtc CUDA::cudart_static
93-
CUDA::nvToolsExt CUDA::cublas )
93+
CUDA::nvtx3 CUDA::cublas )
9494
endif ( )
9595
if ( BUILD_STATIC_LIBS )
9696
target_link_libraries ( CHOLMOD_CUDA_static PUBLIC CUDA::nvrtc CUDA::cudart_static
97-
CUDA::nvToolsExt CUDA::cublas )
97+
CUDA::nvtx3 CUDA::cublas )
9898
endif ( )
9999

100100
#-------------------------------------------------------------------------------

‎GraphBLAS/Demo/Output/gauss_demo.out‎

Lines changed: 65 additions & 160 deletions
Large diffs are not rendered by default.

‎GraphBLAS/Demo/Output/gauss_demo1.out‎

Lines changed: 0 additions & 1895 deletions
This file was deleted.

‎GraphBLAS/Demo/Output/import_demo.out‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
========================= import_test: format 0
55

66
67x67 GraphBLAS double matrix, sparse by row
7-
C to export, 294 entries, memory: 5.3 KB
7+
C to export, 294 entries, memory: 9.2 KB
88

99
(0,7) -0.834182
1010
(0,12) 1.26582
@@ -40,7 +40,7 @@
4040
========================= import_test: format 1
4141

4242
67x67 GraphBLAS double matrix, sparse by row
43-
C to export, 294 entries, memory: 5.3 KB
43+
C to export, 294 entries, memory: 9.2 KB
4444

4545
(0,7) -0.834182
4646
(0,12) 1.26582
@@ -76,7 +76,7 @@
7676
========================= import_test: format 2
7777

7878
67x67 GraphBLAS double matrix, sparse by row
79-
C to export, 294 entries, memory: 5.3 KB
79+
C to export, 294 entries, memory: 9.2 KB
8080

8181
(0,7) -0.834182
8282
(0,12) 1.26582
@@ -112,7 +112,7 @@
112112
========================= import_test: format 3
113113

114114
67x67 GraphBLAS double matrix, sparse by row
115-
C to export, 294 entries, memory: 5.3 KB
115+
C to export, 294 entries, memory: 9.2 KB
116116

117117
(0,7) -0.834182
118118
(0,12) 1.26582
@@ -150,7 +150,7 @@
150150
========================= import_test: format 0
151151

152152
67x67 GraphBLAS double matrix, sparse by col
153-
C to export, 294 entries, memory: 5.3 KB
153+
C to export, 294 entries, memory: 9.2 KB
154154

155155
(4,0) -0.278842
156156
(5,0) -0.268019
@@ -186,7 +186,7 @@
186186
========================= import_test: format 1
187187

188188
67x67 GraphBLAS double matrix, sparse by col
189-
C to export, 294 entries, memory: 5.3 KB
189+
C to export, 294 entries, memory: 9.2 KB
190190

191191
(4,0) -0.278842
192192
(5,0) -0.268019
@@ -222,7 +222,7 @@
222222
========================= import_test: format 2
223223

224224
67x67 GraphBLAS double matrix, sparse by col
225-
C to export, 294 entries, memory: 5.3 KB
225+
C to export, 294 entries, memory: 9.2 KB
226226

227227
(4,0) -0.278842
228228
(5,0) -0.268019
@@ -258,7 +258,7 @@
258258
========================= import_test: format 3
259259

260260
67x67 GraphBLAS double matrix, sparse by col
261-
C to export, 294 entries, memory: 5.3 KB
261+
C to export, 294 entries, memory: 9.2 KB
262262

263263
(4,0) -0.278842
264264
(5,0) -0.268019
@@ -296,7 +296,7 @@
296296
========================= import_test: format 0
297297

298298
67x67 GraphBLAS double matrix, hypersparse by row
299-
C to export, 294 entries, memory: 5.9 KB
299+
C to export, 294 entries, memory: 10.2 KB
300300

301301
(0,7) -0.834182
302302
(0,12) 1.26582
@@ -332,7 +332,7 @@
332332
========================= import_test: format 1
333333

334334
67x67 GraphBLAS double matrix, hypersparse by row
335-
C to export, 294 entries, memory: 5.9 KB
335+
C to export, 294 entries, memory: 10.2 KB
336336

337337
(0,7) -0.834182
338338
(0,12) 1.26582
@@ -368,7 +368,7 @@
368368
========================= import_test: format 2
369369

370370
67x67 GraphBLAS double matrix, hypersparse by row
371-
C to export, 294 entries, memory: 5.9 KB
371+
C to export, 294 entries, memory: 10.2 KB
372372

373373
(0,7) -0.834182
374374
(0,12) 1.26582
@@ -404,7 +404,7 @@
404404
========================= import_test: format 3
405405

406406
67x67 GraphBLAS double matrix, hypersparse by row
407-
C to export, 294 entries, memory: 5.9 KB
407+
C to export, 294 entries, memory: 10.2 KB
408408

409409
(0,7) -0.834182
410410
(0,12) 1.26582
@@ -442,7 +442,7 @@
442442
========================= import_test: format 0
443443

444444
67x67 GraphBLAS double matrix, hypersparse by col
445-
C to export, 294 entries, memory: 5.9 KB
445+
C to export, 294 entries, memory: 10.2 KB
446446

447447
(4,0) -0.278842
448448
(5,0) -0.268019
@@ -478,7 +478,7 @@
478478
========================= import_test: format 1
479479

480480
67x67 GraphBLAS double matrix, hypersparse by col
481-
C to export, 294 entries, memory: 5.9 KB
481+
C to export, 294 entries, memory: 10.2 KB
482482

483483
(4,0) -0.278842
484484
(5,0) -0.268019
@@ -514,7 +514,7 @@
514514
========================= import_test: format 2
515515

516516
67x67 GraphBLAS double matrix, hypersparse by col
517-
C to export, 294 entries, memory: 5.9 KB
517+
C to export, 294 entries, memory: 10.2 KB
518518

519519
(4,0) -0.278842
520520
(5,0) -0.268019
@@ -550,7 +550,7 @@
550550
========================= import_test: format 3
551551

552552
67x67 GraphBLAS double matrix, hypersparse by col
553-
C to export, 294 entries, memory: 5.9 KB
553+
C to export, 294 entries, memory: 10.2 KB
554554

555555
(4,0) -0.278842
556556
(5,0) -0.268019

0 commit comments

Comments
 (0)