build: make appending lib to MXNET_HOME optional (#386)

The MXNet shared libraries are not necessarily in a lib subdirectory.
dmlc · Dec 19, 2017 · 883cdd3 · 883cdd3
1 parent cb443b7
commit 883cdd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -8,10 +8,11 @@ libmxnet_curr_ver = get(ENV, "MXNET_COMMIT", "master")
 curr_win = "20171019"  # v0.12.0
 
 if haskey(ENV, "MXNET_HOME")
-  info("MXNET_HOME environment detected: $(ENV["MXNET_HOME"])")
+  MXNET_HOME = ENV["MXNET_HOME"]
+  info("MXNET_HOME environment detected: $MXNET_HOME")
   info("Trying to load existing libmxnet...")
   lib = Libdl.find_library("libmxnet.$(Libdl.dlext)",
-                           ["$(ENV["MXNET_HOME"])/lib"])
+                           [joinpath(MXNET_HOME, "lib"), MXNET_HOME])
   if !isempty(lib)
     info("Existing libmxnet detected at $lib, skip building...")
     libmxnet_detected = true

diff --git a/src/base.jl b/src/base.jl
@@ -32,6 +32,7 @@ const grad_req_map = Dict{Symbol,GRAD_REQ}(
 ################################################################################
 const MXNET_LIB = Libdl.find_library("libmxnet.$(Libdl.dlext)",
                                      [joinpath(get(ENV, "MXNET_HOME", ""), "lib"),
+                                      get(ENV, "MXNET_HOME", ""),
                                       Pkg.dir("MXNet", "deps", "usr", "lib")])
 if isempty(MXNET_LIB)
   # touch this file, so that after the user properly build libmxnet, the precompiled