Skip to content

Commit 5a94e7c

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
add SUITESPARSE_TIME
1 parent 038bca2 commit 5a94e7c

32 files changed

+128
-103
lines changed

‎CHOLMOD/Demo/cholmod_demo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define TRUE 1
2020
#define FALSE 0
2121

22-
#define CPUTIME (SuiteSparse_time ( ))
22+
#define CPUTIME SUITESPARSE_TIME
2323

2424
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
2525
#define MIN(a,b) (((a) < (b)) ? (a) : (b))

‎CHOLMOD/Demo/cholmod_di_simple.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ int main (void)
4141
}
4242
b = cholmod_ones (A->nrow, 1, A->xtype + dtype, &c) ; // b = ones(n,1)
4343

44-
double t1 = SuiteSparse_time ( ) ;
44+
double t1 = SUITESPARSE_TIME ;
4545
L = cholmod_analyze (A, &c) ; // analyze
46-
t1 = SuiteSparse_time ( ) - t1 ;
47-
double t2 = SuiteSparse_time ( ) ;
46+
t1 = SUITESPARSE_TIME - t1 ;
47+
double t2 = SUITESPARSE_TIME ;
4848
cholmod_factorize (A, L, &c) ; // factorize
49-
t2 = SuiteSparse_time ( ) - t2 ;
50-
double t3 = SuiteSparse_time ( ) ;
49+
t2 = SUITESPARSE_TIME - t2 ;
50+
double t3 = SUITESPARSE_TIME ;
5151
x = cholmod_solve (CHOLMOD_A, L, b, &c) ; // solve Ax=b
52-
t3 = SuiteSparse_time ( ) - t3 ;
52+
t3 = SUITESPARSE_TIME - t3 ;
5353
printf ("analyze time: %10.3f sec\n", t1) ;
5454
printf ("factorize time: %10.3f sec\n", t2) ;
5555
printf ("solve time: %10.3f sec\n", t3) ;

‎CHOLMOD/Demo/cholmod_dl_simple.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ int main (void)
4141
}
4242
b = cholmod_l_ones (A->nrow, 1, A->xtype + dtype, &c) ; // b = ones(n,1)
4343

44-
double t1 = SuiteSparse_time ( ) ;
44+
double t1 = SUITESPARSE_TIME ;
4545
L = cholmod_l_analyze (A, &c) ; // analyze
46-
t1 = SuiteSparse_time ( ) - t1 ;
47-
double t2 = SuiteSparse_time ( ) ;
46+
t1 = SUITESPARSE_TIME - t1 ;
47+
double t2 = SUITESPARSE_TIME ;
4848
cholmod_l_factorize (A, L, &c) ; // factorize
49-
t2 = SuiteSparse_time ( ) - t2 ;
50-
double t3 = SuiteSparse_time ( ) ;
49+
t2 = SUITESPARSE_TIME - t2 ;
50+
double t3 = SUITESPARSE_TIME ;
5151
x = cholmod_l_solve (CHOLMOD_A, L, b, &c) ; // solve Ax=b
52-
t3 = SuiteSparse_time ( ) - t3 ;
52+
t3 = SUITESPARSE_TIME - t3 ;
5353
printf ("analyze time: %10.3f sec\n", t1) ;
5454
printf ("factorize time: %10.3f sec\n", t2) ;
5555
printf ("solve time: %10.3f sec\n", t3) ;

‎CHOLMOD/Demo/cholmod_si_simple.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ int main (void)
4141
}
4242
b = cholmod_ones (A->nrow, 1, A->xtype + dtype, &c) ; // b = ones(n,1)
4343

