You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ib...@apache.org on 2019/09/11 09:32:57 UTC

[incubator-mxnet] branch ib/backport-jl created (now aa3677d)

This is an automated email from the ASF dual-hosted git repository.

iblis pushed a change to branch ib/backport-jl
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git.


      at aa3677d  update julia install doc (#15609)

This branch includes the following new commits:

     new a7f52ee  julia: bump window prebult binary version to v1.5.0 (#15608)
     new aa3677d  update julia install doc (#15609)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-mxnet] 02/02: update julia install doc (#15609)

Posted by ib...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

iblis pushed a commit to branch ib/backport-jl
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git

commit aa3677d05f8a67a9f90c35f17217cf2763ac29dd
Author: Ksoy <ks...@gmail.com>
AuthorDate: Wed Jul 31 09:58:03 2019 +0800

    update julia install doc (#15609)
---
 docs/install/index.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/docs/install/index.md b/docs/install/index.md
index d2bd24e..82cc573 100644
--- a/docs/install/index.md
+++ b/docs/install/index.md
@@ -108,7 +108,22 @@ Indicate your preferred configuration. Then, follow the customized commands to i
 </div>
 </div>
 </div>
+
+<!-- Linux Julia Options -->
+
+<div class="linux macos windows">
+<div class="julia">
+<div class="cpu gpu">
+<div class="btn-group opt-group" role="group">
+  <button type="button" class="btn btn-default environs opt active">Pkg</button>
+  <button type="button" class="btn btn-default environs opt">Build from Source</button>
+</div>
+</div>
+</div>
+</div>
+
 <hr>
+
 <!-- END - Main Menu -->
 
 <!-- START - Linux Python CPU Installation Instructions -->
@@ -582,8 +597,23 @@ You can use the Maven packages defined in the following dependency to include MX
 <div class="julia">
 <div class="cpu gpu">
 </br>
+<div class="pkg">
+
+```
+]add MXNet#v1.5.0
+```
+
+Install the latest release:
+
+```
+]add MXNet
+```
+
+</div>
+<div class="build-from-source">
 Refer to the <a href="ubuntu_setup.html#install-the-mxnet-package-for-julia">Julia section of the MXNet Ubuntu installation guide</a>.
 
+</div>
 </div> <!-- End of cpu gpu -->
 </div> <!-- End of julia -->
 
@@ -593,7 +623,7 @@ Refer to the <a href="ubuntu_setup.html#install-the-mxnet-package-for-julia">Jul
 Refer to the <a href="ubuntu_setup.html#install-the-mxnet-package-for-perl">Perl section of the MXNet Ubuntu installation guide</a>.
 
 </div> <!-- End of cpu gpu -->
-</div> <!-- End of julia -->
+</div> <!-- End of perl -->
 
 
 
@@ -884,8 +914,23 @@ Not available at this time. <br>
 <div class="julia">
 <div class="cpu gpu">
 </br>
+<div class="pkg">
+
+```
+]add MXNet#v1.5.0
+```
+
+Install the latest release:
+
+```
+]add MXNet
+```
+
+</div>
+<div class="build-from-source">
 Refer to the <a href="osx_setup.html#install-the-mxnet-package-for-julia">Julia section of the MXNet macOS installation guide</a>.
 
+</div>
 </div> <!-- End of cpu gpu -->
 </div> <!-- End of julia -->
 
@@ -1226,8 +1271,23 @@ MXNet-Java for Windows is not yet available.
 <div class="julia">
 <div class="cpu gpu">
 </br>
+<div class="pkg">
+
+```
+]add MXNet#v1.5.0
+```
+
+Install the latest release:
+
+```
+]add MXNet
+```
+
+</div>
+<div class="build-from-source">
 Refer to the <a href="windows_setup.html#install-the-mxnet-package-for-julia">Julia section of the MXNet Windows installation guide</a>.
 
+</div>
 </div> <!-- End of cpu gpu -->
 </div> <!-- End of julia -->
 
@@ -1237,7 +1297,7 @@ Refer to the <a href="windows_setup.html#install-the-mxnet-package-for-julia">Ju
 Refer to the <a href="windows_setup.html#install-the-mxnet-package-for-perl">Perl section of the MXNet Windows installation guide</a>.
 
 </div> <!-- End of cpu gpu -->
-</div> <!-- End of julia -->
+</div> <!-- End of perl -->
 
 <div class="cpp">
 <div class="cpu gpu">


[incubator-mxnet] 01/02: julia: bump window prebult binary version to v1.5.0 (#15608)

Posted by ib...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

iblis pushed a commit to branch ib/backport-jl
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git

commit a7f52ee2b8a2e301fac347da9a079902b07342f6
Author: Iblis Lin <ib...@hs.ntnu.edu.tw>
AuthorDate: Sat Jul 20 22:17:43 2019 +0800

    julia: bump window prebult binary version to v1.5.0 (#15608)
    
    - remove file REQUIRE, it's stale for Pkg3.jl
---
 julia/REQUIRE       |  6 ------
 julia/deps/build.jl | 16 ++++++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/julia/REQUIRE b/julia/REQUIRE
deleted file mode 100644
index 8008da3..0000000
--- a/julia/REQUIRE
+++ /dev/null
@@ -1,6 +0,0 @@
-julia 0.7
-Formatting
-BinDeps
-JSON
-MacroTools
-Reexport
diff --git a/julia/deps/build.jl b/julia/deps/build.jl
index badca65..a87343d 100644
--- a/julia/deps/build.jl
+++ b/julia/deps/build.jl
@@ -24,7 +24,7 @@ using LinearAlgebra
 ################################################################################
 libmxnet_detected = false
 libmxnet_curr_ver = get(ENV, "MXNET_COMMIT", "master")
-curr_win = "20180211"  # v1.1.0
+curr_win = "20190608"  # v1.5.0
 
 if haskey(ENV, "MXNET_HOME")
   MXNET_HOME = ENV["MXNET_HOME"]
@@ -119,21 +119,25 @@ if !libmxnet_detected
     base_url = "https://github.com/yajiedesign/mxnet/releases/download/weekly_binary_build_v2/prebuildbase_win10_x64_vc14_v2.7z"
 
     if libmxnet_curr_ver == "master"
+      _cmd = "{
+        [System.Net.ServicePointManager]::SecurityProtocol='tls12';
+        Invoke-WebRequest -Uri 'https://api.github.com/repos/yajiedesign/mxnet/releases/latest'
+        -OutFile 'mxnet.json'}"
       # download_cmd uses powershell 2, but we need powershell 3 to do this
-      run(`powershell -NoProfile -Command Invoke-WebRequest -Uri "https://api.github.com/repos/yajiedesign/mxnet/releases/latest" -OutFile "mxnet.json"`)
+      run(`powershell -NoProfile -Command $_cmd`)
       curr_win = JSON.parsefile("mxnet.json")["tag_name"]
       @info("Can't use MXNet master on Windows, using latest binaries from $curr_win.")
     end
     # TODO: Get url from JSON.
-    name = "mxnet_x64_vc14_$(HAS_CUDA ? "gpu" : "cpu").7z"
+    # TODO: detect cuda version and select corresponding url.
+    name = "mxnet_x64_$(HAS_CUDA ? "vc141_gpu_cu101" : "vc14_cpu").7z"
     package_url = "https://github.com/yajiedesign/mxnet/releases/download/$(curr_win)/$(curr_win)_$(name)"
 
-    exe7z = joinpath(JULIA_HOME, "7z.exe")
+    exe7z = joinpath(Sys.BINDIR, "7z.exe")
 
     run(download_cmd(package_url, "mxnet.7z"))
     # this command will create the dir "usr\\lib"
-    run(`$exe7z x mxnet.7z build lib -y -ousr`)
-    run(`cmd /c copy "usr\\build\\*.dll" "usr\\lib"`)
+    run(`$exe7z e mxnet.7z *\\build\\* *\\lib\\* -y -ousr\\lib`)
 
     run(download_cmd(base_url, "mxnet_base.7z"))
     run(`$exe7z x mxnet_base.7z -y -ousr`)