Merge branch 'master' into stable

dmlc · Jan 29, 2017 · e599d51 · e599d51
2 parents 0619b55 + 79d80b6
commit e599d51
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -40,7 +40,6 @@ if !libmxnet_detected
 
     run(download_cmd(base_url, "mxnet_base.7z"))
     run(`7z x mxnet_base.7z -y -ousr`)
-    run(`usr\\setupenv.cmd`)
     run(`cmd /c copy "usr\\3rdparty\\openblas\\bin\\*.dll" "usr\\lib"`)
 
     run(download_cmd(package_url, "mxnet.7z"))

diff --git a/src/base.jl b/src/base.jl
@@ -18,7 +18,7 @@ typealias char_pp Ptr{char_p}
 ################################################################################
 const MXNET_LIB = Libdl.find_library(["libmxnet.so","libmxnet.dll"],
                                      [joinpath("$(get(ENV,"MXNET_HOME",""))","lib"),
-                                      joinpath(Pkg.dir("MXNet"),"deps/usr/lib")])
+                                      Pkg.dir("MXNet","deps","usr","lib")])
 if isempty(MXNET_LIB)
   # touch this file, so that after the user properly build libmxnet, the precompiled
   # MXNet.ji will be re-compiled to get MXNET_LIB properly.