44-
double t1 = SuiteSparse_time ( ) ;
44+
double t1 = SUITESPARSE_TIME ;
4545
L = cholmod_analyze (A, &c) ; // analyze
46-
t1 = SuiteSparse_time ( ) - t1 ;
47-
double t2 = SuiteSparse_time ( ) ;
46+
t1 = SUITESPARSE_TIME - t1 ;
47+
double t2 = SUITESPARSE_TIME ;
4848
cholmod_factorize (A, L, &c) ; // factorize
49-
t2 = SuiteSparse_time ( ) - t2 ;
50-
double t3 = SuiteSparse_time ( ) ;
49+
t2 = SUITESPARSE_TIME - t2 ;
50+
double t3 = SUITESPARSE_TIME ;
5151
x = cholmod_solve (CHOLMOD_A, L, b, &c) ; // solve Ax=b
52-
t3 = SuiteSparse_time ( ) - t3 ;
52+
t3 = SUITESPARSE_TIME - t3 ;
5353
printf ("analyze time: %10.3f sec\n", t1) ;
5454
printf ("factorize time: %10.3f sec\n", t2) ;
5555
printf ("solve time: %10.3f sec\n", t3) ;

‎CHOLMOD/Demo/cholmod_sl_simple.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ int main (void)
4141
}
4242
b = cholmod_l_ones (A->nrow, 1, A->xtype + dtype, &c) ; // b = ones(n,1)
4343

44-
double t1 = SuiteSparse_time ( ) ;
44+
double t1 = SUITESPARSE_TIME ;
4545
L = cholmod_l_analyze (A, &c) ; // analyze
46-
t1 = SuiteSparse_time ( ) - t1 ;
47-
double t2 = SuiteSparse_time ( ) ;
46+
t1 = SUITESPARSE_TIME - t1 ;
47+
double t2 = SUITESPARSE_TIME ;
4848
cholmod_l_factorize (A, L, &c) ; // factorize
49-
t2 = SuiteSparse_time ( ) - t2 ;
50-
double t3 = SuiteSparse_time ( ) ;
49+
t2 = SUITESPARSE_TIME - t2 ;
50+
double t3 = SUITESPARSE_TIME ;
5151
x = cholmod_l_solve (CHOLMOD_A, L, b, &c) ; // solve Ax=b
52-
t3 = SuiteSparse_time ( ) - t3 ;
52+
t3 = SUITESPARSE_TIME - t3 ;
5353
printf ("analyze time: %10.3f sec\n", t1) ;
5454
printf ("factorize time: %10.3f sec\n", t2) ;
5555
printf ("solve time: %10.3f sec\n", t3) ;

‎CHOLMOD/GPU/cholmod_gpu.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,15 @@ static int poll_gpu (size_t s) /* TRUE if OK, FALSE otherwise */
4545
/* Returns TRUE if the GPU has a block of memory of size s,
4646
FALSE otherwise. The block of memory is immediately freed. */
4747
void *p = NULL ;
48-
// double t = SuiteSparse_time ( ) ;
4948
if (s == 0)
5049
{
5150
return (FALSE) ;
5251
}
5352
if (cudaMalloc (&p, s) != cudaSuccess)
5453
{
55-
// t = SuiteSparse_time ( ) - t ;
56-
// printf ("poll s %lu failed, time %g\n", s, t) ;
5754
return (FALSE) ;
5855
}
5956
cudaFree (p) ;
60-
// t = SuiteSparse_time ( ) - t ;
61-
// printf ("poll s %lu OK time %g\n", s, t) ;
6257
return (TRUE) ;
6358
#else
6459
return (FALSE) ;
@@ -74,7 +69,6 @@ int CHOLMOD(gpu_memorysize) /* returns 1 on error, 0 otherwise */
7469
{
7570
size_t good, bad, s, total_free, total_memory ;
7671
int k ;
77-
double t ;
7872

7973
*total_mem = 0;
8074
*available_mem = 0;
@@ -90,10 +84,7 @@ int CHOLMOD(gpu_memorysize) /* returns 1 on error, 0 otherwise */
9084
#ifdef CHOLMOD_HAS_CUDA
9185

9286
/* find the total amount of free memory */
93-
t = SuiteSparse_time ( ) ;
9487
cudaMemGetInfo (&total_free, &total_memory) ;
95-
t = SuiteSparse_time ( ) - t ;
96-
// printf ("free %lu tot %lu time %g\n", total_free, total_memory, t) ;
9788

9889
*total_mem = total_memory;
9990

‎CHOLMOD/GPU/t_cholmod_gpu.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ int TEMPLATE2 (CHOLMOD (gpu_updateC))
417417
ndrow3 = ndrow2 - ndrow1 ;
418418

419419
#ifdef BLAS_TIMER
420-
Common->syrkStart = SuiteSparse_time ( ) ;
420+
Common->syrkStart = SUITESPARSE_TIME ;
421421
Common->CHOLMOD_GPU_SYRK_CALLS++ ;
422422
#endif
423423

@@ -532,7 +532,7 @@ int TEMPLATE2 (CHOLMOD (gpu_updateC))
532532
}
533533

