Skip to content

Commit 1353e36

Browse files
authored
update docs and travis (#146)
* update docs and travis * fix travis * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto
1 parent 25824c8 commit 1353e36

File tree

7 files changed

+47
-31
lines changed

7 files changed

+47
-31
lines changed

.travis.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: d
2-
dist: trusty
3-
sudo: false
2+
sudo: required
43
packages:
54
- pkg-config
65
d:
@@ -15,28 +14,29 @@ branches:
1514
env:
1615
- ARCH="x86_64"
1716
matrix:
18-
# include:
19-
# - {os: linux, d: ldc-beta, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
20-
# - {os: linux, d: ldc, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
21-
# - {os: linux, d: dmd-beta, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
22-
# - {os: linux, d: dmd, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
17+
include:
18+
- {os: linux, d: ldc-beta, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
19+
- {os: linux, d: ldc, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
20+
- {os: linux, d: dmd-beta, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
21+
- {os: linux, d: dmd, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
2322
allow_failures:
2423
- {d: dmd-nightly}
2524
- {d: ldc-beta}
2625
- {d: gdc}
2726
install:
28-
- pyenv global system 3.6
29-
- pip3 install 'meson>=0.45'
30-
- mkdir .ntmp
31-
- curl -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip -o .ntmp/ninja-linux.zip
32-
- unzip .ntmp/ninja-linux.zip -d .ntmp
33-
before_script:
34-
- export PATH=$PATH:$PWD/.ntmp
27+
- curl -L "https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip" -o ninja-linux.zip
28+
- sudo unzip ninja-linux.zip -d /usr/local/bin
29+
- sudo chmod 755 /usr/local/bin/ninja
30+
- sudo add-apt-repository -y ppa:deadsnakes/ppa
31+
- sudo apt-get -y update
32+
- sudo apt-get -y install python3.6
33+
- curl https://bootstrap.pypa.io/get-pip.py | sudo python3.6
34+
- sudo pip3 install meson
3535
script:
3636
# - travis_wait 100 dub test --arch "$ARCH"
37+
- travis_wait 100 dub test --arch "$ARCH" --build=unittest-cov
3738
- ./test_examples.sh
3839
- meson build && cd build && ninja -j4 && ninja -j4 test -v && cd .. # TODO: 32bit meson test
39-
# - travis_wait 100 dub test --arch "$ARCH" --build=unittest-cov
4040
# - travis_wait 100 dub test --arch "$ARCH" --build=unittest-release
4141

4242
after_success:

doc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ MIR_PACKAGES = mir mir/ndslice mir/ndslice/connect mir/internal mir/math mir/mat
2929

3030
PACKAGE_mir = bitmanip bitop conv functional primitives range series utility qualifier range
3131

32-
PACKAGE_mir_array = primitives
32+
PACKAGE_mir_array = allocation primitives
3333
PACKAGE_mir_combinatorics = package
3434
PACKAGE_mir_algorithm = iteration setops
3535
PACKAGE_mir_container = binaryheap

source/mir/algorithm/iteration.d

+13-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ $(T2 cmp, Compares two slices.)
1212
$(T2 count, Counts elements in a slices according to a predicate.)
1313
$(T2 each, Iterates all elements.)
1414
$(T2 eachLower, Iterates lower triangle of matrix.)
15-
$(T2 eachUpper, Iterates upper triangle of matrix.)
1615
$(T2 eachUploPair, Iterates upper and lower pairs of elements in square matrix.)
16+
$(T2 eachUpper, Iterates upper triangle of matrix.)
1717
$(T2 equal, Compares two slices for equality.)
1818
$(T2 find, Finds backward index.)
1919
$(T2 findIndex, Finds index.)
@@ -24,6 +24,7 @@ $(T2 minIndex, Finds index of the minimum.)
2424
$(T2 minmaxIndex, Finds indexes of the minimum and the maximum.)
2525
$(T2 minmaxPos, Finds backward indexes of the minimum and the maximum.)
2626
$(T2 minPos, Finds backward index of the minimum.)
27+
$(T2 nBitsToCount, Сount bits until set bit count is reached.)
2728
$(T2 reduce, Accumulates all elements.)
2829
$(T2 uniq, Iterates over the unique elements in a range, which is assumed sorted.)
2930
)
@@ -498,6 +499,8 @@ const:
498499
}
499500

500501
/++
502+
Сount bits until set bit count is reached. Works with ndslices created with $(REF bitwise, mir,ndslice,topology), $(REF bitSlice, mir,ndslice,allocation).
503+
Returns: bit count if set bit count is reached or `-1` otherwise.
501504
+/
502505
sizediff_t nBitsToCount(Field, I)(Slice!(FieldIterator!(BitField!(Field, I))) bitSlice, size_t count)
503506
{
@@ -1686,6 +1689,8 @@ Params:
16861689
See_also:
16871690
$(LREF find),
16881691
$(LREF any).
1692+
Optimization:
1693+
`findIndex!"a"` has accelerated specialization for slices created with $(REF bitwise, mir,ndslice,topology), $(REF bitSlice, mir,ndslice,allocation).
16891694
+/
16901695
template findIndex(alias pred)
16911696
{
@@ -1774,6 +1779,9 @@ See_also:
17741779
$(LREF findIndex),
17751780
$(LREF any),
17761781
$(REF Slice.backward, mir,ndslice,slice).
1782+
1783+
Optimization:
1784+
`find!"a"` has accelerated specialization for slices created with $(REF bitwise, mir,ndslice,topology), $(REF bitSlice, mir,ndslice,allocation).
17771785
+/
17781786
template find(alias pred)
17791787
{
@@ -1946,6 +1954,8 @@ Like $(LREF find), but only returns whether or not the search was successful.
19461954
19471955
Params:
19481956
pred = The predicate.
1957+
Optimization:
1958+
`any!"a"` has accelerated specialization for slices created with $(REF bitwise, mir,ndslice,topology), $(REF bitSlice, mir,ndslice,allocation).
19491959
+/
19501960
template any(alias pred = "a")
19511961
{
@@ -2103,7 +2113,8 @@ Checks if all of the elements verify `pred`.
21032113
21042114
Params:
21052115
pred = The predicate.
2106-
2116+
Optimization:
2117+
`all!"a"` has accelerated specialization for slices created with $(REF bitwise, mir,ndslice,topology), $(REF bitSlice, mir,ndslice,allocation).
21072118
+/
21082119
template all(alias pred = "a")
21092120
{

source/mir/ndslice/field.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ An ndslice can be created on top of a field using $(SUBREF slice, slicedField).
77
88
$(BOOKTABLE $(H2 Fields),
99
$(TR $(TH Field Name) $(TH Used By))
10-
$(T2 BitpackField, $(SUBREF topology, bitpack))
1110
$(T2 BitField, $(SUBREF topology, bitwise))
11+
$(T2 BitpackField, $(SUBREF topology, bitpack))
1212
$(T2 CycleField, $(SUBREF topology, cycle) (2 kinds))
1313
$(T2 LinspaceField, $(SUBREF topology, linspace))
1414
$(T2 MagicField, $(SUBREF topology, magic))

source/mir/ndslice/package.d

+9-5
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,14 @@ $(TR $(TDNW $(SUBMODULE topology) $(BR)
127127
$(SUBREF topology, assumeContiguous)
128128
$(SUBREF topology, bitpack)
129129
$(SUBREF topology, bitwise)
130-
$(SUBREF topology, bytegroup)
131130
$(SUBREF topology, blocks)
132131
$(SUBREF topology, byDim)
133-
$(SUBREF topology, canonical)
134-
$(SUBREF topology, cartesian)
132+
$(SUBREF topology, bytegroup)
135133
$(SUBREF topology, cached)
136134
$(SUBREF topology, cachedGC)
135+
$(SUBREF topology, canonical)
136+
$(SUBREF topology, cartesian)
137+
$(SUBREF topology, cycle)
137138
$(SUBREF topology, diagonal)
138139
$(SUBREF topology, diff)
139140
$(SUBREF topology, evertPack)
@@ -143,11 +144,12 @@ $(TR $(TDNW $(SUBMODULE topology) $(BR)
143144
$(SUBREF topology, ipack)
144145
$(SUBREF topology, kronecker)
145146
$(SUBREF topology, linspace)
147+
$(SUBREF topology, magic)
146148
$(SUBREF topology, map)
147149
$(SUBREF topology, mapSubSlices)
148-
$(SUBREF topology, magic)
149150
$(SUBREF topology, member)
150151
$(SUBREF topology, ndiota)
152+
$(SUBREF topology, orthogonalReduceField)
151153
$(SUBREF topology, pack)
152154
$(SUBREF topology, pairwise)
153155
$(SUBREF topology, pairwiseMapSubSlices)
@@ -237,12 +239,14 @@ $(TR $(TDNW $(SUBMODULE iterator)
237239
$(TR $(TDNW $(SUBMODULE field)
238240
$(BR) $(SMALL Declarations))
239241
$(TD
240-
$(SUBREF field, BitpackField)
241242
$(SUBREF field, BitField)
243+
$(SUBREF field, BitpackField)
244+
$(SUBREF field, CycleField)
242245
$(SUBREF field, LinspaceField)
243246
$(SUBREF field, MagicField)
244247
$(SUBREF field, MapField)
245248
$(SUBREF field, ndIotaField)
249+
$(SUBREF field, OrthogonalReduceField)
246250
$(SUBREF field, RepeatField)
247251
)
248252
)

source/mir/ndslice/topology.d

+6-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ $(T2 assumeContiguous, Converts a slice to contiguous $(SUBREF slice, SliceKind)
1616
$(BOOKTABLE $(H2 Sequence Selectors),
1717
$(TR $(TH Function Name) $(TH Description))
1818
19-
$(T2 repeat, Slice with identical values)
19+
$(T2 cycle, Cycle repeates 1-dimensional field/range/array/slice in a fixed length 1-dimensional slice)
2020
$(T2 iota, Contiguous Slice with initial flattened (contiguous) index.)
21-
$(T2 ndiota, Contiguous Slice with initial multidimensional index.)
2221
$(T2 linspace, Evenly spaced numbers over a specified interval.)
2322
$(T2 magic, Magic square.)
23+
$(T2 ndiota, Contiguous Slice with initial multidimensional index.)
24+
$(T2 repeat, Slice with identical values)
2425
)
2526
27+
.
28+
2629
$(BOOKTABLE $(H2 Products),
2730
$(TR $(TH Function Name) $(TH Description))
2831
@@ -1894,7 +1897,7 @@ version(mir_test) unittest
18941897
}
18951898

18961899
/++
1897-
Cycle creates 1-dimensional slice over the range.
1900+
Cycle repeates 1-dimensional field/range/array/slice in a fixed length 1-dimensional slice.
18981901
+/
18991902
auto cycle(Field)(Field field, size_t loopLength, size_t length)
19001903
if (!isSlice!Field && !is(Field : T[], T))

test_examples.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -euo pipefail
44

5-
if [ ! -e test_extractor.d ] ; then
6-
wget https://raw.githubusercontent.com/dlang/tools/6b7ef76d679563e6fccef2a6b437008d96459e95/tests_extractor.d
7-
fi
5+
dub fetch dtools
86

97
# extract examples
10-
dub ./tests_extractor.d -i source -o out
8+
dub run dtools:tests_extractor -- -i source -o out
119

1210
# compile the examples
1311
for file in $(find out -name "*.d") ; do

0 commit comments

Comments
 (0)