Merge pull request apache#102 from oist/vc/test

Exclude division test for Float16
iblislin · Jun 7, 2016 · 1940a68 · 1940a68
2 parents a80ae98 + 9a827f7
commit 1940a68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -30,8 +30,14 @@ if !libmxnet_detected
 
   openblas_path = Libdl.dlpath(Libdl.dlopen(Base.libblas_name))
 
+  if VERSION >= v"0.5.0-dev+4338"
+    blas_vendor = Base.BLAS.vendor()
+  else
+    blas_vendor = Base.blas_vendor()
+  end
+
   ilp64 = ""
-  if Base.blas_vendor() == :openblas64
+  if blas_vendor == :openblas64
     ilp64 = "-DINTERFACE64"
   end
 

diff --git a/test/unittest/bind.jl b/test/unittest/bind.jl
@@ -59,7 +59,11 @@ function test_arithmetic()
     test_arithmetic(T, .+, (g,x,y) -> (g,g))
     test_arithmetic(T, .-, (g,x,y) -> (g,-g))
     test_arithmetic(T, .*, (g,x,y) -> (y.*g, x.*g))
-    T <: Integer || test_arithmetic(T, ./, (g,x,y) -> (g ./ y, -x .* g ./ (y.^2)))
+    if T <: Integer || T == Float16
+      warn("Not running division test for $T")
+    else
+      test_arithmetic(T, ./, (g,x,y) -> (g ./ y, -x .* g ./ (y.^2)))
+    end
   end
 end