534534
#ifdef BLAS_TIMER
535-
Common->CHOLMOD_GPU_SYRK_TIME += SuiteSparse_time() - Common->syrkStart;
535+
Common->CHOLMOD_GPU_SYRK_TIME += SUITESPARSE_TIME - Common->syrkStart;
536536
#endif
537537

538538
/* ---------------------------------------------------------------------- */
@@ -541,7 +541,7 @@ int TEMPLATE2 (CHOLMOD (gpu_updateC))
541541

542542
#ifdef BLAS_TIMER
543543
Common->CHOLMOD_GPU_GEMM_CALLS++ ;
544-
tstart = SuiteSparse_time();
544+
tstart = SUITESPARSE_TIME;
545545
#endif
546546

547547
if (ndrow3 > 0)
@@ -591,7 +591,7 @@ int TEMPLATE2 (CHOLMOD (gpu_updateC))
591591
}
592592

593593
#ifdef BLAS_TIMER
594-
Common->CHOLMOD_GPU_GEMM_TIME += SuiteSparse_time() - tstart;
594+
Common->CHOLMOD_GPU_GEMM_TIME += SUITESPARSE_TIME - tstart;
595595
#endif
596596

597597
/* ------------------------------------------------------------------ */
@@ -812,7 +812,7 @@ int TEMPLATE2 (CHOLMOD (gpu_lower_potrf))
812812
}
813813

814814
#ifdef BLAS_TIMER
815-
tstart = SuiteSparse_time ( ) ;
815+
tstart = SUITESPARSE_TIME ;
816816
Common->CHOLMOD_GPU_POTRF_CALLS++ ;
817817
#endif
818818

@@ -1130,7 +1130,7 @@ int TEMPLATE2 (CHOLMOD (gpu_lower_potrf))
11301130
}
11311131

11321132
#ifdef BLAS_TIMER
1133-
Common->CHOLMOD_GPU_POTRF_TIME += SuiteSparse_time ( ) - tstart ;
1133+
Common->CHOLMOD_GPU_POTRF_TIME += SUITESPARSE_TIME - tstart ;
11341134
#endif
11351135

11361136
return (1) ;
@@ -1193,7 +1193,7 @@ int TEMPLATE2 (CHOLMOD (gpu_triangular_solve))
11931193
}
11941194

11951195
#ifdef BLAS_TIMER
1196-
tstart = SuiteSparse_time ( ) ;
1196+
tstart = SUITESPARSE_TIME ;
11971197
Common->CHOLMOD_GPU_TRSM_CALLS++ ;
11981198
#endif
11991199

@@ -1388,7 +1388,7 @@ int TEMPLATE2 (CHOLMOD (gpu_triangular_solve))
13881388
/* ---------------------------------------------------------------------- */
13891389

13901390
#ifdef BLAS_TIMER
1391-
Common->CHOLMOD_GPU_TRSM_TIME += SuiteSparse_time ( ) - tstart ;
1391+
Common->CHOLMOD_GPU_TRSM_TIME += SUITESPARSE_TIME - tstart ;
13921392
#endif
13931393

13941394
return (1) ;

‎CHOLMOD/Supernodal/t_cholmod_super_numeric_worker.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
762762

763763
#ifdef BLAS_TIMER
764764
Common->CHOLMOD_CPU_SYRK_CALLS++ ;
765-
tstart = SuiteSparse_time () ;
765+
tstart = SUITESPARSE_TIME ;
766766
#endif
767767

768768
#if (defined (DOUBLE) && defined (REAL))
@@ -803,7 +803,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
803803
#endif
804804

