Mercurial > mxe-octave
annotate src/msvc-itsol-1.patch @ 3609:360eff7d9c06
texinfo: compile native info when native target.
* src/mingw-texinfo-1-fixes.patch: define sleep in mingw.
* src/texinfo.mk: only build tools libs for cross build ginfo when doing cross build.
author | John Donoghue |
---|---|
date | Mon, 09 Jun 2014 08:11:22 -0400 |
parents | 920e26e6c6a3 |
children |
rev | line source |
---|---|
3104
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur ITSOL_2-orig/SRC/PQ.c ITSOL_2/SRC/PQ.c |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- ITSOL_2-orig/SRC/PQ.c 2012-05-15 22:20:43 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ ITSOL_2/SRC/PQ.c 2013-06-27 11:13:49 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -126,6 +126,10 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 |-----end-of-indsetPQ-------------------------------------------------- |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 |--------------------------------------------------------------------*/ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 +#ifndef _MSC_VER |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 +/* These functions are already defined in indsetC.c. Avoid duplicate |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 + symbols at link time. */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 int add2is(int *last, int nod, int *iord, int *riord) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 /*---------------------------------------------------------------------- |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 @@ -336,6 +340,8 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 |---- end of weightsC ------------------------------------------------- |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 |--------------------------------------------------------------------*/ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 +#endif /* _MSC_VER */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 int preSel(csptr mat, int *icor, int *jcor, int job, double tol, int *count) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 /*--------------------------------------------------------------------- |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 diff -ur ITSOL_2-orig/SRC/iluk.c ITSOL_2/SRC/iluk.c |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 --- ITSOL_2-orig/SRC/iluk.c 2012-05-15 22:20:43 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 +++ ITSOL_2/SRC/iluk.c 2013-06-27 11:16:21 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 @@ -13,7 +13,7 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 #endif |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 /*--------------------protos */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 -int lofC( int lofM, csptr csmat, iluptr lu, FILE *fp ); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 +static int lofC( int lofM, csptr csmat, iluptr lu, FILE *fp ); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 /*--------------------end protos */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 int ilukC( int lofM, csptr csmat, iluptr lu, FILE *fp ) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 @@ -149,7 +149,7 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 return 0; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 } |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 -int lofC( int lofM, csptr csmat, iluptr lu, FILE *fp ) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 +static int lofC( int lofM, csptr csmat, iluptr lu, FILE *fp ) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 /*-------------------------------------------------------------------- |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 * symbolic ilu factorization to calculate structure of ilu matrix |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 diff -ur ITSOL_2-orig/SRC/misc.c ITSOL_2/SRC/misc.c |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 --- ITSOL_2-orig/SRC/misc.c 2012-05-15 22:20:43 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 +++ ITSOL_2/SRC/misc.c 2013-06-27 10:54:30 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 @@ -540,8 +540,8 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 -------------------- matlab style */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 int n, i, k, nzi; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 int *row; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 - n = A->n; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 double *rowm; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 + n = A->n; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 for (i=0; i<n; i++) { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 nzi = A->nzcount[i]; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
57 row = A->ja[i]; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 diff -ur ITSOL_2-orig/SRC/sets.c ITSOL_2/SRC/sets.c |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 --- ITSOL_2-orig/SRC/sets.c 2012-05-15 23:38:44 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 +++ ITSOL_2/SRC/sets.c 2013-06-27 10:45:33 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
61 @@ -1001,12 +1001,12 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 job == 1, input coo in 1-indexing |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
63 */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
64 { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
65 + int i, *ir, *jc; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
66 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
67 *a = (double *)Malloc(nnz*sizeof(double), "coocsc"); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 *ja = (int *)Malloc(nnz*sizeof(int), "coocsc"); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
69 *ia = (int *)Malloc((n+1)*sizeof(int), "coocsc"); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
71 - int i, *ir, *jc; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 - |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
73 if (job == 0) { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
74 ir = (int *)Malloc(nnz*sizeof(int), "coocsc"); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
75 jc = (int *)Malloc(nnz*sizeof(int), "coocsc"); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
76 diff -ur ITSOL_2-orig/SRC/systimer.c ITSOL_2/SRC/systimer.c |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
77 --- ITSOL_2-orig/SRC/systimer.c 2012-05-15 22:20:43 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
78 +++ ITSOL_2/SRC/systimer.c 2013-06-27 10:53:40 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
79 @@ -25,9 +25,11 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
80 #else |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
81 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
82 #include <sys/types.h> |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
83 +#ifndef _MSC_VER |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
84 #include <sys/times.h> |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
85 -#include <time.h> |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
86 #include <sys/time.h> |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
87 +#endif |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
88 +#include <time.h> |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
89 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
90 #ifndef CLK_TCK |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
91 #define CLK_TCK 100 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
92 @@ -37,6 +39,59 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
93 #define CLOCKS_PER_SEC 1000000 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
94 #endif |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
95 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
96 +#ifdef _MSC_VER |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
97 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
98 +/* This implementation is copied from gnulib, licensed under GPLv2+. */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
99 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
100 +#include <windows.h> |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
101 +#include <math.h> |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
102 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
103 +struct tms { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
104 + clock_t tms_utime; /* user time */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
105 + clock_t tms_stime; /* system time */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
106 + clock_t tms_cutime; /* user time of children */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
107 + clock_t tms_cstime; /* system time of children */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
108 +}; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
109 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
110 +static clock_t |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
111 +filetime2clock (FILETIME time) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
112 +{ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
113 + float f; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
114 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
115 + /* We have a 64-bit value, in the form of two DWORDS aka unsigned |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
116 + int, counting the number of 100-nanosecond intervals. We need to |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
117 + convert these to clock ticks. Older POSIX uses CLK_TCK to |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
118 + indicate the number of clock ticks per second while modern POSIX |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
119 + uses sysconf(_SC_CLK_TCK). Mingw32 does not appear to have |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
120 + sysconf(_SC_CLK_TCK), but appears to have CLK_TCK = 1000 so we |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
121 + use it. Note that CLOCKS_PER_SEC constant does not apply here, |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
122 + it is for use with the clock function. */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
123 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
124 + f = (unsigned long long) time.dwHighDateTime << 32; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
125 + f += time.dwLowDateTime; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
126 + f = f * CLK_TCK / 10000000; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
127 + return (clock_t) round (f); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
128 +} |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
129 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
130 +static clock_t |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
131 +times (struct tms * buffer) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
132 +{ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
133 + FILETIME creation_time, exit_time, kernel_time, user_time; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
134 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
135 + if (GetProcessTimes (GetCurrentProcess (), &creation_time, &exit_time, |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
136 + &kernel_time, &user_time) == 0) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
137 + return (clock_t) -1; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
138 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
139 + buffer->tms_utime = filetime2clock (user_time); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
140 + buffer->tms_stime = filetime2clock (kernel_time); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
141 + buffer->tms_cutime = 0; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
142 + buffer->tms_cstime = 0; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
143 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
144 + return filetime2clock (creation_time); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
145 +} |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
146 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
147 +#endif |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
148 + |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
149 double sys_timer_CLOCK() { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
150 clock_t tmp; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
151 tmp = clock(); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
152 diff -ur ITSOL_2-orig/SRC/vbiluk.c ITSOL_2/SRC/vbiluk.c |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
153 --- ITSOL_2-orig/SRC/vbiluk.c 2012-05-15 22:20:43 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
154 +++ ITSOL_2/SRC/vbiluk.c 2013-06-27 11:15:56 -0400 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
155 @@ -24,10 +24,9 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
156 int setupVBMat(vbsptr vbmat, int n, int *nB); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
157 int mallocVBRow(vbiluptr lu, int nrow); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
158 void zrmC(int m, int n, BData data); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
159 -int lofC( int lofM, vbsptr vbmat, vbiluptr lu, FILE *fp ); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
160 +static int lofC( int lofM, vbsptr vbmat, vbiluptr lu, FILE *fp ); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
161 int setupVBILU(vbiluptr lu, int n, int *bsz); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
162 void copyBData(int m, int n, BData dst, BData src, int isig); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
163 -int lofC( int lofM, vbsptr vbmat, vbiluptr lu, FILE *fp ); |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
164 /*-------------------- END of protos */ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
165 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
166 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
167 @@ -188,7 +187,7 @@ |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
168 return 0; |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
169 } |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
170 |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
171 -int lofC( int lofM, vbsptr vbmat, vbiluptr lu, FILE *fp ) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
172 +static int lofC( int lofM, vbsptr vbmat, vbiluptr lu, FILE *fp ) |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
173 { |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
174 /*-------------------------------------------------------------------- |
920e26e6c6a3
Add ITSOL package. Enable compilation with MSVC.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
175 * symbolic ilu factorization to calculate structure of ilu matrix |