Mercurial > mxe-octave
annotate src/of-image-1-no-jit.patch @ 5835:93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
* src/of-image-1-no-jit.patch: Add new patch.
* dist-files.mk: Add new file to list.
See: https://octave.discourse.group/t/1468
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 11 Aug 2021 14:51:14 +0200 |
parents | |
children |
rev | line source |
---|---|
5835
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 Don't use function dim_vector::to_jit. It was thought to be used exclusively by |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 the JIT compiler and it is removed now. |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 --- ./src/connectivity.h.orig 2020-02-02 14:20:08.000000000 +0100 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 +++ ./src/connectivity.h 2021-08-11 14:26:19.706581028 +0200 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 @@ -153,8 +153,7 @@ octave::image::connectivity::set_padding |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 const Array<octave_idx_type> lengths = padding_lengths (size, padded_size); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 const octave_idx_type* lengths_v = lengths.fortran_vec (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 - const octave_idx_type* strides_v = size.to_jit (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 - const octave_idx_type row_stride = strides_v[0]; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 + const octave_idx_type row_stride = size.xelem (0); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 std::function<void(const octave_idx_type)> fill; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 fill = [&] (const octave_idx_type dim) -> void |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 @@ -165,7 +164,7 @@ octave::image::connectivity::set_padding |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 if (dim == 0) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 im_v += row_stride; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 else |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 - for (octave_idx_type i = 0; i < strides_v[dim]; i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 + for (octave_idx_type i = 0; i < size.xelem (dim); i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 fill (dim -1); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 for (octave_idx_type i = 0; i < lengths_v[dim]; i++, im_v++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 --- ./src/imreconstruct.cc.orig 2020-02-02 14:20:08.000000000 +0100 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 +++ ./src/imreconstruct.cc 2021-08-11 14:31:36.450682736 +0200 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 @@ -110,10 +110,6 @@ scan_raster_order (T& padded_marker, con |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 const octave_idx_type n_neighbours = raster_neighbours.numel (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 - // We probably should not be using this but converting to Array |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 - // just to have fortran_vec seems a bit too much. |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 - const octave_idx_type* s = original_size.to_jit (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 - |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
36 std::function<void(const octave_idx_type)> scan; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
37 scan = [&] (const octave_idx_type dim) -> void |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
39 @@ -122,7 +118,7 @@ scan_raster_order (T& padded_marker, con |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
40 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
41 if (dim == 0) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
42 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
43 - for (octave_idx_type k = 0; k < s[0]; k++, J++, I++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
44 + for (octave_idx_type k = 0; k < original_size.xelem (0); k++, J++, I++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
45 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
46 for (octave_idx_type i = 0; i < n_neighbours; i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
47 if (*J < J[neighbours[i]]) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
48 @@ -133,7 +129,7 @@ scan_raster_order (T& padded_marker, con |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
49 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
50 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
51 else |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
52 - for (octave_idx_type i = 0; i < s[dim]; i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
53 + for (octave_idx_type i = 0; i < original_size.xelem (dim); i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
54 scan (dim-1); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
55 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
56 J += pads[dim]; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
57 @@ -161,10 +157,6 @@ scan_antiraster_order (T& padded_marker, |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
58 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
59 const octave_idx_type n_neighbours = antiraster_neighbours.numel (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
60 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
61 - // We probably should not be using this but converting to Array |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
62 - // just to have fortran_vec seems a bit too much. |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
63 - const octave_idx_type* s = original_size.to_jit (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
64 - |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
65 J += padded_marker.numel () -1; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
66 I += padded_marker.numel () -1; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
67 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
68 @@ -178,7 +170,7 @@ scan_antiraster_order (T& padded_marker, |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
69 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
70 if (dim == 0) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
71 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
72 - for (octave_idx_type k = 0; k < s[0]; k++, J--, I--, ind--) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
73 + for (octave_idx_type k = 0; k < original_size.xelem (0); k++, J--, I--, ind--) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
74 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
75 for (octave_idx_type i = 0; i < n_neighbours; i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
76 if (*J < J[neighbours[i]]) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
77 @@ -193,7 +185,7 @@ scan_antiraster_order (T& padded_marker, |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
78 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
79 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
80 else |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
81 - for (octave_idx_type i = 0; i < s[dim]; i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
82 + for (octave_idx_type i = 0; i < original_size.xelem (dim); i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
83 scan (dim-1); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
84 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
85 J -= pads[dim]; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
86 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
87 --- ./src/bwconncomp.cc.orig 2020-02-02 14:20:08.000000000 +0100 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
88 +++ ./src/bwconncomp.cc 2021-08-11 14:41:35.249619414 +0200 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
89 @@ -81,13 +81,11 @@ connected_components (const boolNDArray& |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
90 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
91 const dim_vector original_size = BW.dims (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
92 const dim_vector padded_size = BW_pad.dims (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
93 - const octave_idx_type* o = original_size.to_jit (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
94 - const octave_idx_type* p = padded_size.to_jit (); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
95 const octave_idx_type ndims_m1 = BW_pad.ndims () -1; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
96 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
97 std::vector<bool> dim_padded (BW_pad.ndims (), true); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
98 for (octave_idx_type i = 0; i < BW_pad.ndims (); i++) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
99 - if (p[i] == o[i]) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
100 + if (padded_size.xelem (i) == original_size.xelem (i)) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
101 dim_padded[i] = false; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
102 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
103 for (std::vector<octave_idx_type>& conn_comp : all_components) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
104 @@ -100,21 +98,21 @@ connected_components (const boolNDArray& |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
105 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
106 if (dim_padded[d]) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
107 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
108 - ind += mult * (offset % p[d] - 1); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
109 - mult *= p[d] - 2; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
110 - offset /= p[d]; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
111 + ind += mult * (offset % padded_size.xelem (d) - 1); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
112 + mult *= padded_size.xelem (d) - 2; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
113 + offset /= padded_size.xelem (d); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
114 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
115 else |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
116 { |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
117 - ind += mult * (offset % p[d]); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
118 - mult *= p[d]; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
119 - offset /= p[d]; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
120 + ind += mult * (offset % padded_size.xelem (d)); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
121 + mult *= padded_size.xelem (d); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
122 + offset /= padded_size.xelem (d); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
123 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
124 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
125 if (dim_padded[ndims_m1]) |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
126 - ind += mult * (offset % p[ndims_m1] - 1); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
127 + ind += mult * (offset % padded_size.xelem (ndims_m1) - 1); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
128 else |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
129 - ind += mult * (offset % p[ndims_m1]); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
130 + ind += mult * (offset % padded_size.xelem (ndims_m1)); |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
131 |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
132 offset = ind; |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
133 } |
93d20ff5d6a6
of-image: Don't use function dim_vector::to_jit.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
134 |