805805
#ifdef BLAS_TIMER
806-
blas_time = SuiteSparse_time () - tstart ;
806+
blas_time = SUITESPARSE_TIME - tstart ;
807807
Common->CHOLMOD_CPU_SYRK_TIME += blas_time ;
808808
BLAS_DUMP_TO_FILE (0, // dsyrk ("L", "N", ...)
809809
ndrow1, ndcol, 0, // N, K, 0
@@ -817,7 +817,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
817817

818818
#ifdef BLAS_TIMER
819819
Common->CHOLMOD_CPU_GEMM_CALLS++ ;
820-
tstart = SuiteSparse_time () ;
820+
tstart = SUITESPARSE_TIME ;
821821
#endif
822822

823823
#if (defined (DOUBLE) && defined (REAL))
@@ -874,7 +874,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
874874
#endif
875875

876876
#ifdef BLAS_TIMER
877-
blas_time = SuiteSparse_time () - tstart ;
877+
blas_time = SUITESPARSE_TIME - tstart ;
878878
Common->CHOLMOD_CPU_GEMM_TIME += blas_time ;
879879
BLAS_DUMP_TO_FILE (4, // dgemm ("N", "C", ...)
880880
ndrow3, ndrow1, ndcol, // M, N, K
@@ -1016,7 +1016,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
10161016
#endif
10171017
#ifdef BLAS_TIMER
10181018
Common->CHOLMOD_CPU_POTRF_CALLS++ ;
1019-
tstart = SuiteSparse_time () ;
1019+
tstart = SUITESPARSE_TIME ;
10201020
#endif
10211021

10221022
#if (defined (DOUBLE) && defined (REAL))
@@ -1049,7 +1049,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
10491049
#endif
10501050

10511051
#ifdef BLAS_TIMER
1052-
blas_time = SuiteSparse_time () - tstart ;
1052+
blas_time = SUITESPARSE_TIME - tstart ;
10531053
Common->CHOLMOD_CPU_POTRF_TIME += blas_time ;
10541054
BLAS_DUMP_TO_FILE (8, // dpotrf ("L", ... )
10551055
nscol2, 0, 0, // N, 0, 0
@@ -1168,7 +1168,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
11681168
{
11691169
#ifdef BLAS_TIMER
11701170
Common->CHOLMOD_CPU_TRSM_CALLS++ ;
1171-
tstart = SuiteSparse_time () ;
1171+
tstart = SUITESPARSE_TIME ;
11721172
#endif
11731173

11741174
#if (defined (DOUBLE) && defined (REAL))
@@ -1209,7 +1209,7 @@ static int TEMPLATE (cholmod_super_numeric_worker)
12091209
#endif
12101210

12111211
#ifdef BLAS_TIMER
1212-
blas_time = SuiteSparse_time () - tstart ;
1212+
blas_time = SUITESPARSE_TIME - tstart ;
12131213
Common->CHOLMOD_CPU_TRSM_TIME += blas_time ;
12141214
BLAS_DUMP_TO_FILE (12, // dtrsm ("R", "L", "C", "N"...)
12151215
nsrow2, nscol2, 0, // M, N

‎ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Dec 30, 2023: version 7.4.0
2121
bug fixes in the GPU Module.
2222
* AMD 3.3.0: minor change for CHOLMOD 5.1.0 tests
2323
* CAMD 3.3.0: minor change for CHOLMOD 5.1.0 tests
24-
* SuiteSparse_config 7.4.0: added wrappers for single-precision BLAS/LAPACK
24+
* SuiteSparse_config 7.4.0: added wrappers for single-precision BLAS/LAPACK,
25+
added SUITESPARSE_TIME macro.
2526
* *_version: added methods to all package that didn't have them:
2627
AMD, CAMD, COLAMD, CCOLAMD, BTF, CSparse, CXSparse, KLU, BTF, RBio,
2728
SPEX, SPQR, and UMFPACK.

‎Mongoose/Demo/demo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ int main(int argn, const char **argv)
5353
cout << "Mongoose is licensed under Version 3 of the GNU General Public License." << endl;
5454
cout << "Mongoose is also available under other licenses; contact authors for details." << endl;
5555

56-
double start = SuiteSparse_time ();
56+
double start = SUITESPARSE_TIME;
5757
double duration;
5858

5959
for (int k = 0; k < NMAT; k++)
6060
{
6161
cout << "********************************************************************************" << endl;
6262
cout << "Computing an edge cut for " << demo_files[k] << "..." << endl;
6363

64-
double trial_start = SuiteSparse_time ();
64+
double trial_start = SUITESPARSE_TIME;
6565
EdgeCut_Options *options = EdgeCut_Options::create();
6666
if (!options) return EXIT_FAILURE; // Return an error if we failed.
6767

@@ -87,15 +87,15 @@ int main(int argn, const char **argv)
8787
cout << "Cut Imbalance: " << setprecision(2) << 100*(result->imbalance) << "%" << endl;
8888
}
8989

90-
double trial_duration = (SuiteSparse_time() - trial_start) ;
90+
double trial_duration = (SUITESPARSE_TIME - trial_start) ;
9191
cout << "Trial Time: " << trial_duration*1000 << "ms" << endl;
9292

9393
options->~EdgeCut_Options();
9494
graph->~Graph();
9595
result->~EdgeCut();
9696
}
9797

98-
duration = (SuiteSparse_time() - start) ;
98+
duration = (SUITESPARSE_TIME - start) ;
9999

100100
cout << "********************************************************************************" << endl;
101101
cout << "Total Demo Time: " << setprecision(2) << duration << "s" << endl;

‎Mongoose/Executable/mongoose.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ int main(int argn, const char **argv)
8383
std::cout << "********************************************************************************" << std::endl;
8484

8585
// An edge separator should be computed with default options
86-
t = SuiteSparse_time ();
86+
t = SUITESPARSE_TIME;
8787
EdgeCut *result = edge_cut(graph, options);
88-
t = SuiteSparse_time () - t;
88+
t = SUITESPARSE_TIME - t;
8989

9090
if (!result)
9191
{

‎Mongoose/Include/Mongoose_Logger.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ inline void Logger::tic(TimingType timingType)
134134
{
135135
if (timingOn)
136136
{
137-
clocks[timingType] = SuiteSparse_time ();
137+
clocks[timingType] = SUITESPARSE_TIME;
138138
}
139139
}
140140

@@ -157,7 +157,7 @@ inline void Logger::toc(TimingType timingType)
157157
if (timingOn)
158158
{
159159
times[timingType]
160-
+= (float) (SuiteSparse_time () - clocks[timingType]) ;
160+
+= (float) (SUITESPARSE_TIME - clocks[timingType]) ;
161161
}
162162
}
163163

‎Mongoose/Tests/Mongoose_Test_Performance.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ int runPerformanceTest(const std::string &inputFile, const std::string &outputFi
4343
}
4444

4545
// An edge separator should be computed with default options
46-
t = SuiteSparse_time ();
46+
t = SUITESPARSE_TIME;
4747
EdgeCut *result = edge_cut(graph, options);
48-
t = SuiteSparse_time () - t;
48+
t = SUITESPARSE_TIME - t;
4949

5050
if (!result)
5151
{

‎Mongoose/Tests/Mongoose_Test_Reference.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ int runReferenceTest(const std::string &inputFile)
4343
}
4444

4545
// An edge separator should be computed with default options
46-
t = SuiteSparse_time ();
46+
t = SUITESPARSE_TIME;
4747
EdgeCut *result = edge_cut(graph, options);
48-
t = SuiteSparse_time () - t;
48+
t = SUITESPARSE_TIME - t;
4949

5050
if (!result)
5151
{

‎SPQR/Demo/qrdemo_gpu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ int main (int argc, char **argv)
3333
// warmup the GPU. This can take some time, but only needs
3434
// to be done once
3535
cc->useGPU = true ;
36-
t = SuiteSparse_time ( ) ;
36+
t = SUITESPARSE_TIME ;
3737
cholmod_l_gpu_memorysize (&total_mem, &available_mem, cc) ;
3838
cc->gpuMemorySize = available_mem ;
39-
t = SuiteSparse_time ( ) - t ;
39+
t = SUITESPARSE_TIME - t ;
4040
if (cc->gpuMemorySize <= 1)
4141
{
4242
printf ("no GPU available\n") ;

0 commit comments

Comments
 (0)