Merge pull request #37 from libmir/upgradedeps

upgrade dependencies

.travis.yml

@@ -37,7 +37,7 @@ before_install:
     fi    
 
 script:
-  - dub test --arch "$ARCH" --build=unittest-cov
+  - dub test --arch "$ARCH" --build=unittest-python-cov
   # FIXME libcurl not found in 32bit
   - if [ $ARCH = "x86_64" ]; then
       wget https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-64bit-static.tar.xz;

appveyor.yml

@@ -116,4 +116,4 @@ test_script:
  - echo %PATH%
  - '%DC% --version'
  - cd test && python test_npy_fileio.py && cd ..
- - dub test --arch=%Darch% --build=unittest-cov
+ - dub test --arch=%Darch% --build=unittest-python-cov

dub.json

@@ -7,8 +7,7 @@
     ],
     "description": "numpy-like API wrappers of mir",
     "dependencies": {
-        "mir-algorithm": "~>2.0.1",
-        "mir-random": "~>1.0.0"
+        "mir-random": "~>2.0.0"
     },
     "copyright": "Copyright © 2017, karita",
     "license": "BSL-1.0",
@@ -18,25 +17,23 @@
         "--unittest-examples"
     ],
     "buildTypes": {
-        "unittest": {
+        "unittest-python": {
             "buildOptions": ["unittests", "debugMode", "debugInfo"],
-            "versions": ["mir_test"],
             "preBuildCommands": ["cd test && python test_npy_fileio.py || true ; cd .."]
         },
-        "unittest-cov": {
+        "unittest-python-cov": {
             "buildOptions": ["unittests", "coverage", "debugMode", "debugInfo"],
-            "versions": ["mir_test"],
             "preBuildCommands": ["cd test && python test_npy_fileio.py || true ; cd .."]
-	}
+	    }
     },
     "configurations": [
-	{
-	    "name": "library",
-	    "targetType": "library"
-	},
-	{
-	    "name": "sourceLibrary",
-	    "targetType": "sourceLibrary"
-	}
-    ],
+        {
+            "name": "library",
+            "targetType": "library"
+        },
+        {
+            "name": "sourceLibrary",
+            "targetType": "sourceLibrary"
+        }
+    ]
 }

source/numir/core/creation.d

@@ -117,7 +117,7 @@ auto ones(E = double, size_t N)(size_t[N] lengths...) pure
 ///
 unittest
 {
-    import mir.ndslice.algorithm : all;
+    import mir.algorithm.iteration : all;
 
     //  -------
     // | 1 1 1 |
@@ -177,7 +177,7 @@ auto zeros(E = double, size_t N)(size_t[N] lengths...) pure
 ///
 unittest
 {
-    import mir.ndslice.algorithm : all;
+    import mir.algorithm.iteration : all;
 
     //  -------
     // | 0 0 0 |

source/numir/core/manipulation.d

@@ -218,7 +218,7 @@ TODO:
 +/
 auto resize(S)(S s, size_t size) pure if (isSlice!S)
 out(ret) {
-    import mir.ndslice.algorithm : all;
+    import mir.algorithm.iteration : all;
     assert(ret.length == size);
     if (s.length < size) assert(ret[s.length .. $].all!"a == 0");
 } do {

source/numir/core/package.d

@@ -52,7 +52,7 @@ unittest
     */
 
     import mir.ndslice.slice : sliced, DeepElementType;
-    import mir.ndslice.algorithm : all;
+    import mir.algorithm.iteration : all;
 
     // np.empty, empty_like
     assert(empty(2 ,3).shape == [2, 3]);

source/numir/random.d

@@ -5,7 +5,6 @@ module numir.random;
 
 import std.algorithm : fold;
 import mir.random : unpredictableSeed, Random;
-import mir.random.algorithm : range;
 import mir.random.variable : UniformVariable, NormalVariable;
 import mir.ndslice: slicedField, slice;
 
@@ -29,13 +28,6 @@ class RNG
         return *_rng;
     }
 
-    ///
-    static auto field(V)(V var)
-    {
-        import mir.random.algorithm : field;
-        return field(this.get, var);
-    }
-
     ///
     static void setSeed(uint seed)
     {
@@ -65,7 +57,8 @@ unittest
 /// general function for random slice generation with global RNG
 auto generate(V, size_t N)(V var, size_t[N] length...)
 {
-    return RNG.field(var).slicedField(length);
+    import mir.random.algorithm: randomSlice;
+    return RNG.get.randomSlice(var, length);
 }
 
 ///

source/numir/stats.d

@@ -148,7 +148,7 @@ pure nothrow @safe
 unittest
 {
     import numir.core : alongDim;
-    import mir.ndslice : map, sliced, byDim, iota, slice;
+    import mir.ndslice : map, byDim, iota, slice, sliced;
 
     // sorted cases
     assert(iota(5).median == 2);
@@ -285,7 +285,7 @@ unittest
 
     //Set sum algorithm or output type
     static immutable a = [1, 1e100, 1, -1e100];
-    auto x = a.sliced.map!"a * 10_000";
+    auto x = a.sliced * 10_000;
     assert(x.mean!"kbn" == 20_000 / 4);
     assert(x.mean!"kb2" == 20_000 / 4);
     assert(x.mean!"precise" == 20_000 / 4);
@@ -576,7 +576,7 @@ unittest
 
     //Set sum algorithm or output type
     static immutable _x = [1, 1e100, 1, -1e100];
-    auto x = _x.sliced.map!"a * 10_000";
+    auto x = _x.sliced * 10_000;
     assert(approxEqual(x.hmean!"kbn", 20_000));
     assert(approxEqual(x.hmean!"kb2", 20_000));
     assert(approxEqual(x.hmean!"precise", 20_000));
@@ -1197,7 +1197,8 @@ unittest
 {
     // logsumexp example from doctest https://github.com/scipy/scipy/blob/maintenance/1.0.x/scipy/special/_logsumexp.py
     import mir.ndslice : iota, map, sliced, as;
-    import mir.math : sum, log, exp;
+    import mir.math.common : log, exp;
+    import mir.math.sum;
     import std.math : approxEqual;
     {
         auto x = iota(10).as!double;