Merge pull request #16 from libmir/ShigekiKarita-patch-x86

fix x86 test falures
libmir · Sep 29, 2017 · 5678bc4 · 5678bc4
2 parents 3a87d4b + aa93d80
commit 5678bc4
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,11 @@ d:
 env:
   - ARCH="x86_64"
 
+matrix:
+  include:
+    - {os: linux, d: ldc, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
+    - {os: linux, d: dmd, env: ARCH="x86", addons: {apt: {packages: [[gcc-multilib]]}}}
+
 before_install:
   - sudo apt-get install -qq python-numpy
   - cd test && python test_npy_fileio.py && cd ..

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: doc test clean
+.PHONY: doc test test-ldc clean
 
 
 clean:
@@ -20,12 +20,17 @@ hmod:
 	hmod --exclude numir.old ./source
 	mv doc docs
 
-test/a1_f4.npy: test/npy_test.py
+test/a1_f4.npy: test/test_npy_fileio.py
+	cd test && python test_npy_fileio.py && cd ..
 
-test:
-	dub test --build=unittest-cov --compiler=dmd
+test: test/a1_f4.npy
+	dub test --build=unittest-cov --compiler=dmd --arch=x86
+	tail -n 1 source-numir*.lst
+	dub test --build=unittest-cov --compiler=dmd --arch=x86
 	tail -n 1 source-numir*.lst
 
-test-ldc:
+test-ldc: test/a1_f4.npy
 	dub test --build=unittest-cov --compiler=ldc2
 	tail -n 1 source-numir*.lst
+	dub test --build=unittest-cov --compiler=dmd --arch=x86
+	tail -n 1 source-numir*.lst
diff --git a/appveyor.yml b/appveyor.yml
@@ -11,6 +11,16 @@ environment:
     arch: x64
     PYTHON_VERSION: 3.6
     MINICONDA: C:\Miniconda3
+  - DC: dmd
+    DVersion: stable
+    arch: x86
+    PYTHON_VERSION: 3.6
+    MINICONDA: C:\Miniconda3
+  - DC: ldc
+    DVersion: stable
+    arch: x86
+    PYTHON_VERSION: 3.6
+    MINICONDA: C:\Miniconda3
 
 skip_tags: false
 branches:

diff --git a/source/numir/io.d b/source/numir/io.d
@@ -98,7 +98,7 @@ immutable npyfmt = "{'descr': '%s', 'fortran_order': %s, 'shape': (%s), }";
 struct NpyHeaderInfo(size_t N)
 {
     string descr;
-    long[N] shape;
+    ptrdiff_t[N] shape;
 }
 
 

diff --git a/source/numir/random.d b/source/numir/random.d
@@ -120,6 +120,7 @@ auto permutation(T...)(T t) {
 unittest {
     import numir : arange;
     import mir.ndslice.sorting : sort;
+    import numir.testing : approxEqual;
     import std.stdio;
     auto ps1 = permutation(100);
     auto ps2 = permutation(100);
@@ -129,5 +130,5 @@ unittest {
     auto ps3 = permutation(1, 10, 0.1);
     auto ps4 = permutation(1, 10, 0.1);
     assert(ps3 != ps4);
-    assert(ps4.sort() == arange(1, 10, 0.1));
+    assert(ps4.sort.approxEqual(arange(1, 10, 0.1)));
 }