Mercurial > mxe-octave
annotate src/of-nurbs-1-fixes.patch @ 5504:9f9ed6a325bd
Build SUNDIALS IDA for Linux with KLU (bug #58795).
* src/suitesparse.mk: Create symlinks to libraries without version suffix.
* src/sundials-ida.mk: Unify build rules for all other platforms.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 31 Jul 2020 14:59:35 +0200 |
parents | de0b5dfe77f6 |
children |
rev | line source |
---|---|
4038
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
1 # HG changeset patch |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
2 # User John Donoghue |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
3 # Date 1443634028 14400 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
4 # Wed Sep 30 13:27:08 2015 -0400 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
5 # Node ID 41f9bc725e8fdc8d07efeedd09da84a013bb14c0 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
6 # Parent fcd14dc97757ba4f3da5dbd4571b38a407235d2a |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
7 typecast constants to octave_idx_type (Bug #46081) |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
8 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
9 * src/low_level_functions.cc: use octave_idx_type(0) for constant to idx_vector |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
10 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
11 * src/nrb_srf_basisfun__.cc: use typecase octave_idx_type for constants |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
12 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
13 * src/nrb_srf_basisfun_der__.cc: use typecase octave_idx_type for constants |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
14 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
15 * src/nrbsurfderiveval.c: use use octave_idx_type(3) for constant to idx_vector |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
16 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
17 diff -r fcd14dc97757 -r 41f9bc725e8f src/low_level_functions.cc |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
18 --- a/src/low_level_functions.cc Mon Sep 14 16:59:10 2015 +0100 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
19 +++ b/src/low_level_functions.cc Wed Sep 30 13:27:08 2015 -0400 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
20 @@ -306,7 +306,7 @@ |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
21 octave_idx_type dd = (d-k) <= dv ? (d-k) : dv; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
22 Matrix temp (dd <= m ? (dd+1) : (m+1), m+1, 0.0); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
23 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
24 - idxva (0) = idx_vector(k); idxva (1) = idx_vector(0); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
25 + idxva (0) = idx_vector(k); idxva (1) = idx_vector(octave_idx_type(0)); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
26 idxva (2) = idx_vector(i); idxva (3) = idx_vector(':'); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
27 NDArray temp2 (pkl.index (idxva)); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
28 curvederivcpts (m, q, V.extract (s1, V.numel () - 1), |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
29 diff -r fcd14dc97757 -r 41f9bc725e8f src/nrb_srf_basisfun__.cc |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
30 --- a/src/nrb_srf_basisfun__.cc Mon Sep 14 16:59:10 2015 +0100 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
31 +++ b/src/nrb_srf_basisfun__.cc Wed Sep 30 13:27:08 2015 -0400 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
32 @@ -40,10 +40,10 @@ |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
33 octave_idx_type q = static_cast<octave_idx_type> ((nrb.contents("order").vector_value())(1)) - 1; // q = nrb.order(2) -1; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
34 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
35 Array<idx_vector> idx(dim_vector (2, 1), idx_vector(':')); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
36 - idx(0) = 0; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
37 + idx(0) = octave_idx_type(0); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
38 const NDArray u(points.index (idx).squeeze ()); // u = points(1,:); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
39 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
40 - idx(0) = 1; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
41 + idx(0) = octave_idx_type(1); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
42 const NDArray v(points.index (idx).squeeze ()); // v = points(2,:); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
43 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
44 octave_idx_type npt = u.numel (); // npt = length(u); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
45 @@ -56,7 +56,7 @@ |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
46 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
47 const RowVector V(knots(1).row_vector_value ()); // V = nrb.knots{2}; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
48 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
49 - Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = 3; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
50 + Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = octave_idx_type(3); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
51 NDArray w (coefs.index (idx2).squeeze ()); // w = squeeze(nrb.coefs(4,:,:)); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
52 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
53 RowVector spu(u); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
54 diff -r fcd14dc97757 -r 41f9bc725e8f src/nrb_srf_basisfun_der__.cc |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
55 --- a/src/nrb_srf_basisfun_der__.cc Mon Sep 14 16:59:10 2015 +0100 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
56 +++ b/src/nrb_srf_basisfun_der__.cc Wed Sep 30 13:27:08 2015 -0400 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
57 @@ -40,10 +40,10 @@ |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
58 octave_idx_type q = static_cast<octave_idx_type> ((nrb.contents("order").vector_value())(1)) - 1; // q = nrb.order(2) -1; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
59 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
60 Array<idx_vector> idx(dim_vector (2, 1), idx_vector(':')); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
61 - idx(0) = 0; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
62 + idx(0) = octave_idx_type(0); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
63 const NDArray u(points.index (idx).squeeze ()); // u = points(1,:); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
64 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
65 - idx(0) = 1; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
66 + idx(0) = octave_idx_type(1); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
67 const NDArray v(points.index (idx).squeeze ()); // v = points(2,:); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
68 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
69 octave_idx_type npt = u.numel (); // npt = length(u); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
70 @@ -63,7 +63,7 @@ |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
71 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
72 const RowVector V(knots(1).row_vector_value ()); // V = nrb.knots{2}; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
73 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
74 - Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = 3; |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
75 + Array<idx_vector> idx2(dim_vector (3, 1), idx_vector(':')); idx2(0) = octave_idx_type(3); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
76 NDArray w (coefs.index (idx2).squeeze ()); // w = squeeze(nrb.coefs(4,:,:)); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
77 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
78 RowVector spu(u); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
79 diff -r fcd14dc97757 -r 41f9bc725e8f src/nrbsurfderiveval.cc |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
80 --- a/src/nrbsurfderiveval.cc Mon Sep 14 16:59:10 2015 +0100 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
81 +++ b/src/nrbsurfderiveval.cc Wed Sep 30 13:27:08 2015 -0400 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
82 @@ -119,7 +119,7 @@ |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
83 NDArray coefs = srf.contents("coefs").array_value(); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
84 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
85 Array<idx_vector> idx(dim_vector (3, 1), idx_vector(':')); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
86 - idx (0) = idx_vector (3); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
87 + idx (0) = idx_vector (octave_idx_type(3)); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
88 Matrix weights (NDArray (coefs.index (idx).squeeze ())); |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
89 |
de0b5dfe77f6
of-nurbs: new patch to compile with win32 --enable-64 (Bug #46081)
John Donoghue
parents:
diff
changeset
|
90 for (octave_idx_type iu(0); iu<uv.cols (); iu++) |