From affebe675eaa4761475768ed5386439f5d828dd1 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Tue, 7 Jun 2016 11:35:32 +0900
Subject: [PATCH 1/2] Exclude division test for Float16

---
 test/unittest/bind.jl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/unittest/bind.jl b/test/unittest/bind.jl
index 64ae2cd95592..c764435d5a9c 100644
--- 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
 

From 9a827f796a2d574c68d87f359c679c1ccc1a50ad Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Tue, 7 Jun 2016 11:43:52 +0900
Subject: [PATCH 2/2] fix blas_vendor for v0.5

---
 deps/build.jl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/deps/build.jl b/deps/build.jl
index e0e0a0e1388f..9449c6337102 100644
--- 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