[incubator-mxnet] branch ib/ci-jl-win updated: add stage test_windows_julia07_cpu
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 48c43b9 add stage test_windows_julia07_cpu 48c43b9 is described below commit 48c43b99cd9dd455c29dc3aeaf86d31b7600a4c6 Author: Iblis Lin AuthorDate: Sun Jan 20 18:15:08 2019 +0800 add stage test_windows_julia07_cpu --- ci/jenkins/Jenkinsfile_windows_cpu | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/Jenkinsfile_windows_cpu b/ci/jenkins/Jenkinsfile_windows_cpu index a8746db..d32b80c 100644 --- a/ci/jenkins/Jenkinsfile_windows_cpu +++ b/ci/jenkins/Jenkinsfile_windows_cpu @@ -35,12 +35,13 @@ utils.main_wrapper( core_logic: { utils.parallel_stage('Build', [ custom_steps.compile_windows_cpu() - ]) + ]) utils.parallel_stage('Tests', [ custom_steps.test_windows_python2_cpu(), -custom_steps.test_windows_python3_cpu() - ]) +custom_steps.test_windows_python3_cpu(), +custom_steps.test_windows_julia07_cpu() + ]) } , failure_handler: {
[incubator-mxnet] branch ib/ci-jl-win updated: fix download
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new f5f6037 fix download f5f6037 is described below commit f5f6037755b62220ec9ec1efd2eec70c7229d43a Author: Iblis Lin AuthorDate: Sun Jan 20 19:45:32 2019 +0800 fix download --- ci/windows/test_jl07_cpu.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 8bda88f..87554b8 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -25,6 +25,7 @@ $env:JULIA_DEPOT_PATH=[io.path]::combine($PSScriptRoot, 'julia-depot') New-item -ItemType Directory C:\julia07 # Download most recent Julia Windows binary +[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 (New-Object System.Net.WebClient).DownloadFile($env:JULIA_URL, "C:\julia07\julia-binary.exe") if (! $?) { Throw ("Error on downloading Julia Windows binary") }
[incubator-mxnet] branch ib/ci-jl-win updated (d538e91 -> 7c9b8d7)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard d538e91 Julia: add windows-cpu build new 7c9b8d7 Julia: add windows-cpu build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d538e91) \ N -- N -- N refs/heads/ib/ci-jl-win (7c9b8d7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9191 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. Summary of changes: ci/windows/test_jl07_cpu.ps1 | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[incubator-mxnet] branch ib/ci-jl-win updated: fix download
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new e4788af fix download e4788af is described below commit e4788af14a22fddec42b6d570d037d41641ffb7f Author: Iblis Lin AuthorDate: Sun Jan 20 19:12:29 2019 +0800 fix download --- ci/windows/test_jl07_cpu.ps1 | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 8152c30..8bda88f 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -21,13 +21,21 @@ $env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') $env:JULIA_URL="https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; $env:JULIA_DEPOT_PATH=[io.path]::combine($PSScriptRoot, 'julia-depot') +# mkdir +New-item -ItemType Directory C:\julia07 + # Download most recent Julia Windows binary -(new-object net.webclient).DownloadFile($env:JULIA_URL, "C:\julia07\julia-binary.exe") +(New-Object System.Net.WebClient).DownloadFile($env:JULIA_URL, "C:\julia07\julia-binary.exe") +if (! $?) { Throw ("Error on downloading Julia Windows binary") } # Run installer silently, output to C:\julia07\julia C:\julia07\julia-binary.exe /S /D=C:\julia07\julia +if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" C:\julia07\julia\bin\julia -e "using Pkg; Pkg.develop(PackageSpec(name = \"MXNet\", path = \"julia\"))" +if (! $?) { Throw ("Error on installing MXNet") } C:\julia07\julia\bin\julia -e "using Pkg; Pkg.build(\"MXNet\"))" +if (! $?) { Throw ("Error on building MXNet") } C:\julia07\julia\bin\julia -e "using Pkg; Pkg.test(\"MXNet\"))" +if (! $?) { Throw ("Error on testing") }
[incubator-mxnet] branch ib/ci-jl-win updated: fix installation
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new e075b61 fix installation e075b61 is described below commit e075b61e460ca0da0adc40aa80e862e2f650df5e Author: Iblis Lin AuthorDate: Sun Jan 20 20:12:57 2019 +0800 fix installation --- ci/windows/test_jl07_cpu.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 87554b8..7e6fa2e 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -30,7 +30,7 @@ New-item -ItemType Directory C:\julia07 if (! $?) { Throw ("Error on downloading Julia Windows binary") } # Run installer silently, output to C:\julia07\julia -C:\julia07\julia-binary.exe /S /D=C:\julia07\julia +Start-Process -Wait "C:\julia07\julia-binary.exe" -ArgumentList "/S /D=C:\julia07\julia" if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()"
[incubator-mxnet] branch ib/ci-jl-win updated: fix installation
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new f56ed38 fix installation f56ed38 is described below commit f56ed3892ffe0f5fc96638f95cf56a1d576a6ebf Author: Iblis Lin AuthorDate: Mon Jan 21 00:38:06 2019 +0800 fix installation --- ci/windows/test_jl07_cpu.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index a867372..cc8b77f 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -30,7 +30,7 @@ $JULIA = "$JULIA_DIR\bin\julia" if (! $?) { Throw ("Error on downloading Julia Windows binary") } # Run installer silently, output to C:\julia07\julia -Start-Process -Wait "$JULIA_DIR\julia-binary.exe" -ArgumentList "/S /D=$JULIA_DIR" +Start-Process -Wait "julia-binary.exe" -ArgumentList "/S /D=$JULIA_DIR" if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()"
[incubator-mxnet] branch ib/ci-jl-win updated: fix command
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 6e987b6 fix command 6e987b6 is described below commit 6e987b641086e48e26757e5bd85d9e25af3de582 Author: Iblis Lin AuthorDate: Mon Jan 21 00:27:48 2019 +0800 fix command --- ci/windows/test_jl07_cpu.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 4c90263..a867372 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -34,9 +34,9 @@ Start-Process -Wait "$JULIA_DIR\julia-binary.exe" -ArgumentList "/S /D=$JULIA_DI if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" -echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | $JULIA +echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | & $JULIA if (! $?) { Throw ("Error on installing MXNet") } -echo 'using Pkg; Pkg.build("MXNet")' | $JULIA +echo 'using Pkg; Pkg.build("MXNet")' | & $JULIA if (! $?) { Throw ("Error on building MXNet") } -echo 'using Pkg; Pkg.test("MXNet")' | $JULIA +echo 'using Pkg; Pkg.test("MXNet")' | & $JULIA if (! $?) { Throw ("Error on testing") }
[incubator-mxnet] branch ib/ci-jl-win updated: fix build script
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 9ce758f fix build script 9ce758f is described below commit 9ce758f6e7efe3d9db99101b956520e74e1e Author: Iblis Lin AuthorDate: Sun Jan 20 21:01:00 2019 +0800 fix build script --- ci/windows/test_jl07_cpu.ps1 | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 7e6fa2e..6158862 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -21,6 +21,9 @@ $env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') $env:JULIA_URL="https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; $env:JULIA_DEPOT_PATH=[io.path]::combine($PSScriptRoot, 'julia-depot') +# rm -rf +Remove-item -Recurse -Force -ErrorAction Ignore C:\julia07 + # mkdir New-item -ItemType Directory C:\julia07 @@ -34,9 +37,9 @@ Start-Process -Wait "C:\julia07\julia-binary.exe" -ArgumentList "/S /D=C:\julia0 if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" -C:\julia07\julia\bin\julia -e "using Pkg; Pkg.develop(PackageSpec(name = \"MXNet\", path = \"julia\"))" +echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | C:\julia07\julia\bin\julia if (! $?) { Throw ("Error on installing MXNet") } -C:\julia07\julia\bin\julia -e "using Pkg; Pkg.build(\"MXNet\"))" +echo 'using Pkg; Pkg.build("MXNet"))' | C:\julia07\julia\bin\julia if (! $?) { Throw ("Error on building MXNet") } -C:\julia07\julia\bin\julia -e "using Pkg; Pkg.test(\"MXNet\"))" +echo 'using Pkg; Pkg.test("MXNet"))' | C:\julia07\julia\bin\julia if (! $?) { Throw ("Error on testing") }
[incubator-mxnet] branch ib/ci-jl-win updated: download julia binary and install to local workspace
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 58c473f download julia binary and install to local workspace 58c473f is described below commit 58c473fb5860c436974187f0ebe3ee1407fc8f5d Author: Iblis Lin AuthorDate: Sun Jan 20 21:31:00 2019 +0800 download julia binary and install to local workspace --- ci/windows/test_jl07_cpu.ps1 | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 6158862..4c90263 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -21,25 +21,22 @@ $env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') $env:JULIA_URL="https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; $env:JULIA_DEPOT_PATH=[io.path]::combine($PSScriptRoot, 'julia-depot') -# rm -rf -Remove-item -Recurse -Force -ErrorAction Ignore C:\julia07 - -# mkdir -New-item -ItemType Directory C:\julia07 +$JULIA_DIR = [System.IO.Path]::GetFullPath(".\julia07") +$JULIA = "$JULIA_DIR\bin\julia" # Download most recent Julia Windows binary [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 -(New-Object System.Net.WebClient).DownloadFile($env:JULIA_URL, "C:\julia07\julia-binary.exe") +(New-Object System.Net.WebClient).DownloadFile($env:JULIA_URL, "julia-binary.exe") if (! $?) { Throw ("Error on downloading Julia Windows binary") } # Run installer silently, output to C:\julia07\julia -Start-Process -Wait "C:\julia07\julia-binary.exe" -ArgumentList "/S /D=C:\julia07\julia" +Start-Process -Wait "$JULIA_DIR\julia-binary.exe" -ArgumentList "/S /D=$JULIA_DIR" if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" -echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | C:\julia07\julia\bin\julia +echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | $JULIA if (! $?) { Throw ("Error on installing MXNet") } -echo 'using Pkg; Pkg.build("MXNet"))' | C:\julia07\julia\bin\julia +echo 'using Pkg; Pkg.build("MXNet")' | $JULIA if (! $?) { Throw ("Error on building MXNet") } -echo 'using Pkg; Pkg.test("MXNet"))' | C:\julia07\julia\bin\julia +echo 'using Pkg; Pkg.test("MXNet")' | $JULIA if (! $?) { Throw ("Error on testing") }
[incubator-mxnet] branch ib/ci-jl-win updated: fix installation
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new beb5745 fix installation beb5745 is described below commit beb57457dff76017c0380d0462fdc1594a7e8534 Author: Iblis Lin AuthorDate: Mon Jan 21 01:02:19 2019 +0800 fix installation --- ci/windows/test_jl07_cpu.ps1 | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index cc8b77f..b847ef5 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -17,9 +17,9 @@ 7z x -y windows_package.7z -$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home') -$env:JULIA_URL="https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; -$env:JULIA_DEPOT_PATH=[io.path]::combine($PSScriptRoot, 'julia-depot') +$env:MXNET_HOME = [io.path]::combine($PSScriptRoot, 'mxnet_home') +$env:JULIA_URL = "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; +$env:JULIA_DEPOT_PATH = [io.path]::combine($PSScriptRoot, 'julia-depot') $JULIA_DIR = [System.IO.Path]::GetFullPath(".\julia07") $JULIA = "$JULIA_DIR\bin\julia" @@ -34,9 +34,15 @@ Start-Process -Wait "julia-binary.exe" -ArgumentList "/S /D=$JULIA_DIR" if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" + +# Pkg.add a dummy package to workaround Pkg3's bug +echo 'using Pkg; Pkg.add("Example")' | & $JULIA + echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | & $JULIA if (! $?) { Throw ("Error on installing MXNet") } + echo 'using Pkg; Pkg.build("MXNet")' | & $JULIA if (! $?) { Throw ("Error on building MXNet") } + echo 'using Pkg; Pkg.test("MXNet")' | & $JULIA if (! $?) { Throw ("Error on testing") }
[incubator-mxnet] branch ib/ci-jl-win updated: debug
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 1d3f2d0 debug 1d3f2d0 is described below commit 1d3f2d0f4bc13146833c2aa27fb147a0c5a68f8c Author: Iblis Lin AuthorDate: Mon Jan 21 10:50:46 2019 +0800 debug --- ci/windows/test_jl07_cpu.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index b847ef5..01d782c 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -38,6 +38,7 @@ C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" # Pkg.add a dummy package to workaround Pkg3's bug echo 'using Pkg; Pkg.add("Example")' | & $JULIA +pwd echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | & $JULIA if (! $?) { Throw ("Error on installing MXNet") }
[incubator-mxnet] branch ib/ci-jl-win updated: debug
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new debcba4 debug debcba4 is described below commit debcba4b339fd57124560fcff5abf76798fa83c8 Author: Iblis Lin AuthorDate: Mon Jan 21 11:34:31 2019 +0800 debug --- ci/windows/test_jl07_cpu.ps1 | 32 ++-- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 01d782c..35c1c61 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -17,11 +17,14 @@ 7z x -y windows_package.7z -$env:MXNET_HOME = [io.path]::combine($PSScriptRoot, 'mxnet_home') +# set default output encoding to utf8 +$PSDefaultParameterValues['Out-File:Encoding'] = 'utf8' + +$env:MXNET_HOME = [System.IO.Path]::GetFullPath('.') $env:JULIA_URL = "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; -$env:JULIA_DEPOT_PATH = [io.path]::combine($PSScriptRoot, 'julia-depot') +$env:JULIA_DEPOT_PATH = [System.IO.Path]::GetFullPath('.\julia-depot') -$JULIA_DIR = [System.IO.Path]::GetFullPath(".\julia07") +$JULIA_DIR = [System.IO.Path]::GetFullPath('.\julia07') $JULIA = "$JULIA_DIR\bin\julia" # Download most recent Julia Windows binary @@ -35,15 +38,16 @@ if (! $?) { Throw ("Error on installing Julia") } C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" -# Pkg.add a dummy package to workaround Pkg3's bug -echo 'using Pkg; Pkg.add("Example")' | & $JULIA - pwd -echo 'using Pkg; Pkg.develop(PackageSpec(name = "MXNet", path = "julia"))' | & $JULIA -if (! $?) { Throw ("Error on installing MXNet") } - -echo 'using Pkg; Pkg.build("MXNet")' | & $JULIA -if (! $?) { Throw ("Error on building MXNet") } - -echo 'using Pkg; Pkg.test("MXNet")' | & $JULIA -if (! $?) { Throw ("Error on testing") } +dir # path issue? + +$src=' +using Pkg +Pkg.develop(PackageSpec(name = "MXNet", path = "julia")) +Pkg.build("MXNet") +Pkg.test("MXNet") +' + +$src > .\ci-build.jl +& $JULIA .\ci-build.jl +if (! $?) { Throw ("Error") }
[incubator-mxnet] 01/01: Julia: fix filename quoting in docstring
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/jl-docstring-render in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit aa2d8fd7db7d931632b5c2d9cfb02c43ab5f826d Author: Iblis Lin AuthorDate: Mon Jan 14 21:08:03 2019 +0800 Julia: fix filename quoting in docstring Quoting filename with backticks to prevent markdown mis-rendering some of them with underscore. --- julia/src/util.jl | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/julia/src/util.jl b/julia/src/util.jl index a836d3e..ae2e50b 100644 --- a/julia/src/util.jl +++ b/julia/src/util.jl @@ -183,15 +183,14 @@ end Extract the line of `Defined in ...` julia> mx._getdocdefine("sgd_update") -"Defined in src/operator/optimizer_op.cc:L53" -``` +"Defined in `src/operator/optimizer_op.cc:L53`" """ function _getdocdefine(name::String) op = _get_libmx_op_handle(name) str = _get_libmx_op_description(name, op)[1] lines = split(str, '\n') - for m ∈ match.(Ref(r"^Defined in .*$"), lines) -m != nothing && return m.match + for m ∈ match.(Ref(r"^Defined in ([\S]+)$"), lines) +m != nothing && return "Defined in `$(m.captures[1])`" end "" end
[incubator-mxnet] branch ib/jl-docstring-render created (now aa2d8fd)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-docstring-render in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at aa2d8fd Julia: fix filename quoting in docstring This branch includes the following new commits: new aa2d8fd Julia: fix filename quoting in docstring The 1 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] branch ib/julia-codeowner deleted (was 5150956)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/julia-codeowner in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 5150956 Add CODEOWNERS for Julia package The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/ci-jl-win updated: fix mxnet_home
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 5675f55 fix mxnet_home 5675f55 is described below commit 5675f55faad03df5e9164faadadd55b53bfd1d10 Author: Iblis Lin AuthorDate: Mon Jan 21 19:26:09 2019 +0800 fix mxnet_home --- ci/windows/test_jl07_cpu.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 6e08fd1..47b0bea 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -20,7 +20,7 @@ # set default output encoding to utf8 $PSDefaultParameterValues['Out-File:Encoding'] = 'utf8' -$env:MXNET_HOME = [System.IO.Path]::GetFullPath('.\mxnet_home') +$env:MXNET_HOME = [System.IO.Path]::GetFullPath('.\windows_package') $env:JULIA_URL = "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; $env:JULIA_DEPOT_PATH = [System.IO.Path]::GetFullPath('.\julia-depot')
[incubator-mxnet] branch ib/ci-jl-win updated: check mxnet_home
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new dc18f84 check mxnet_home dc18f84 is described below commit dc18f846fdb85c23d859ea893f2ff018f1fe39af Author: Iblis Lin AuthorDate: Mon Jan 21 19:04:06 2019 +0800 check mxnet_home --- ci/windows/test_jl07_cpu.ps1 | 5 - julia/deps/build.jl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index f104ab9..6e08fd1 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -20,7 +20,7 @@ # set default output encoding to utf8 $PSDefaultParameterValues['Out-File:Encoding'] = 'utf8' -$env:MXNET_HOME = [System.IO.Path]::GetFullPath('.') +$env:MXNET_HOME = [System.IO.Path]::GetFullPath('.\mxnet_home') $env:JULIA_URL = "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-win64.exe; $env:JULIA_DEPOT_PATH = [System.IO.Path]::GetFullPath('.\julia-depot') @@ -42,6 +42,9 @@ if (! $?) { Throw ("Error on installing Julia") } # use PackageSpec(name = "MXNet", path = "...") if we drop the 0.7 support Copy-Item -Path .\julia -Recurse -Destination "$env:JULIA_DEPOT_PATH\dev\MXNet" +# debug +dir $env:MXNET_HOME + $src=' using Pkg Pkg.develop("MXNet") diff --git a/julia/deps/build.jl b/julia/deps/build.jl index 7a37803..9a719be 100644 --- a/julia/deps/build.jl +++ b/julia/deps/build.jl @@ -86,7 +86,7 @@ if HAS_CUDA if HAS_CUDNN @info("Found a CuDNN installation.") end - @info("CUDA_HOME -> $(get(ENV, "CUDA_HOME", nothing))") + @info("CUDA_HOME -> $(get(ENV, "CUDA_HOME", "nothing"))") else @info("Did not find a CUDA installation, using CPU-only version of MXNet.") end
[incubator-mxnet] branch ib/ci-jl-win updated: fix download of mnist data
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 0116940 fix download of mnist data 0116940 is described below commit 011694014dd0b96fd4644e4342919f09996921b9 Author: Iblis Lin AuthorDate: Mon Jan 21 20:01:48 2019 +0800 fix download of mnist data --- ci/windows/test_jl07_cpu.ps1 | 3 --- julia/src/util.jl| 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 47b0bea..85ff223 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -42,9 +42,6 @@ if (! $?) { Throw ("Error on installing Julia") } # use PackageSpec(name = "MXNet", path = "...") if we drop the 0.7 support Copy-Item -Path .\julia -Recurse -Destination "$env:JULIA_DEPOT_PATH\dev\MXNet" -# debug -dir $env:MXNET_HOME - $src=' using Pkg Pkg.develop("MXNet") diff --git a/julia/src/util.jl b/julia/src/util.jl index ae2e50b..ac7f4fc 100644 --- a/julia/src/util.jl +++ b/julia/src/util.jl @@ -35,12 +35,12 @@ function get_mnist_ubyte() filenames = Dict((x[1] => joinpath(mnist_dir, x[2]) for x ∈ pairs(filenames))) if !all(isfile, values(filenames)) cd(mnist_dir) do - mnist_dir = download("http://data.mxnet.io/mxnet/data/mnist.zip;, "mnist.zip") + data = download("http://data.mxnet.io/mxnet/data/mnist.zip;, "mnist.zip") try - run(`unzip -u $mnist_dir`) + run(`unzip -u $data`) catch try -run(pipe(`7z x $mnist_dir`,stdout = devnull)) +run(pipeline(`7z x $data`,stdout = devnull)) catch error("Extraction Failed:No extraction program found in path") end
[incubator-mxnet] branch ib/ci-jl-win updated: Julia v1.0
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 8f37cf9 Julia v1.0 8f37cf9 is described below commit 8f37cf9afab1a09aa0486ab13703ae9a2371adfa Author: Iblis Lin AuthorDate: Mon Jan 21 22:05:23 2019 +0800 Julia v1.0 --- ci/jenkins/Jenkins_steps.groovy| 26 +- ci/jenkins/Jenkinsfile_windows_cpu | 3 ++- ci/windows/test_jl10_cpu.ps1 | 54 ++ 3 files changed, 69 insertions(+), 14 deletions(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index c582476..a6cc2b2 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -1183,19 +1183,19 @@ def test_windows_julia07_cpu() { }] } -// TODO -// def test_windows_julia10_cpu() { -// return ['Julia 1.0: CPU Win': { -// node(NODE_WINDOWS_CPU) { -// ws('workspace/ut-julia10-cpu') { -// timeout(time: max_time, unit: 'MINUTES') { -// utils.unpack_and_init('cpu', mx_lib) -// utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_julia10', false) -// } -// } -// } -// }] -// } +def test_windows_julia10_cpu() { +return ['Julia 1.0: CPU Win': { + node(NODE_WINDOWS_CPU) { +ws('workspace/ut-julia10-cpu') { + timeout(time: max_time, unit: 'MINUTES') { +utils.init_git_win() +unstash 'windows_package_cpu' +powershell 'ci/windows/test_jl10_cpu.ps1' + } +} + } +}] +} def test_qemu_armv7_cpu() { return ['ARMv7 QEMU': { diff --git a/ci/jenkins/Jenkinsfile_windows_cpu b/ci/jenkins/Jenkinsfile_windows_cpu index d32b80c..5bc40d6 100644 --- a/ci/jenkins/Jenkinsfile_windows_cpu +++ b/ci/jenkins/Jenkinsfile_windows_cpu @@ -40,7 +40,8 @@ core_logic: { utils.parallel_stage('Tests', [ custom_steps.test_windows_python2_cpu(), custom_steps.test_windows_python3_cpu(), -custom_steps.test_windows_julia07_cpu() +custom_steps.test_windows_julia07_cpu(), +custom_steps.test_windows_julia10_cpu() ]) } , diff --git a/ci/windows/test_jl10_cpu.ps1 b/ci/windows/test_jl10_cpu.ps1 new file mode 100644 index 000..4dce827 --- /dev/null +++ b/ci/windows/test_jl10_cpu.ps1 @@ -0,0 +1,54 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +7z x -y windows_package.7z + +# set default output encoding to utf8 +$PSDefaultParameterValues['Out-File:Encoding'] = 'utf8' + +$env:MXNET_HOME = [System.IO.Path]::GetFullPath('.\windows_package') +$env:JULIA_URL = "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0.3-win64.exe; +$env:JULIA_DEPOT_PATH = [System.IO.Path]::GetFullPath('.\julia-depot') + +$JULIA_DIR = [System.IO.Path]::GetFullPath('.\julia10') +$JULIA = "$JULIA_DIR\bin\julia" + +# Download most recent Julia Windows binary +[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 +(New-Object System.Net.WebClient).DownloadFile($env:JULIA_URL, "julia-binary.exe") +if (! $?) { Throw ("Error on downloading Julia Windows binary") } + +# Run installer silently, output to C:\julia10\julia +Start-Process -Wait "julia-binary.exe" -ArgumentList "/S /D=$JULIA_DIR" +if (! $?) { Throw ("Error on installing Julia") } + +& $JULIA -e "using InteractiveUtils; versioninfo()" + +# workaround a bug of Julia 0.7 +# use PackageSpec(name = "MXNet", path = "...") if we drop the 0.7 support +Copy-Item -Path .\julia -Recurse -Destination "$env:JULIA_DEPOT_PATH\dev\MXNet" + +$src=' +using Pkg +Pkg.develop("MXNet") +Pkg.build("MXNet") +Pkg.test("MXNet") +' + +$src > .\ci-build.jl +& $JULIA .\ci-build.jl +if (! $?) { Throw ("Error") }
[incubator-mxnet] branch ib/ci-jl-win updated (b2a4efc -> 298b6ec)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard b2a4efc chcp discard 8f37cf9 Julia v1.0 discard 0116940 fix download of mnist data discard 5675f55 fix mxnet_home discard dc18f84 check mxnet_home discard 1a4bbe1 workaround discard debcba4 debug discard 1d3f2d0 debug discard beb5745 fix installation discard f56ed38 fix installation discard 6e987b6 fix command discard 58c473f download julia binary and install to local workspace discard 9ce758f fix build script discard e075b61 fix installation discard f5f6037 fix download discard e4788af fix download discard 48c43b9 add stage test_windows_julia07_cpu discard 7c9b8d7 Julia: add windows-cpu build new 298b6ec Julia: add windows-cpu build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b2a4efc) \ N -- N -- N refs/heads/ib/ci-jl-win (298b6ec) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9191 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. Summary of changes: ci/windows/test_jl07_cpu.ps1 | 3 --- ci/windows/test_jl10_cpu.ps1 | 3 --- 2 files changed, 6 deletions(-)
[incubator-mxnet] branch master updated: Julia: deprecate `mx.empty`, replace it with `UndefInitializer` (#13934)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new 37b Julia: deprecate `mx.empty`, replace it with `UndefInitializer` (#13934) 37b is described below commit 37b179c0fa603c6c783d24a96406bab94290 Author: Iblis Lin AuthorDate: Mon Jan 21 22:59:13 2019 +0800 Julia: deprecate `mx.empty`, replace it with `UndefInitializer` (#13934) In Julia 0.7+, constructing a uninitialized array is provided via the APIs: - `Array{T,N}(undef, dims...)` - `Array{T,N}(undef, dims)` - `Array{T}(undef, dims...)` - `Array{T}(undef, dims)` There is an API `mx.empty(dims...)` serving for this purpose. This PR proposes that deprecating the original API `mx.empty` and provide the functionality with the API design similar to Julia's Base. - `NDArray{T,N}(undef, dims...)` - `NDArray{T,N}(undef, dims)` - `NDArray{T}(undef, dims...)` - `NDArray{T}(undef, dims)` - `NDArray(undef, dims...)` - `NDArray(undef, dims)` e.g. ```julia julia> NDArray{Int,2}(undef, 5, 2) 5×2 NDArray{Int64,2} @ CPU0: 94290755905104 94290752678143 94290752660544 68719476760 94290752674408 94290737734368 94290752660544 18 94290752674408 18 julia> NDArray(undef, 5, 2) # default type is `mx.MX_float` 5×2 NDArray{Float32,2} @ CPU0: -29112.406f0 5.2029858f-8 3.0763f-416.7375383f-10 1.7613131f19 0.0f0 4.840456f30 0.0f0 4.4262863f30 0.0f0 ``` - The original `mx.empty` APIs are still functional. If user invokes them, a deprecation warning will be popped up. --- julia/NEWS.md | 13 +- julia/docs/src/user-guide/overview.md | 18 +--- julia/src/MXNet.jl| 1 - julia/src/deprecated.jl | 25 +++ julia/src/io.jl | 2 +- julia/src/kvstore.jl | 8 ++-- julia/src/model.jl| 8 ++-- julia/src/ndarray.jl | 74 +++ julia/src/random.jl | 10 ++--- julia/test/unittest/bind.jl | 8 ++-- julia/test/unittest/io.jl | 4 +- julia/test/unittest/kvstore.jl| 2 +- julia/test/unittest/ndarray.jl| 82 --- julia/test/unittest/random.jl | 4 +- 14 files changed, 184 insertions(+), 75 deletions(-) diff --git a/julia/NEWS.md b/julia/NEWS.md index 71ee86f..3da1194 100644 --- a/julia/NEWS.md +++ b/julia/NEWS.md @@ -1,11 +1,10 @@ -# v0.4.0 (#TBD) +# v1.5.0 (#TBD) * Following material from `mx` module got exported (#TBD): * `NDArray` * `clip()` * `clip!()` * `context()` -* `empty()` * `expand_dims()` * `@inplace` * `σ()` @@ -113,6 +112,16 @@ 3.0 ``` +* `mx.empty` is deprecated and replaced by `UndefInitializer` constructor. (#TBD) + + E.g. + ```julia + julia> NDArray(undef, 2, 5) + 2×5 NDArray{Float32,2} @ CPU0: + -21260.344f0 1.674986f190.00016893122f0 1.8363f-41 0.0f0 +3.0763f-41 1.14321726f27 4.24219f-8 0.0f0 0.0f0 + ``` + * A port of Python's `autograd` for `NDArray` (#274) * `size(x, dims...)` is supported now. (#TBD) diff --git a/julia/docs/src/user-guide/overview.md b/julia/docs/src/user-guide/overview.md index a81d7ff..5815bc6 100644 --- a/julia/docs/src/user-guide/overview.md +++ b/julia/docs/src/user-guide/overview.md @@ -73,9 +73,13 @@ operators in Julia directly. The followings are common ways to create `NDArray` objects: -- `mx.empty(shape[, context])`: create on uninitialized array of a - given shape on a specific device. For example, - `mx.empty(2, 3)`, `mx.((2, 3), mx.gpu(2))`. +- `NDArray(undef, shape...; ctx = context, writable = true)`: + create an uninitialized array of a given shape on a specific device. + For example, + `NDArray(undef, 2, 3)`, `NDArray(undef, 2, 3, ctx = mx.gpu(2))`. +- `NDArray(undef, shape; ctx = context, writable = true)` +- `NDArray{T}(undef, shape...; ctx = context, writable = true)`: + create an uninitialized with the given type `T`. - `mx.zeros(shape[, context])` and `mx.ones(shape[, context])`: similar to the Julia's built-in `zeros` and `ones`. - `mx.copy(jl_arr, context)`: copy the contents of a Julia `Array` to @@ -101,11 +105,11 @@ shows a way to set the contents of an `NDArray`. ```@repl using MXNet mx.srand(42) -a = mx.empty(2, 3) +a = NDArray(undef, 2, 3) a[:] = 0.5 # set all elements to a scalar a[:] = rand(size(a))# set contents wit
[incubator-mxnet] branch ib/ndarray-undef deleted (was 1c60330)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/ndarray-undef in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 1c60330 Julia: deprecate `mx.empty`, replace it with `UndefInitializer` The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/ci-jl-win updated: chcp
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new b2a4efc chcp b2a4efc is described below commit b2a4efc20f4977067efa3f6e99e5a12217f4021f Author: Iblis Lin AuthorDate: Mon Jan 21 22:11:20 2019 +0800 chcp --- ci/windows/test_jl07_cpu.ps1 | 3 +++ ci/windows/test_jl10_cpu.ps1 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 85ff223..759b8f6 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -15,6 +15,9 @@ # specific language governing permissions and limitations # under the License. +# utf8 console +chcp 65001 + 7z x -y windows_package.7z # set default output encoding to utf8 diff --git a/ci/windows/test_jl10_cpu.ps1 b/ci/windows/test_jl10_cpu.ps1 index 4dce827..4068880 100644 --- a/ci/windows/test_jl10_cpu.ps1 +++ b/ci/windows/test_jl10_cpu.ps1 @@ -15,6 +15,9 @@ # specific language governing permissions and limitations # under the License. +# utf8 console +chcp 65001 + 7z x -y windows_package.7z # set default output encoding to utf8
[incubator-mxnet] branch ib/ci-jl-win updated: add Project.toml
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new d688b53 add Project.toml d688b53 is described below commit d688b53e8a650bf1382c47662b819974727fe9d9 Author: Iblis Lin AuthorDate: Tue Jan 22 18:02:15 2019 +0800 add Project.toml --- ci/windows/test_jl10_cpu.ps1 | 10 -- julia/.gitignore | 1 + julia/Project.toml | 26 ++ julia/REQUIRE| 2 +- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/ci/windows/test_jl10_cpu.ps1 b/ci/windows/test_jl10_cpu.ps1 index 4dce827..c04983e 100644 --- a/ci/windows/test_jl10_cpu.ps1 +++ b/ci/windows/test_jl10_cpu.ps1 @@ -38,15 +38,13 @@ if (! $?) { Throw ("Error on installing Julia") } & $JULIA -e "using InteractiveUtils; versioninfo()" -# workaround a bug of Julia 0.7 -# use PackageSpec(name = "MXNet", path = "...") if we drop the 0.7 support -Copy-Item -Path .\julia -Recurse -Destination "$env:JULIA_DEPOT_PATH\dev\MXNet" +dir $src=' using Pkg -Pkg.develop("MXNet") -Pkg.build("MXNet") -Pkg.test("MXNet") +Pkg.activate(".\julia") +Pkg.build() +Pkg.test() ' $src > .\ci-build.jl diff --git a/julia/.gitignore b/julia/.gitignore index 3687ed4..e7b35fa 100644 --- a/julia/.gitignore +++ b/julia/.gitignore @@ -8,3 +8,4 @@ deps/src deps/usr deps/deps.jl .vscode +/Manifest.toml diff --git a/julia/Project.toml b/julia/Project.toml new file mode 100644 index 000..82a94c5 --- /dev/null +++ b/julia/Project.toml @@ -0,0 +1,26 @@ +name = "MXNet" +uuid = "a7949054-b901-59c6-b8e3-7238c29bf7f0" +authors = ["Chiyuan Zhang ", "Valentin Churavy ", "Iblis Lin "] +version = "1.5.0" + +[deps] +BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee" +Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0" +JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" +Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838f9c8e" +MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" +Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" +Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +Reexport = "189a3867-3050-52da-a836-e630ba90ab69" +Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + +[compat] +julia = "≥0.7" + +[extras] +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["Test"] diff --git a/julia/REQUIRE b/julia/REQUIRE index b53f0c3..8008da3 100644 --- a/julia/REQUIRE +++ b/julia/REQUIRE @@ -1,4 +1,4 @@ -julia 0.6 +julia 0.7 Formatting BinDeps JSON
[incubator-mxnet] branch ib/ci-jl-win updated: julia 0.7
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 9dfe039 julia 0.7 9dfe039 is described below commit 9dfe039e287cb976a2590a301bddc62bfed44c02 Author: Iblis Lin AuthorDate: Tue Jan 22 20:03:49 2019 +0800 julia 0.7 --- ci/windows/test_jl07_cpu.ps1| 10 -- tests/nightly/apache_rat_license_check/rat-excludes | 3 ++- tools/license_header.py | 3 +++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 85ff223..c30468c 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -38,15 +38,13 @@ if (! $?) { Throw ("Error on installing Julia") } & $JULIA -e "using InteractiveUtils; versioninfo()" -# workaround a bug of Julia 0.7 -# use PackageSpec(name = "MXNet", path = "...") if we drop the 0.7 support -Copy-Item -Path .\julia -Recurse -Destination "$env:JULIA_DEPOT_PATH\dev\MXNet" +dir $src=' using Pkg -Pkg.develop("MXNet") -Pkg.build("MXNet") -Pkg.test("MXNet") +Pkg.activate(".\\julia") +Pkg.build() +Pkg.test() ' $src > .\ci-build.jl diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes index 5969f01..50dba5b 100755 --- a/tests/nightly/apache_rat_license_check/rat-excludes +++ b/tests/nightly/apache_rat_license_check/rat-excludes @@ -49,4 +49,5 @@ deformable_im2col.h REQUIRE include/* .*.iml -.*.json.ref \ No newline at end of file +.*.json.ref +julia/Project.toml diff --git a/tools/license_header.py b/tools/license_header.py index 199d56c..724f208 100755 --- a/tools/license_header.py +++ b/tools/license_header.py @@ -90,6 +90,9 @@ _WHITE_LIST = [ # Licensed under 2-Clause BSD in header 'example/ssd/dataset/pycocotools/coco.py', + + # Julia package metadata, generated by Pkg3.jl + 'julia/Project.toml', ] # language extensions and the according commment mark
[incubator-mxnet] branch ib/ci-jl-win updated: fix
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 94e75de fix 94e75de is described below commit 94e75de0822c96ec1c2d43d76a319b459efb4252 Author: Iblis Lin AuthorDate: Tue Jan 22 19:36:50 2019 +0800 fix --- ci/windows/test_jl10_cpu.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/windows/test_jl10_cpu.ps1 b/ci/windows/test_jl10_cpu.ps1 index c04983e..2ff16fd 100644 --- a/ci/windows/test_jl10_cpu.ps1 +++ b/ci/windows/test_jl10_cpu.ps1 @@ -42,7 +42,7 @@ dir $src=' using Pkg -Pkg.activate(".\julia") +Pkg.activate(".\\julia") Pkg.build() Pkg.test() '
[incubator-mxnet] branch ib/ci-jl-win updated: try a failed test, make sure CI fail.
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 162044b try a failed test, make sure CI fail. 162044b is described below commit 162044b0c015682965403afa6f4ab5225ed80a67 Author: Iblis Lin AuthorDate: Tue Jan 22 21:53:38 2019 +0800 try a failed test, make sure CI fail. --- julia/test/runtests.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/julia/test/runtests.jl b/julia/test/runtests.jl index 4e5f273..2b95939 100644 --- a/julia/test/runtests.jl +++ b/julia/test/runtests.jl @@ -32,6 +32,8 @@ end @info "libmxnet version => $(mx.LIB_VERSION[])" +@test 1 == 2 + const BASEDIR = joinpath(@__DIR__, "..") include(joinpath(@__DIR__, "common.jl"))
[incubator-mxnet] branch ib/ci-jl-win updated: Revert "try a failed test, make sure CI fail."
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new fa0bf5c Revert "try a failed test, make sure CI fail." fa0bf5c is described below commit fa0bf5c998099b66f6758a62759d8efb9d92f281 Author: Iblis Lin AuthorDate: Tue Jan 22 21:55:31 2019 +0800 Revert "try a failed test, make sure CI fail." This reverts commit 162044b0c015682965403afa6f4ab5225ed80a67. --- julia/test/runtests.jl | 2 -- 1 file changed, 2 deletions(-) diff --git a/julia/test/runtests.jl b/julia/test/runtests.jl index 2b95939..4e5f273 100644 --- a/julia/test/runtests.jl +++ b/julia/test/runtests.jl @@ -32,8 +32,6 @@ end @info "libmxnet version => $(mx.LIB_VERSION[])" -@test 1 == 2 - const BASEDIR = joinpath(@__DIR__, "..") include(joinpath(@__DIR__, "common.jl"))
[incubator-mxnet] branch ib/ci-jl-win updated: redirect stderr to stdout
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new b65a302 redirect stderr to stdout b65a302 is described below commit b65a302c3bfadefdbf1cf0e1b43c77ea7da8bcb4 Author: Iblis Lin AuthorDate: Tue Jan 22 21:05:51 2019 +0800 redirect stderr to stdout --- ci/windows/test_jl07_cpu.ps1 | 2 +- ci/windows/test_jl10_cpu.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index c30468c..b146b78 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -48,5 +48,5 @@ $src=' ' $src > .\ci-build.jl -& $JULIA .\ci-build.jl +& $JULIA .\ci-build.jl 2>&1 | %{ "$_" } if (! $?) { Throw ("Error") } diff --git a/ci/windows/test_jl10_cpu.ps1 b/ci/windows/test_jl10_cpu.ps1 index 2ff16fd..dd34b4d 100644 --- a/ci/windows/test_jl10_cpu.ps1 +++ b/ci/windows/test_jl10_cpu.ps1 @@ -48,5 +48,5 @@ $src=' ' $src > .\ci-build.jl -& $JULIA .\ci-build.jl +& $JULIA .\ci-build.jl 2>&1 | %{ "$_" } if (! $?) { Throw ("Error") }
[incubator-mxnet] branch ib/ci-jl-win updated: add rat-excludes
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new f127bdd add rat-excludes f127bdd is described below commit f127bdd2d7cf7f396643246c58edd3c32ba6174b Author: Iblis Lin AuthorDate: Tue Jan 22 21:08:37 2019 +0800 add rat-excludes --- tests/nightly/apache_rat_license_check/rat-excludes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes index 50dba5b..47e0870 100755 --- a/tests/nightly/apache_rat_license_check/rat-excludes +++ b/tests/nightly/apache_rat_license_check/rat-excludes @@ -47,7 +47,7 @@ moderngpu/* deformable_im2col.cuh deformable_im2col.h REQUIRE +Project.toml include/* .*.iml .*.json.ref -julia/Project.toml
[incubator-mxnet] branch ib/ci-jl-win updated: LastExitCode
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new b07d234 LastExitCode b07d234 is described below commit b07d234eff85bc8be19593bb5cbb34f886bdb353 Author: Iblis Lin AuthorDate: Tue Jan 22 21:41:29 2019 +0800 LastExitCode --- ci/windows/test_jl07_cpu.ps1 | 2 +- ci/windows/test_jl10_cpu.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index b146b78..9a81da0 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -49,4 +49,4 @@ $src=' $src > .\ci-build.jl & $JULIA .\ci-build.jl 2>&1 | %{ "$_" } -if (! $?) { Throw ("Error") } +if ($LastExitCode -eq 1) { Throw ("Error") } diff --git a/ci/windows/test_jl10_cpu.ps1 b/ci/windows/test_jl10_cpu.ps1 index dd34b4d..c86bc26 100644 --- a/ci/windows/test_jl10_cpu.ps1 +++ b/ci/windows/test_jl10_cpu.ps1 @@ -49,4 +49,4 @@ $src=' $src > .\ci-build.jl & $JULIA .\ci-build.jl 2>&1 | %{ "$_" } -if (! $?) { Throw ("Error") } +if ($LastExitCode -eq 1) { Throw ("Error") }
[incubator-mxnet] branch ib/ci-jl-win updated: workaround
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 1a4bbe1 workaround 1a4bbe1 is described below commit 1a4bbe16d25cb31778fb9e7e9619d0f49807bff7 Author: Iblis Lin AuthorDate: Mon Jan 21 13:31:33 2019 +0800 workaround --- ci/windows/test_jl07_cpu.ps1 | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 35c1c61..f104ab9 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -36,14 +36,15 @@ if (! $?) { Throw ("Error on downloading Julia Windows binary") } Start-Process -Wait "julia-binary.exe" -ArgumentList "/S /D=$JULIA_DIR" if (! $?) { Throw ("Error on installing Julia") } -C:\julia07\julia\bin\julia -e "using InteractiveUtils; versioninfo()" +& $JULIA -e "using InteractiveUtils; versioninfo()" -pwd -dir # path issue? +# workaround a bug of Julia 0.7 +# use PackageSpec(name = "MXNet", path = "...") if we drop the 0.7 support +Copy-Item -Path .\julia -Recurse -Destination "$env:JULIA_DEPOT_PATH\dev\MXNet" $src=' using Pkg -Pkg.develop(PackageSpec(name = "MXNet", path = "julia")) +Pkg.develop("MXNet") Pkg.build("MXNet") Pkg.test("MXNet") '
[incubator-mxnet] branch master updated: Julia: add windows-cpu build (#13937)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new ce8b083 Julia: add windows-cpu build (#13937) ce8b083 is described below commit ce8b083f1607025bd352457447038bc7ae186fab Author: Iblis Lin AuthorDate: Wed Jan 23 23:46:51 2019 +0800 Julia: add windows-cpu build (#13937) - Julia v0.7 - Julia v1.0 --- ci/docker/runtime_functions.sh | 16 ++- ci/jenkins/Jenkins_steps.groovy| 28 +++ ci/jenkins/Jenkinsfile_windows_cpu | 8 ++-- ci/windows/test_jl07_cpu.ps1 | 56 ++ ci/windows/test_jl10_cpu.ps1 | 56 ++ julia/.gitignore | 1 + julia/Project.toml | 26 ++ julia/REQUIRE | 2 +- julia/appveyor.yml | 56 -- julia/deps/build.jl| 2 +- julia/src/util.jl | 6 +-- .../nightly/apache_rat_license_check/rat-excludes | 1 + tools/license_header.py| 3 ++ 13 files changed, 184 insertions(+), 77 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 4c70c1a..9f9dd0c 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -922,29 +922,21 @@ unittest_ubuntu_cpu_julia() { export PATH="$1/bin:$PATH" export MXNET_HOME='/work/mxnet' export JULIA_DEPOT_PATH='/work/julia-depot' -export DEVDIR="$JULIA_DEPOT_PATH/dev" julia -e 'using InteractiveUtils; versioninfo()' -# install package -mkdir -p $DEVDIR -ln -sf ${MXNET_HOME}/julia ${DEVDIR}/MXNet - -# register MXNet.jl and dependencies -julia -e 'using Pkg; Pkg.develop("MXNet")' - # FIXME export LD_PRELOAD='/usr/lib/x86_64-linux-gnu/libjemalloc.so' export LD_LIBRARY_PATH=/work/mxnet/lib:$LD_LIBRARY_PATH # use the prebuilt binary from $MXNET_HOME/lib -julia -e 'using Pkg; Pkg.build("MXNet")' +julia --project=./julia -e 'using Pkg; Pkg.build("MXNet")' # run the script `julia/test/runtests.jl` -julia -e 'using Pkg; Pkg.test("MXNet")' +julia --project=./julia -e 'using Pkg; Pkg.test("MXNet")' # See https://github.com/dmlc/MXNet.jl/pull/303#issuecomment-341171774 -julia -e 'using MXNet; mx._sig_checker()' +julia --project=./julia -e 'using MXNet; mx._sig_checker()' } unittest_ubuntu_cpu_julia07() { @@ -1280,10 +1272,8 @@ deploy_jl_docs() { export PATH="/work/julia10/bin:$PATH" export MXNET_HOME='/work/mxnet' export JULIA_DEPOT_PATH='/work/julia-depot' -export DEVDIR="$JULIA_DEPOT_PATH/dev" julia -e 'using InteractiveUtils; versioninfo()' -mkdir -p $DEVDIR # FIXME export LD_PRELOAD='/usr/lib/x86_64-linux-gnu/libjemalloc.so' diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 9db3588..984672c 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -1210,6 +1210,34 @@ def test_windows_python3_cpu() { }] } +def test_windows_julia07_cpu() { +return ['Julia 0.7: CPU Win': { + node(NODE_WINDOWS_CPU) { +ws('workspace/ut-julia07-cpu') { + timeout(time: max_time, unit: 'MINUTES') { +utils.init_git_win() +unstash 'windows_package_cpu' +powershell 'ci/windows/test_jl07_cpu.ps1' + } +} + } +}] +} + +def test_windows_julia10_cpu() { +return ['Julia 1.0: CPU Win': { + node(NODE_WINDOWS_CPU) { +ws('workspace/ut-julia10-cpu') { + timeout(time: max_time, unit: 'MINUTES') { +utils.init_git_win() +unstash 'windows_package_cpu' +powershell 'ci/windows/test_jl10_cpu.ps1' + } +} + } +}] +} + def test_qemu_armv7_cpu() { return ['ARMv7 QEMU': { node(NODE_LINUX_CPU) { diff --git a/ci/jenkins/Jenkinsfile_windows_cpu b/ci/jenkins/Jenkinsfile_windows_cpu index a8746db..5bc40d6 100644 --- a/ci/jenkins/Jenkinsfile_windows_cpu +++ b/ci/jenkins/Jenkinsfile_windows_cpu @@ -35,12 +35,14 @@ utils.main_wrapper( core_logic: { utils.parallel_stage('Build', [ custom_steps.compile_windows_cpu() - ]) + ]) utils.parallel_stage('Tests', [ custom_steps.test_windows_python2_cpu(), -custom_steps.test_windows_python3_cpu() - ]) +custom_steps.test_windows_python3_cpu(), +custom_steps.test_windows_julia07_cpu(), +custom_steps.test_windows_julia10_cpu() + ]) } , failure_handler: { diff --git a/ci/w
[incubator-mxnet] branch ib/ci-jl-win deleted (was 6161e84)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 6161e84 Julia: add windows-cpu build The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/ci-jl-win updated: add comments
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new a713aed add comments a713aed is described below commit a713aedac4986a5e4194f573a014a5cd2887 Author: Iblis Lin AuthorDate: Wed Jan 23 09:58:06 2019 +0800 add comments --- ci/windows/test_jl07_cpu.ps1 | 4 ci/windows/test_jl10_cpu.ps1 | 4 2 files changed, 8 insertions(+) diff --git a/ci/windows/test_jl07_cpu.ps1 b/ci/windows/test_jl07_cpu.ps1 index 9a81da0..6cd34ef 100644 --- a/ci/windows/test_jl07_cpu.ps1 +++ b/ci/windows/test_jl07_cpu.ps1 @@ -48,5 +48,9 @@ $src=' ' $src > .\ci-build.jl + +# Redirect all stderr output to stdout, +# since Julia loggers output stuffs to stderr. +# Then, stderr triggers powershell NativeCommandError. & $JULIA .\ci-build.jl 2>&1 | %{ "$_" } if ($LastExitCode -eq 1) { Throw ("Error") } diff --git a/ci/windows/test_jl10_cpu.ps1 b/ci/windows/test_jl10_cpu.ps1 index c86bc26..96c4190 100644 --- a/ci/windows/test_jl10_cpu.ps1 +++ b/ci/windows/test_jl10_cpu.ps1 @@ -48,5 +48,9 @@ $src=' ' $src > .\ci-build.jl + +# Redirect all stderr output to stdout, +# since Julia loggers output stuffs to stderr. +# Then, stderr triggers powershell NativeCommandError. & $JULIA .\ci-build.jl 2>&1 | %{ "$_" } if ($LastExitCode -eq 1) { Throw ("Error") }
[incubator-mxnet] branch ib/ci-jl-win updated: fix unix-cpu julia build process
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/ci-jl-win by this push: new 71ac27e fix unix-cpu julia build process 71ac27e is described below commit 71ac27e05992bb0d93712efaf71fe2439d182ecc Author: Iblis Lin AuthorDate: Wed Jan 23 12:59:48 2019 +0800 fix unix-cpu julia build process --- ci/docker/runtime_functions.sh | 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 3da6c52..a244d8a 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -912,29 +912,21 @@ unittest_ubuntu_cpu_julia() { export PATH="$1/bin:$PATH" export MXNET_HOME='/work/mxnet' export JULIA_DEPOT_PATH='/work/julia-depot' -export DEVDIR="$JULIA_DEPOT_PATH/dev" julia -e 'using InteractiveUtils; versioninfo()' -# install package -mkdir -p $DEVDIR -ln -sf ${MXNET_HOME}/julia ${DEVDIR}/MXNet - -# register MXNet.jl and dependencies -julia -e 'using Pkg; Pkg.develop("MXNet")' - # FIXME export LD_PRELOAD='/usr/lib/x86_64-linux-gnu/libjemalloc.so' export LD_LIBRARY_PATH=/work/mxnet/lib:$LD_LIBRARY_PATH # use the prebuilt binary from $MXNET_HOME/lib -julia -e 'using Pkg; Pkg.build("MXNet")' +julia --project=./julia -e 'using Pkg; Pkg.build("MXNet")' # run the script `julia/test/runtests.jl` -julia -e 'using Pkg; Pkg.test("MXNet")' +julia --project=./julia -e 'using Pkg; Pkg.test("MXNet")' # See https://github.com/dmlc/MXNet.jl/pull/303#issuecomment-341171774 -julia -e 'using MXNet; mx._sig_checker()' +julia --project=./julia -e 'using MXNet; mx._sig_checker()' } unittest_ubuntu_cpu_julia07() { @@ -1270,10 +1262,8 @@ deploy_jl_docs() { export PATH="/work/julia10/bin:$PATH" export MXNET_HOME='/work/mxnet' export JULIA_DEPOT_PATH='/work/julia-depot' -export DEVDIR="$JULIA_DEPOT_PATH/dev" julia -e 'using InteractiveUtils; versioninfo()' -mkdir -p $DEVDIR # FIXME export LD_PRELOAD='/usr/lib/x86_64-linux-gnu/libjemalloc.so'
[incubator-mxnet] branch master updated: julia: fix `argmax` for NDArray (#13871)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new 61847be julia: fix `argmax` for NDArray (#13871) 61847be is described below commit 61847bebf5cf807680740542afeeacda5231ace9 Author: Iblis Lin AuthorDate: Fri Jan 18 11:07:29 2019 +0800 julia: fix `argmax` for NDArray (#13871) - fix 0-based index output to 1-based index close #13786 --- julia/src/ndarray.jl | 65 ++ julia/test/unittest/ndarray.jl | 46 ++ 2 files changed, 111 insertions(+) diff --git a/julia/src/ndarray.jl b/julia/src/ndarray.jl index dad9b59..6987d57 100644 --- a/julia/src/ndarray.jl +++ b/julia/src/ndarray.jl @@ -1273,6 +1273,67 @@ Base.prod(x::NDArray; dims = :) = _prod(x, dims) @_remap _prod(x::NDArray, ::Colon) prod(x) @_remap _prod(x::NDArray, dims)prod(x; axis = 0 .- dims, keepdims = true) +# TODO: support CartesianIndex ? +""" +argmax(x::NDArray; dims) -> indices + +Note that `NaN` is skipped during comparison. +This is different from Julia `Base.argmax`. + +## Examples + +```julia-repl +julia> x = NDArray([0. 1 2; 3 4 5]) +2×3 NDArray{Float64,2} @ CPU0: + 0.0 1.0 2.0 + 3.0 4.0 5.0 + +julia> argmax(x, dims = 1) +1×3 NDArray{Float64,2} @ CPU0: + 2.0 2.0 2.0 + +julia> argmax(x, dims = 2) +2×1 NDArray{Float64,2} @ CPU0: + 3.0 + 3.0 +``` + +See also [`argmin`](@ref mx.argmin). +""" +Base.argmax(x::NDArray; dims = :) = _argmax(x, dims) .+ 1 +@_remap _argmax(x::NDArray, ::Colon) argmax(x) +@_remap _argmax(x::NDArray, dims)argmax(x; axis = 0 .- dims, keepdims = true) + +""" +argmin(x::NDArray; dims) -> indices + +Note that `NaN` is skipped during comparison. +This is different from Julia `Base.argmin`. + +## Examples + +```julia-repl +julia> x = NDArray([0. 1 2; 3 4 5]) +2×3 NDArray{Float64,2} @ CPU0: + 0.0 1.0 2.0 + 3.0 4.0 5.0 + +julia> argmax(x, dims = 1) +1×3 NDArray{Float64,2} @ CPU0: + 2.0 2.0 2.0 + +julia> argmax(x, dims = 2) +2×1 NDArray{Float64,2} @ CPU0: + 3.0 + 3.0 +``` + +See also [`argmax`](@ref mx.argmax). +""" +Base.argmin(x::NDArray; dims = :) = _argmin(x, dims) .+ 1 +@_remap _argmin(x::NDArray, ::Colon) argmin(x) +@_remap _argmin(x::NDArray, dims)argmin(x; axis = 0 .- dims, keepdims = true) + _nddoc[:clip] = _nddoc[:clip!] = """ clip(x::NDArray, min, max) @@ -1734,6 +1795,10 @@ const _op_import_bl = [ # import black list; do not import these funcs "broadcast_axis", "broadcast_axes", "broadcast_hypot", + +# reduction +"argmax", +"argmin", ] macro _import_ndarray_functions() diff --git a/julia/test/unittest/ndarray.jl b/julia/test/unittest/ndarray.jl index 9ca4ba2..85328ff 100644 --- a/julia/test/unittest/ndarray.jl +++ b/julia/test/unittest/ndarray.jl @@ -1434,6 +1434,50 @@ function test_hypot() @test copy(z) == C end # function test_hypot +function test_argmax() + @info "NDArray::argmax" + let +A = [1. 5 3; + 4 2 6] +x = NDArray(A) + +@test copy(argmax(x, dims = 1)) == [2 1 2] +@test copy(argmax(x, dims = 2)) == reshape([2, 3], :, 1) + end + + @info "NDArray::argmax::NaN" + let +A = [1. 5 3; + NaN 2 6] +x = NDArray(A) + +@test copy(argmax(x, dims = 1)) == [1 1 2] +@test copy(argmax(x, dims = 2)) == reshape([2, 3], :, 1) + end +end + +function test_argmin() + @info "NDArray::argmin" + let +A = [1. 5 3; + 4 2 6] +x = NDArray(A) + +@test copy(argmin(x, dims = 1)) == [1 2 1] +@test copy(argmin(x, dims = 2)) == reshape([1, 2], :, 1) + end + + @info "NDArray::argmin::NaN" + let +A = [1. 5 3; + NaN 2 6] +x = NDArray(A) + +@test copy(argmin(x, dims = 1)) == [1 2 1] +@test copy(argmin(x, dims = 2)) == reshape([1, 2], :, 1) + end +end + # Run tests @@ -1479,6 +1523,8 @@ end # function test_hypot test_broadcast_to() test_broadcast_axis() test_hypot() + test_argmax() + test_argmin() end end
[incubator-mxnet] branch ib/nd-argmax-argmin deleted (was 267e7c2)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/nd-argmax-argmin in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 267e7c2 julia: fix `argmax` for NDArray The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/ndarray-undef updated (cfdd63d -> 1c60330)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/ndarray-undef in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard cfdd63d Julia: deprecate `mx.empty`, replace it with `UndefInitializer` new 1c60330 Julia: deprecate `mx.empty`, replace it with `UndefInitializer` This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cfdd63d) \ N -- N -- N refs/heads/ib/ndarray-undef (1c60330) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9191 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. Summary of changes: julia/src/ndarray.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[incubator-mxnet] branch ib/jl-docstring-render deleted (was aa2d8fd)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-docstring-render in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was aa2d8fd Julia: fix filename quoting in docstring The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/ci-jl-win updated (71ac27e -> 6161e84)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/ci-jl-win in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 71ac27e fix unix-cpu julia build process discard a713aed add comments discard fa0bf5c Revert "try a failed test, make sure CI fail." discard 162044b try a failed test, make sure CI fail. discard b07d234 LastExitCode discard f127bdd add rat-excludes discard b65a302 redirect stderr to stdout discard 9dfe039 julia 0.7 discard 94e75de fix discard d688b53 add Project.toml discard 298b6ec Julia: add windows-cpu build new 6161e84 Julia: add windows-cpu build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (71ac27e) \ N -- N -- N refs/heads/ib/ci-jl-win (6161e84) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9191 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. Summary of changes:
[incubator-mxnet] 01/01: julia: fix `argmax` for NDArray
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/nd-argmax-argmin in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit 267e7c2f470fe9ff3015988543f2363d5896aefc Author: Iblis Lin AuthorDate: Mon Jan 14 20:40:46 2019 +0800 julia: fix `argmax` for NDArray - fix 0-based index output to 1-based index close #13786 --- julia/src/ndarray.jl | 65 ++ julia/test/unittest/ndarray.jl | 46 ++ 2 files changed, 111 insertions(+) diff --git a/julia/src/ndarray.jl b/julia/src/ndarray.jl index dad9b59..6987d57 100644 --- a/julia/src/ndarray.jl +++ b/julia/src/ndarray.jl @@ -1273,6 +1273,67 @@ Base.prod(x::NDArray; dims = :) = _prod(x, dims) @_remap _prod(x::NDArray, ::Colon) prod(x) @_remap _prod(x::NDArray, dims)prod(x; axis = 0 .- dims, keepdims = true) +# TODO: support CartesianIndex ? +""" +argmax(x::NDArray; dims) -> indices + +Note that `NaN` is skipped during comparison. +This is different from Julia `Base.argmax`. + +## Examples + +```julia-repl +julia> x = NDArray([0. 1 2; 3 4 5]) +2×3 NDArray{Float64,2} @ CPU0: + 0.0 1.0 2.0 + 3.0 4.0 5.0 + +julia> argmax(x, dims = 1) +1×3 NDArray{Float64,2} @ CPU0: + 2.0 2.0 2.0 + +julia> argmax(x, dims = 2) +2×1 NDArray{Float64,2} @ CPU0: + 3.0 + 3.0 +``` + +See also [`argmin`](@ref mx.argmin). +""" +Base.argmax(x::NDArray; dims = :) = _argmax(x, dims) .+ 1 +@_remap _argmax(x::NDArray, ::Colon) argmax(x) +@_remap _argmax(x::NDArray, dims)argmax(x; axis = 0 .- dims, keepdims = true) + +""" +argmin(x::NDArray; dims) -> indices + +Note that `NaN` is skipped during comparison. +This is different from Julia `Base.argmin`. + +## Examples + +```julia-repl +julia> x = NDArray([0. 1 2; 3 4 5]) +2×3 NDArray{Float64,2} @ CPU0: + 0.0 1.0 2.0 + 3.0 4.0 5.0 + +julia> argmax(x, dims = 1) +1×3 NDArray{Float64,2} @ CPU0: + 2.0 2.0 2.0 + +julia> argmax(x, dims = 2) +2×1 NDArray{Float64,2} @ CPU0: + 3.0 + 3.0 +``` + +See also [`argmax`](@ref mx.argmax). +""" +Base.argmin(x::NDArray; dims = :) = _argmin(x, dims) .+ 1 +@_remap _argmin(x::NDArray, ::Colon) argmin(x) +@_remap _argmin(x::NDArray, dims)argmin(x; axis = 0 .- dims, keepdims = true) + _nddoc[:clip] = _nddoc[:clip!] = """ clip(x::NDArray, min, max) @@ -1734,6 +1795,10 @@ const _op_import_bl = [ # import black list; do not import these funcs "broadcast_axis", "broadcast_axes", "broadcast_hypot", + +# reduction +"argmax", +"argmin", ] macro _import_ndarray_functions() diff --git a/julia/test/unittest/ndarray.jl b/julia/test/unittest/ndarray.jl index 9ca4ba2..85328ff 100644 --- a/julia/test/unittest/ndarray.jl +++ b/julia/test/unittest/ndarray.jl @@ -1434,6 +1434,50 @@ function test_hypot() @test copy(z) == C end # function test_hypot +function test_argmax() + @info "NDArray::argmax" + let +A = [1. 5 3; + 4 2 6] +x = NDArray(A) + +@test copy(argmax(x, dims = 1)) == [2 1 2] +@test copy(argmax(x, dims = 2)) == reshape([2, 3], :, 1) + end + + @info "NDArray::argmax::NaN" + let +A = [1. 5 3; + NaN 2 6] +x = NDArray(A) + +@test copy(argmax(x, dims = 1)) == [1 1 2] +@test copy(argmax(x, dims = 2)) == reshape([2, 3], :, 1) + end +end + +function test_argmin() + @info "NDArray::argmin" + let +A = [1. 5 3; + 4 2 6] +x = NDArray(A) + +@test copy(argmin(x, dims = 1)) == [1 2 1] +@test copy(argmin(x, dims = 2)) == reshape([1, 2], :, 1) + end + + @info "NDArray::argmin::NaN" + let +A = [1. 5 3; + NaN 2 6] +x = NDArray(A) + +@test copy(argmin(x, dims = 1)) == [1 2 1] +@test copy(argmin(x, dims = 2)) == reshape([1, 2], :, 1) + end +end + # Run tests @@ -1479,6 +1523,8 @@ end # function test_hypot test_broadcast_to() test_broadcast_axis() test_hypot() + test_argmax() + test_argmin() end end
[incubator-mxnet] branch ib/nd-argmax-argmin created (now 267e7c2)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/nd-argmax-argmin in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at 267e7c2 julia: fix `argmax` for NDArray This branch includes the following new commits: new 267e7c2 julia: fix `argmax` for NDArray The 1 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] 01/01: Add CODEOWNERS for Julia package
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/julia-codeowner in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit 5150956e86a82e0d512917f514b9d7364d3e8b28 Author: Iblis Lin AuthorDate: Mon Jan 14 20:50:13 2019 +0800 Add CODEOWNERS for Julia package --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/CODEOWNERS b/CODEOWNERS index 8b48257..a9655ec 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -20,6 +20,7 @@ /python/mxnet/optimizer/ @eric-haibin-lin /python/mxnet/gluon/trainer.py@eric-haibin-lin /contrib/clojure-package/ @gigasquid +/julia/ @iblis17 # C++ base /src/kvstore/ @rahul003 @anirudh2290
[incubator-mxnet] branch ib/julia-codeowner created (now 5150956)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/julia-codeowner in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at 5150956 Add CODEOWNERS for Julia package This branch includes the following new commits: new 5150956 Add CODEOWNERS for Julia package The 1 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] branch ib/jl-runtime-features updated (84aec6e -> 93f8e59)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 84aec6e mx.isenabled discard 38e08f9 2 space discard f145581 update to new API discard a0d4d3c Julia: add binding for runtime feature detection new 8a63bde Julia: enable integration test (#14025) new 4898106 The latest version of leiningen has a dependency problem with codox (#14132) new ce031da ONNX export: Support equal length splits (#14121) new 87c7add add Apache header on all XML (#14138) new 45978a9 add mkldnn softmax_output (#13699) new c704f1f follow up on fix nightly test (#14134) new 199bc7e make rat-excludes compliant with apache release policy (#14142) new 7ff6ad1 Update lip reading example (#13647) new 0b1761f Add pin_device_id option to Gluon DataLoader (#14136) new 85d3fa3 upgrade codox to work with lein 2.9.0 (#14133) new 6f9a679 fix website build (#14148) new e356586 disable flaky integration test (#14151) new 074a859 Fixes installation nightly test by filtering out the git commands (#14144) new 518cd40 Updated the MLP test to accept the number of epochs. Reduced the epochs in ci_test.sh to shorten the CI build time (#14149) new a13f8d9 Add license check to dev_menu, docs build with docker (#14166) new 73a9f1c Relaxing type requirements for slice_like op (#14097) new dad33b5 Performance improvement in Normalize GPU Kernel (#14139) new df5310b [MXNET-1315] Add checks for dynamic-shaped operators in CachedOp (#14018) new de5cda2 Add pixelshuffle layers (#13571) new cf46ca4 Fixes libjpeg-turbo dependecy under Ubuntu 16.04 (#14127) new 0e08891 Fix quote on LBSGD docs (#13975) new a4e249b In-place updates for Nadam, Adadelta, Adamax and SGLD (#13960) new 8416c56 Fix jar path and add missing ones for spark jobs (#14020) new e2c69f3 add preprocessed data and pretrained model info; minor format/spelling fixes (#14170) new 549ecde support dot(vector, vector) for fp16 inputs on GPU (#14102) new 3d0ffd2 R-Package Makefile (#14068) new ba97fb6 Parallelize CPU version and add GPU version of boolean_mask op (#14090) new da9afe1 add Qing's Key to master (#14180) new b0ab8d5 Fixes spelling (#14168) new 4b527b6 [MXNET-766] add dynamic_unroll RNN for HybridBlock (#11948) new d2cc396 [v1.4.x] Update MKL-DNN to fix the OSX build issue (#14141) (#14182) new 29fa446 Fix broken amalgamation (#12792) new ed0b791 Fix nd.pick large array issue (#14082) new 8bfbb7d Add an inference script providing both accuracy and benchmark result for original wide_n_deep example (#13895) new 059f49f Added USE_SIGNAL_HANDLER to other Linux builds which didn't had it (#14122) new 5adb6fc Add NHWC layout support to Pooling (cpu, gpu cuda, gpu cuDNN) (#13749) new bada8a1 add quantization example to readme (#14186) new 3a6fe22 Refine runtime feature discovery python API and add documentation to … (#14130) new af9e3b3 update raspberry pi install instructions (#14172) new 49c311c Add tutorial on how to use build from source jar (#14197) new c45e534 Scala interpreter instructions (#14169) new b396a63 Fix READMEs for examples (#14179) new 349803c Multi-precision AdamW update op (#14171) new f9c436b Fix req=null in SliceLikeBackward (#14209) new 862cbc6 softmax for fp16 with fp32 accumulator (#14098) new 0398a7e onnx broadcast ops fixes (#13604) new fdbc433 fix update params (#14218) new 2347017 Two more gluon loss classes. (#14194) new 87441c3 Add infer_type_partial (#14214) new d465c52 Julia: add binding for runtime feature detection new 3c2132a update to new API new 64a2a3d 2 space new 189478d mx.isenabled new 93f8e59 update This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (84aec6e) \ N -- N -- N refs/heads/ib/jl-runtime-features (93f8e59) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9322 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] branch ib/jl-runtime-features updated (84aec6e -> 93f8e59)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 84aec6e mx.isenabled discard 38e08f9 2 space discard f145581 update to new API discard a0d4d3c Julia: add binding for runtime feature detection new 8a63bde Julia: enable integration test (#14025) new 4898106 The latest version of leiningen has a dependency problem with codox (#14132) new ce031da ONNX export: Support equal length splits (#14121) new 87c7add add Apache header on all XML (#14138) new 45978a9 add mkldnn softmax_output (#13699) new c704f1f follow up on fix nightly test (#14134) new 199bc7e make rat-excludes compliant with apache release policy (#14142) new 7ff6ad1 Update lip reading example (#13647) new 0b1761f Add pin_device_id option to Gluon DataLoader (#14136) new 85d3fa3 upgrade codox to work with lein 2.9.0 (#14133) new 6f9a679 fix website build (#14148) new e356586 disable flaky integration test (#14151) new 074a859 Fixes installation nightly test by filtering out the git commands (#14144) new 518cd40 Updated the MLP test to accept the number of epochs. Reduced the epochs in ci_test.sh to shorten the CI build time (#14149) new a13f8d9 Add license check to dev_menu, docs build with docker (#14166) new 73a9f1c Relaxing type requirements for slice_like op (#14097) new dad33b5 Performance improvement in Normalize GPU Kernel (#14139) new df5310b [MXNET-1315] Add checks for dynamic-shaped operators in CachedOp (#14018) new de5cda2 Add pixelshuffle layers (#13571) new cf46ca4 Fixes libjpeg-turbo dependecy under Ubuntu 16.04 (#14127) new 0e08891 Fix quote on LBSGD docs (#13975) new a4e249b In-place updates for Nadam, Adadelta, Adamax and SGLD (#13960) new 8416c56 Fix jar path and add missing ones for spark jobs (#14020) new e2c69f3 add preprocessed data and pretrained model info; minor format/spelling fixes (#14170) new 549ecde support dot(vector, vector) for fp16 inputs on GPU (#14102) new 3d0ffd2 R-Package Makefile (#14068) new ba97fb6 Parallelize CPU version and add GPU version of boolean_mask op (#14090) new da9afe1 add Qing's Key to master (#14180) new b0ab8d5 Fixes spelling (#14168) new 4b527b6 [MXNET-766] add dynamic_unroll RNN for HybridBlock (#11948) new d2cc396 [v1.4.x] Update MKL-DNN to fix the OSX build issue (#14141) (#14182) new 29fa446 Fix broken amalgamation (#12792) new ed0b791 Fix nd.pick large array issue (#14082) new 8bfbb7d Add an inference script providing both accuracy and benchmark result for original wide_n_deep example (#13895) new 059f49f Added USE_SIGNAL_HANDLER to other Linux builds which didn't had it (#14122) new 5adb6fc Add NHWC layout support to Pooling (cpu, gpu cuda, gpu cuDNN) (#13749) new bada8a1 add quantization example to readme (#14186) new 3a6fe22 Refine runtime feature discovery python API and add documentation to … (#14130) new af9e3b3 update raspberry pi install instructions (#14172) new 49c311c Add tutorial on how to use build from source jar (#14197) new c45e534 Scala interpreter instructions (#14169) new b396a63 Fix READMEs for examples (#14179) new 349803c Multi-precision AdamW update op (#14171) new f9c436b Fix req=null in SliceLikeBackward (#14209) new 862cbc6 softmax for fp16 with fp32 accumulator (#14098) new 0398a7e onnx broadcast ops fixes (#13604) new fdbc433 fix update params (#14218) new 2347017 Two more gluon loss classes. (#14194) new 87441c3 Add infer_type_partial (#14214) new d465c52 Julia: add binding for runtime feature detection new 3c2132a update to new API new 64a2a3d 2 space new 189478d mx.isenabled new 93f8e59 update This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (84aec6e) \ N -- N -- N refs/heads/ib/jl-runtime-features (93f8e59) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9322 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] branch ib/jl-runtime-features updated (93f8e59 -> 6d9e429)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 93f8e59 update discard 189478d mx.isenabled discard 64a2a3d 2 space discard 3c2132a update to new API discard d465c52 Julia: add binding for runtime feature detection new 5f32f32 Dual stream cudnn Convolution backward() with MXNET_GPU_WORKER_NSTREAMS=2. (#14006) new 0af40f7 [MXNET-1325] Make InferShapeAttr a standalone pass (#14193) new 0eed3da Temporarily disables windows pipeline to unblock PRs (#14261) new e3a51b5 [op] add back support for scalar type rescale_grad argument for adamw_update/mp_adamw_update (#14221) new 7c617cc pypi package description. manifest/setup.py update (#14255) new f0fedec Refactors USE_NVRTC setting to ENABLE_CUDA_RTC in pip make config files (#14250) new c319ae5 MXNet Java bug fixes and experience improvement (#14213) new 992c3c0 [MXNET-1330] Bring nnvm::Tuple to mxnet::Tuple (#14270) new c6b1fd5 MXNET-1302 Exclude commons-codec and commons-io from assembled JAR (#14000) new 3180f9c added mkldnn dependency for plugin compile target (#14274) new fb4f9d5 Large array support for randint (#14242) new 7aac0b5 reverting broadcasting fixes (#14299) new 0e23a18 add symbolic link to mkldnn header files in include (#14300) new 053ffc7 fix memory-related issues to enable ASAN tests (#14223) new 7b1727a Julia: add binding for runtime feature detection new ec80b31 update to new API new 03698eb 2 space new 271fed6 mx.isenabled new 6d9e429 update This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (93f8e59) \ N -- N -- N refs/heads/ib/jl-runtime-features (6d9e429) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9336 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. Summary of changes: 3rdparty/dmlc-core | 2 +- 3rdparty/mshadow | 2 +- CONTRIBUTORS.md| 1 + Makefile | 2 +- amalgamation/prep_nnvm.sh | 1 - ci/docker/runtime_functions.sh | 2 - ci/jenkins/Jenkinsfile_windows_cpu | 10 +- ci/jenkins/Jenkinsfile_windows_gpu | 10 +- cpp-package/example/alexnet.cpp| 1 + cpp-package/example/charRNN.cpp| 10 + cpp-package/example/googlenet.cpp | 1 + cpp-package/example/inception_bn.cpp | 1 + cpp-package/example/lenet.cpp | 1 + cpp-package/example/lenet_with_mxdataiter.cpp | 1 + cpp-package/example/mlp_cpu.cpp| 1 + cpp-package/example/mlp_csv.cpp| 1 + cpp-package/example/mlp_gpu.cpp| 1 + cpp-package/example/resnet.cpp | 1 + cpp-package/example/test_optimizer.cpp | 1 + cpp-package/example/test_score.cpp | 1 + docs/architecture/overview.md | 22 +- docs/faq/add_op_in_backend.md | 8 +- docs/faq/env_var.md| 6 + docs/faq/new_op.md | 2 +- .../predict-cpp/image-classification-predict.cc| 4 +- include/mkldnn | 1 + include/mxnet/base.h | 137 - include/mxnet/executor.h | 4 +- include/mxnet/ndarray.h| 93 +-- include/mxnet/op_attr_types.h | 11 +- include/mxnet/operator.h | 20 +- include/mxnet/operator_util.h | 8 +- include/mxnet/tensor_blob.h| 12 +- include/mxnet/tuple.h | 682 + make/pip/pip_darwin_cpu.mk | 2 +- make/pip/pip_darwin_mkl.mk | 2 +- make/pip/pip_linux_cpu.mk
[incubator-mxnet] branch ib/jl-runtime-features updated (6d9e429 -> 1b5f894)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 6d9e429 update discard 271fed6 mx.isenabled discard 03698eb 2 space discard ec80b31 update to new API discard 7b1727a Julia: add binding for runtime feature detection new 434a5fb move choose_element_0index to operator (#14273) new 1363557 1.4 release (#14297) new 6152ffa FIX: flaky test exponential generator (#14287) new 4d14a0b Add scalaclean to make clean (#14322) new df7771b Add int8 data loader (#14123) new 21f67bd [clojure-package] improve docstrings in `image.clj` (#14307) new 780bddc Optimize NMS (#14290) new 434726e [DOC] Refine documentation of runtime feature detection (#14238) new 99bb06c support long for mx.random.seed (#14314) new 7243806 Use cudnn for dropout by default (#14278) new 5065f13 fix SoftmaxOutput resource bug (#14302) new ef1c4ba Fixed some typos in AvgPooling Docs (#14324) new 0f88f61 [clojure-package] fix docstrings in `normal.clj` (#14295) new 427b6d4 Fix shape inference pass (#14153) new d754da3 Relaxing type requirements for reshape_like op (#14325) new f2497aa Updated news.md with the latest mkldnn submodule version (#14298) new 49d7fc6 Enhance gpu quantization (#14094) new d6eafca Bypass ThreadedEngine in test_operator_gpu.py:test_convolution_multiple_streams. (#14338) new 111b881 Limit workspace for cudnnGet results (#14326) new 2df0660 Julia: add binding for runtime feature detection new ca6ac8a update to new API new f6d13fb 2 space new 37ecb07 mx.isenabled new 1b5f894 update This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6d9e429) \ N -- N -- N refs/heads/ib/jl-runtime-features (1b5f894) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9355 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. Summary of changes: Makefile | 2 + NEWS.md| 2 +- .../src/org/apache/clojure_mxnet/image.clj | 76 ++- .../src/org/apache/clojure_mxnet/random.clj| 70 --- .../test/org/apache/clojure_mxnet/random_test.clj | 4 +- docs/_static/js/options.js | 5 +- docs/_static/mxnet-theme/index.html| 6 +- docs/_static/mxnet-theme/navbar.html | 4 +- docs/api/perl/io.md| 1 + docs/api/python/io/io.md | 1 + docs/api/python/libinfo/libinfo.md | 77 +-- docs/install/build_from_source.md | 2 +- docs/install/download.md | 1 + docs/install/index.md | 59 -- docs/install/ubuntu_setup.md | 2 +- example/quantization/imagenet_inference.py | 84 ++-- include/mxnet/c_api.h | 4 +- perl-package/AI-MXNet/lib/AI/MXNet/IO.pm | 1 + python/mxnet/gluon/nn/conv_layers.py | 6 +- python/mxnet/random.py | 6 +- python/mxnet/runtime.py| 23 ++- src/executor/infer_graph_attr_pass.cc | 76 ++- src/io/iter_image_recordio_2.cc| 55 - src/ndarray/ndarray.cc | 5 - src/operator/contrib/bounding_box-common.h | 118 +++ src/operator/contrib/bounding_box-inl.cuh | 223 + src/operator/contrib/bounding_box-inl.h| 115 +++ src/operator/nn/cudnn/cudnn_convolution-inl.h | 8 +- src/operator/nn/dropout-inl.h | 2 +- .../quantization/mkldnn/mkldnn_quantize_v2-inl.h | 31 ++- src/operator/quantization/quantize-inl.h | 4 + src/operator/quantization/quantize_v2-inl.h| 109 ++ src/operator/quantization/quantize_v2.cc | 6 + src/operator/softmax_output-inl.h | 5 - src/operator/softmax_output.cc
[incubator-mxnet] branch master updated: Julia: add binding for runtime feature detection (#13992)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new 73b29fa Julia: add binding for runtime feature detection (#13992) 73b29fa is described below commit 73b29fa90d3eac0b1fae403b7583fdd1529942dc Author: Iblis Lin AuthorDate: Tue Mar 12 15:52:09 2019 +0800 Julia: add binding for runtime feature detection (#13992) --- julia/deps/build.jl | 7 ++--- julia/src/MXNet.jl | 1 + julia/src/base.jl| 7 +++-- julia/src/runtime.jl | 76 4 files changed, 84 insertions(+), 7 deletions(-) diff --git a/julia/deps/build.jl b/julia/deps/build.jl index 9a719be..badca65 100644 --- a/julia/deps/build.jl +++ b/julia/deps/build.jl @@ -51,9 +51,10 @@ elseif Sys.islinux() end if Sys.isunix() - try -push!(CUDAPATHS, replace(strip(read(`which nvcc`, String)), "bin/nvcc", "lib64")) - catch + nvcc_path = Sys.which("nvcc") + if nvcc_path ≢ nothing +@info "Found nvcc: $nvcc_path" +push!(CUDAPATHS, replace(nvcc_path, "bin/nvcc", "lib64")) end end diff --git a/julia/src/MXNet.jl b/julia/src/MXNet.jl index 70eda96..89ec88b 100644 --- a/julia/src/MXNet.jl +++ b/julia/src/MXNet.jl @@ -137,6 +137,7 @@ export to_graphviz include("base.jl") +include("runtime.jl") include("context.jl") include("util.jl") diff --git a/julia/src/base.jl b/julia/src/base.jl index 61779d1..6831464 100644 --- a/julia/src/base.jl +++ b/julia/src/base.jl @@ -85,12 +85,11 @@ function mx_get_last_error() end "Utility macro to call MXNet API functions" -macro mxcall(fv, argtypes, args...) - f = eval(fv) +macro mxcall(f, argtypes, args...) args = map(esc, args) quote -_mxret = ccall(($(QuoteNode(f)), $MXNET_LIB), - Cint, $argtypes, $(args...)) +_mxret = ccall(($f, $MXNET_LIB), + Cint, $(esc(argtypes)), $(args...)) if _mxret != 0 err_msg = mx_get_last_error() throw(MXError(err_msg)) diff --git a/julia/src/runtime.jl b/julia/src/runtime.jl new file mode 100644 index 000..cedcced --- /dev/null +++ b/julia/src/runtime.jl @@ -0,0 +1,76 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# runtime detection of compile time features in the native library + +module MXRuntime + +using ..mx + +export LibFeature +export feature_list, isenabled + +# defined in include/mxnet/c_api.h +struct LibFeature + _name::Ptr{Cchar} + enabled::Bool +end + +function Base.getproperty(x::LibFeature, p::Symbol) + (p == :name) && return unsafe_string(getfield(x, :_name)) + getfield(x, p) +end + +Base.show(io::IO, x::LibFeature) = + print(io, ifelse(x.enabled, "✔", "✖"), " ", x.name) + +""" +feature_list() + +Check the library for compile-time features. +The list of features are maintained in libinfo.h and libinfo.cc +""" +function feature_list() + ref = Ref{Ptr{LibFeature}}(C_NULL) + s = Ref{Csize_t}(C_NULL) + @mx.mxcall(:MXLibInfoFeatures, (Ref{Ptr{LibFeature}}, Ref{Csize_t}), ref, s) + unsafe_wrap(Array, ref[], s[]) +end + +""" +isenabled(x::Symbol)::Bool + +Returns the given runtime feature is enabled or not. + +```julia-repl +julia> mx.isenabled(:CUDA) +false + +julia> mx.isenabled(:CPU_SSE) +true +``` + +See also `mx.feature_list()`. +""" +isenabled(x::Symbol) = + any(feature_list()) do i +Symbol(i.name) == x && i.enabled + end + +end # module MXRuntime + +using .MXRuntime
[incubator-mxnet] branch ib/jl-runtime-features deleted (was 1b5f894)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 1b5f894 update The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch master updated: Julia: split symbolic-node.jl into several snippets (#14024)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new ed83071 Julia: split symbolic-node.jl into several snippets (#14024) ed83071 is described below commit ed8307121ecb7d7f0717ccd080848f5b16dcf191 Author: Iblis Lin AuthorDate: Sat Mar 9 10:51:16 2019 +0800 Julia: split symbolic-node.jl into several snippets (#14024) - `symbolic-node/type.jl` - `symbolic-node/show.jl` - `symbolic-node/arithmetic.jl` - `symbolic-node/io.jl` - `symbolic-node/array.jl` - `symbolic-node/op.jl` - `symbolic-node/autodiff.jl` See also: #14001 --- julia/src/symbolic-node.jl| 987 +- julia/src/symbolic-node/arithmetic.jl | 127 + julia/src/symbolic-node/array.jl | 122 + julia/src/symbolic-node/autodiff.jl | 178 ++ julia/src/symbolic-node/io.jl | 58 ++ julia/src/symbolic-node/op.jl | 444 +++ julia/src/symbolic-node/show.jl | 62 +++ julia/src/symbolic-node/type.jl | 123 + 8 files changed, 1121 insertions(+), 980 deletions(-) diff --git a/julia/src/symbolic-node.jl b/julia/src/symbolic-node.jl index 8b7a8be..ba1c595 100644 --- a/julia/src/symbolic-node.jl +++ b/julia/src/symbolic-node.jl @@ -15,983 +15,10 @@ # specific language governing permissions and limitations # under the License. -""" -SymbolicNode - -SymbolicNode is the basic building block of the symbolic graph in MXNet.jl. -It's a callable object and supports following calls: - -(s::SymbolicNode)(args::SymbolicNode...) -(s::SymbolicNode)(; kwargs...) - -Make a new node by composing `s` with `args`. Or the arguments -can be specified using keyword arguments. -""" -mutable struct SymbolicNode - handle::MX_SymbolHandle -end - -const SymbolicNodeOrReal = Union{SymbolicNode,Real} - -# @unfuse SymbolicNode # for broadcasting - -Base.unsafe_convert(::Type{MX_handle}, obj::SymbolicNode) = - Base.unsafe_convert(MX_handle, obj.handle) -Base.convert(t::Type{MX_handle}, obj::SymbolicNode) = Base.unsafe_convert(t, obj) -Base.cconvert(t::Type{MX_handle}, obj::SymbolicNode) = Base.unsafe_convert(t, obj) - -""" -deepcopy(s::SymbolicNode) - -Make a deep copy of a SymbolicNode. -""" -function Base.deepcopy(s::SymbolicNode) - ref_hdr = Ref{MX_handle}(C_NULL) - @mxcall(:MXSymbolCopy, (MX_handle, Ref{MX_handle}), s, ref_hdr) - SymbolicNode(MX_SymbolHandle(ref_hdr[])) -end - -""" -copy(s::SymbolicNode) - -Make a copy of a SymbolicNode. The same as making a deep copy. -""" -Base.copy(s::SymbolicNode) = Base.deepcopy(s) - - -function (s::SymbolicNode)(args::SymbolicNode...) - s = deepcopy(s) - _compose!(s, args...) -end - -function (s::SymbolicNode)(; kwargs...) - s = deepcopy(s) - _compose!(s; kwargs...) -end - -macro _list_symbol_info(self, func_name) - quote -ref_sz= Ref{MX_uint}(0) -ref_names = Ref{char_pp}(0) -@mxcall($func_name, (MX_handle, Ref{MX_uint}, Ref{char_pp}), -$(esc(self)), ref_sz, ref_names) -narg = ref_sz[] -names = unsafe_wrap(Array, ref_names[], narg) -names = [Symbol(unsafe_string(x)) for x in names] -return names - end -end - -""" -list_arguments(s::SymbolicNode) - -List all the arguments of this node. The argument for a node contains both -the inputs and parameters. For example, a `FullyConnected` node will -have both data and weights in its arguments. A composed node (e.g. a MLP) will -list all the arguments for intermediate nodes. - -Returns a list of symbols indicating the names of the arguments. -""" -list_arguments(s::SymbolicNode) = @_list_symbol_info(s, :MXSymbolListArguments) - -""" -list_outputs(s::SymbolicNode) - -List all the outputs of this node. - -Returns a list of symbols indicating the names of the outputs. -""" -list_outputs(s::SymbolicNode) = @_list_symbol_info(s, :MXSymbolListOutputs) - - -""" -list_auxiliary_states(s::SymbolicNode) - - -List all auxiliary states in the symbool. - -Auxiliary states are special states of symbols that do not corresponds to an argument, -and do not have gradient. But still be useful for the specific operations. -A common example of auxiliary state is the moving_mean and moving_variance in BatchNorm. -Most operators do not have Auxiliary states. - -Returns a list of symbols indicating the names of the auxiliary states. -""" -list_auxiliary_states(s::SymbolicNode) = - @_list_symbol_info(s, :MXSymbolListAuxiliaryStates) - -""" -get_internals(s::SymbolicNode) - -Get a new grouped `SymbolicNode` whose output contains all the internal outputs of -this `SymbolicNode`. -&q
[incubator-mxnet] branch master updated: Julia: enable integration test (#14025)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new 8a63bde Julia: enable integration test (#14025) 8a63bde is described below commit 8a63bdecf2d9f12d34fe5874957ae4c867eb5f5b Author: Iblis Lin AuthorDate: Tue Feb 12 20:24:50 2019 +0800 Julia: enable integration test (#14025) --- ci/docker/runtime_functions.sh | 1 + ci/jenkins/Jenkins_steps.groovy | 4 ++-- julia/src/executor.jl | 2 +- julia/test/runtests.jl | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 63a2a1b..93f2d8c 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -953,6 +953,7 @@ unittest_ubuntu_cpu_julia() { export PATH="$1/bin:$PATH" export MXNET_HOME='/work/mxnet' export JULIA_DEPOT_PATH='/work/julia-depot' +export INTEGRATION_TEST=1 julia -e 'using InteractiveUtils; versioninfo()' diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 5986eaf..cfbf484 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -1028,7 +1028,7 @@ def test_unix_r_gpu() { def test_unix_julia07_cpu() { return ['Julia 0.7: CPU': { node(NODE_LINUX_CPU) { -ws('workspace/ut-julia07-cpu') { +ws('workspace/ut-it-julia07-cpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_julia07', false) @@ -1041,7 +1041,7 @@ def test_unix_julia07_cpu() { def test_unix_julia10_cpu() { return ['Julia 1.0: CPU': { node(NODE_LINUX_CPU) { -ws('workspace/ut-julia10-cpu') { +ws('workspace/ut-it-julia10-cpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_julia10', false) diff --git a/julia/src/executor.jl b/julia/src/executor.jl index 29c21c8..e565617 100644 --- a/julia/src/executor.jl +++ b/julia/src/executor.jl @@ -169,7 +169,7 @@ function simple_bind(self::SymbolicNode, ctx::Context; end end - aux_arrays = [zeros(shape, ctx) for shape in aux_shapes] + aux_arrays = NDArray[zeros(shape, ctx) for shape in aux_shapes] return bind(self, ctx, arg_arrays, args_grad=grad_arrays, grad_req=grad_req, aux_states=aux_arrays) end diff --git a/julia/test/runtests.jl b/julia/test/runtests.jl index 4e5f273..e75df67 100644 --- a/julia/test/runtests.jl +++ b/julia/test/runtests.jl @@ -39,7 +39,7 @@ include(joinpath(@__DIR__, "common.jl")) test_dir(joinpath(@__DIR__, "unittest")) # run the basic MNIST mlp example - if haskey(ENV, "CONTINUOUS_INTEGRATION") + if haskey(ENV, "INTEGRATION_TEST") @testset "MNIST Test" begin include(joinpath(BASEDIR, "examples", "mnist", "mlp-test.jl")) end
[incubator-mxnet] branch ib/jl-integration-test deleted (was 83cdbcb)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-integration-test in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 83cdbcb Julia: enable integration test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/jl-runtime-features updated: mx.isenabled
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/jl-runtime-features by this push: new 84aec6e mx.isenabled 84aec6e is described below commit 84aec6e5087f6ef6ac60f5bd4dfe10c61410367a Author: Iblis Lin AuthorDate: Tue Feb 12 12:20:55 2019 + mx.isenabled --- julia/src/base.jl| 7 +++ julia/src/runtime.jl | 27 +++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/julia/src/base.jl b/julia/src/base.jl index 61779d1..6831464 100644 --- a/julia/src/base.jl +++ b/julia/src/base.jl @@ -85,12 +85,11 @@ function mx_get_last_error() end "Utility macro to call MXNet API functions" -macro mxcall(fv, argtypes, args...) - f = eval(fv) +macro mxcall(f, argtypes, args...) args = map(esc, args) quote -_mxret = ccall(($(QuoteNode(f)), $MXNET_LIB), - Cint, $argtypes, $(args...)) +_mxret = ccall(($f, $MXNET_LIB), + Cint, $(esc(argtypes)), $(args...)) if _mxret != 0 err_msg = mx_get_last_error() throw(MXError(err_msg)) diff --git a/julia/src/runtime.jl b/julia/src/runtime.jl index bb8a81c..fcdadfb 100644 --- a/julia/src/runtime.jl +++ b/julia/src/runtime.jl @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. - # runtime detection of compile time features in the native library module MXRuntime @@ -23,7 +22,7 @@ module MXRuntime using ..mx export LibFeature -export libinfo_features +export libinfo_features, isenabled # defined in include/mxnet/c_api.h struct LibFeature @@ -42,12 +41,32 @@ Check the library for compile-time features. The list of features are maintained in libinfo.h and libinfo.cc """ function libinfo_features() - ref = Ref{Ptr{mx.MXRuntime.LibFeature}}(C_NULL) + ref = Ref{Ptr{LibFeature}}(C_NULL) s = Ref{Csize_t}(C_NULL) - mx.@mxcall(:MXLibInfoFeatures, (Ref{Ptr{mx.MXRuntime.LibFeature}}, Ref{Csize_t}), ref, s) + @mx.mxcall(:MXLibInfoFeatures, (Ref{Ptr{LibFeature}}, Ref{Csize_t}), ref, s) unsafe_wrap(Array, ref[], s[]) end +""" +isenabled(x::Symbol)::Bool + +Returns the given runtime feature is enabled or not. + +```julia-repl +julia> mx.isenabled(:CUDA) +false + +julia> mx.isenabled(:CPU_SSE) +true +``` + +See also `mx.libinfo_features`. +""" +isenabled(x::Symbol) = + any(libinfo_features()) do i +Symbol(unsafe_string(i.name)) == x && i.enabled + end + end # module MXRuntime using .MXRuntime
[incubator-mxnet] branch ib/jl-runtime-features updated: 2 space
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/ib/jl-runtime-features by this push: new 38e08f9 2 space 38e08f9 is described below commit 38e08f97b9846960d1d6eaab95078d7f316dfaf0 Author: Iblis Lin AuthorDate: Tue Feb 12 06:23:47 2019 + 2 space --- julia/src/runtime.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/julia/src/runtime.jl b/julia/src/runtime.jl index 04ab973..bb8a81c 100644 --- a/julia/src/runtime.jl +++ b/julia/src/runtime.jl @@ -33,7 +33,7 @@ struct LibFeature end Base.show(io::IO, x::LibFeature) = - print(io, ifelse(x.enabled, "✔", "✖"), "\t", unsafe_string(x.name)) + print(io, ifelse(x.enabled, "✔", "✖"), " ", unsafe_string(x.name)) """ libinfo_features()
[incubator-mxnet] branch ib/jl-runtime-features updated (44156b5 -> f145581)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-runtime-features in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 44156b5 Julia: add binding for runtime feature detection new 183be8c Gradient multiplier (contrib) operator (#13632) new dfb397e Update README.md (#13973) new b30fba6 Fixing the doc for symbolic version of rand_zipfian (#13978) new 4700b40 Gluon end to end tutorial (#13411) new 24412df [MXNET-1293] Adding Iterables instead of List to method signature for infer APIs in Java (#13977) new 49e8c57 Use CPUPinned context in ImageRecordIOParser2 (#13980) new 577275d Added optional parameters to BilinearResize2D to do relative scaling (#13985) new f1c063e [MXNET-1301] Remove the unnecessary WaitAll statements from inception_inference example (#13972) new 0f334ae [MXNET-1000] get Ndarray real value and form it from a NDArray (#12690) new 5dc138d api change (#13903) new 25e915b ONNX export: Add Crop, Deconvolution and fix the default stride of Pooling to 1 (#12399) new 28c20fb Sample python bilinear initializer at integral points in y-direction (#12983) new 3df0917 [MXNET-703] Minor refactor of TensorRT code (#13311) new bc98c0d Python BucketingModule bind() with grad_req = 'add' (#13984) new da5242b MXNET-1295 Adding integer index support to Sequence* family of operators. (#13880) new 195d4f1 Disabled flaky test test_negative_binomial_generator (#13784) new c701be5 Fix website error pages (#13963) new a82094d build docs with CPP package (#13983) new 7b9779a Update scala-package gitignore configuration. (#13962) new c4080de [MXNET-1232] fix demo and add Eclipse support (#13979) new dbbd252 fix compile error in debug mode (#13873) new 3a1a80a Image normalize operator - GPU support, 3D/4D inputs (#13802) new b9e02ab remove debug; add support for v1.4.x docs; fix publish bug (#14015) new e37ff53 Return value docs for nd.random.* and sym.random.* (#13994) new 36a3cb8 Julia: split ndarray.jl into several snippets (#14001) new c939c2d float32 -> float16 cast consistency across implementations (#13857) new 89c7d57 Improve bulking in Gluon (#13890) new 47277b0 Fix MXNet R package build (#13952) new 8102606 Fix inconsistent handling for FResourceRequestEx for imperative and symbolic executor (#14007) new 9a3e4a0 [MXNET-1180] Java Image API (#13807) new 2a4634b Export resize and support batch size (#14014) new 439377d add NAG optimizer to r api (#14023) new f95e794 Now passing DType of Label downstream to Label's DataDesc object (#14038) new d02beeb fix test_stn (#14063) new 3d809c1 re-enable test after issue fixed https://github.com/apache/incubator-mxnet/issues/10973 (#14032) new 7ad4aca Remove all usages of makefile for scala (#14013) new 9de7e5a fix nightly test on tutorials (#14036) new 9aba77b update the scala installation tutorial on intellij (#14033) new f86f21e Image ToTensor operator - GPU support, 3D/4D inputs (#13837) new ac962cd rewrote the concat test to avoid flaky failures (#14049) new 8ba6402 Fix website scala doc (#14065) new fbc5723 [Clojure] Add resource scope to clojure package (#13993) new 41b81c3 Update NOTICE (#14043) new 3f6778b modifying SyncBN doc for FP16 use case (#14041) new 78870c0 add new cloud providers to install page (#14039) new 18b8704 CUDNN dropout (#13896) new 41ba014 fix test_depthwise_convoltuion for occasional CI failures (#14016) new ae997eb ONNX export: broadcast_to, tile ops (#13981) new 7c7af3a [MXNET-1258]fix unittest for ROIAlign Operator (#13609) new df4a4fd Fix performance regression in normalize operator (#14055) new 9e14f14 Add maven wraper to scala project. (#13702) new 149d8105 Increase perfomance of BulkAppend and BulkFlush (#14067) new 8191585 [MXNET-1178] updating scala docs (#14070) new d684c59 update the version name (#14076) new febbdd4 [MXNET-1121] Example to demonstrate the inference workflow using RNN (#13680) new 506a25c hybridize rnn and add model graph (#13244) new 26ca37c Exclude concat layer for gpu quantization (#14060) new 2ff8ce0 Remove inplace support for ToTensor operator (#14083) new 8b4a69a [MKLDNN] Enable signed int8 support for convolution. (#13697) new 0a2419f [MXNET-1291] solve pylint errors in examples with issue no.12205 (#13815) new f906681 increased docker shared memory (#14119) new ab5a0cf Performance improvement in ToTensor GPU Kernel (#14099) new 61d6917 Add libhdf5-dev to ubuntu_core.sh (#14079) new f5ba735 Addresses comments in runtime feature discovery API (#13964) new a0d4d3c Julia: add binding for runtime feature detection
[incubator-mxnet] branch master updated: Julia: split ndarray.jl into several snippets (#14001)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new 36a3cb8 Julia: split ndarray.jl into several snippets (#14001) 36a3cb8 is described below commit 36a3cb828aa1c97de071f2e6e71d136bee11963a Author: Iblis Lin AuthorDate: Wed Jan 30 15:35:43 2019 +0800 Julia: split ndarray.jl into several snippets (#14001) - `ndarray/type.jl` - `ndarray/context.jl` - `ndarray/show.jl` - `ndarray/remap.jl` - `ndarray/array.jl` - `ndarray/arithmetic.jl` - `ndarray/comparison.jl` - `ndarray/io.jl` - `ndarray/reduction.jl` - `ndarray/statistic.jl` - `ndarray/linalg.jl` - `ndarray/trig.jl` - `ndarray/activation.jl` - `ndarray/autoimport.jl` --- julia/src/ndarray.jl| 1827 +-- julia/src/ndarray/activation.jl | 87 ++ julia/src/ndarray/arithmetic.jl | 291 +++ julia/src/ndarray/array.jl | 712 +++ julia/src/ndarray/autoimport.jl | 227 + julia/src/ndarray/comparison.jl | 56 ++ julia/src/ndarray/context.jl| 29 + julia/src/ndarray/io.jl | 135 +++ julia/src/ndarray/linalg.jl | 23 + julia/src/ndarray/reduction.jl | 115 +++ julia/src/ndarray/remap.jl | 133 +++ julia/src/ndarray/show.jl | 31 + julia/src/ndarray/statistic.jl | 24 + julia/src/ndarray/trig.jl | 32 + julia/src/ndarray/type.jl | 152 15 files changed, 2061 insertions(+), 1813 deletions(-) diff --git a/julia/src/ndarray.jl b/julia/src/ndarray.jl index 52c6dd2..256fdb4 100644 --- a/julia/src/ndarray.jl +++ b/julia/src/ndarray.jl @@ -15,1816 +15,17 @@ # specific language governing permissions and limitations # under the License. -# All the types supported by mshadow. See `mshadow/base.h` -const DType = Union{Float32, Float64, Float16, UInt8, Int32, Int8, Int64} -@enum TypeFlag kFloat32 kFloat64 kFloat16 kUint8 kInt32 kInt8 kInt64 -const DEFAULT_DTYPE = Float32 # MSHADOW_DEFAULT_DTYPE - -function toTypeFlag(T::Type{<:DType}) - if T == Float32 -return kFloat32 - elseif T == Float64 -return kFloat64 - elseif T == Float16 -return kFloat16 - elseif T == UInt8 -return kUint8 - elseif T == Int32 -return kInt32 - elseif T == Int8 -return kInt8 - elseif T == Int64 -return kInt64 - else -throw(ArgumentError("Can't convert $T to DType.")) - end -end - -function fromTypeFlag(T::TypeFlag) - if T == kFloat32 -return Float32 - elseif T == kFloat64 -return Float64 - elseif T == kFloat16 -return Float16 - elseif T == kUint8 -return UInt8 - elseif T == kInt32 -return Int32 - elseif T == kInt8 -return Int8 - elseif T == kInt64 -return Int64 - else -throw(ArgumentError("Can't convert DType $T.")) - end -end - -# create a NDArray handle of specific shape -function _ndarray_alloc(shape::NTuple{N,Int}, ctx::Context, delay_alloc::Bool) where N - h_ref = Ref{MX_handle}(0) - shape = collect(reverse(MX_uint.(shape))) - @mxcall(:MXNDArrayCreate, (Ptr{MX_uint}, MX_uint, Cint, Cint, Cint, Ref{MX_handle}), - shape, N, ctx.device_type, ctx.device_id, delay_alloc, h_ref) - handle = MX_NDArrayHandle(h_ref[]) - return handle -end - -# create a NDArray handle of specific shape type -function _ndarray_alloc(::Type{T}, shape::NTuple{N,Int}, ctx::Context, delay_alloc::Bool) where {T<:DType,N} - h_ref = Ref{MX_handle}(0) - shape = collect(reverse(MX_uint.(shape))) - dtype = toTypeFlag(T) - @mxcall(:MXNDArrayCreateEx, (Ptr{MX_uint}, MX_uint, Cint, Cint, Cint, Cint, Ref{MX_handle}), - shape, N, ctx.device_type, ctx.device_id, delay_alloc, dtype, h_ref) - handle = MX_NDArrayHandle(h_ref[]) - return handle -end - -# create a handle to an empty NDArray, this handle can be used to hold -# results returned by libmx API calls -function _ndarray_alloc() - h_ref = Ref{MX_handle}(0) - @mxcall(:MXNDArrayCreateNone, (Ref{MX_handle},), h_ref) - return MX_NDArrayHandle(h_ref[]) -end - - -# NDArray Type - -""" -NDArray{T,N} - -Wrapper of the `NDArray` type in `libmxnet`. This is the basic building block -of tensor-based computation. - -!!! note - since C/C++ use row-major ordering for arrays while Julia follows a - column-major ordering. To keep things consistent, we keep the underlying data - in their original layout, but use *language-native* convention when we talk - about shapes. For example, a mini-batch of 100 MNIST images is a tensor of - C/C++/Python shape (100,1,28,28), while in Julia, the same piece of memory - have shape (28,28,1,100). -&
[incubator-mxnet] branch ib/jl-ndarray-split deleted (was 548636d)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-ndarray-split in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 548636d Julia: split ndarray.jl into several snippets The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/base-clamp updated (94c90ca -> 26b88b8)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/base-clamp in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 94c90ca Julia: rename `mx.clip` to `clamp` for `NDArra` new 26b88b8 Julia: rename `mx.clip` to `clamp` for `NDArray` This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (94c90ca) \ N -- N -- N refs/heads/ib/base-clamp (26b88b8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9230 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. Summary of changes:
[incubator-mxnet] branch ib/bump-jl10 deleted (was 907f066)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/bump-jl10 in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 907f066 CI: upgrade Julia version from 1.0.3 to 1.0.4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] 01/01: julia/ndarray: fix flaky test cases for `clamp`
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/jl-fix-clamp-test in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit 9f2159b200cdf54a2bb37ee7c0a2c30008f4764f Author: Iblis Lin AuthorDate: Tue Apr 23 09:53:29 2019 + julia/ndarray: fix flaky test cases for `clamp` ref: #14757 --- julia/test/unittest/ndarray.jl | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/julia/test/unittest/ndarray.jl b/julia/test/unittest/ndarray.jl index 26695e8..638963f 100644 --- a/julia/test/unittest/ndarray.jl +++ b/julia/test/unittest/ndarray.jl @@ -886,18 +886,20 @@ function test_saveload() end function test_clamp() - dims = rand_dims() - @info("NDArray::clamp::dims = $dims") - - j_array, nd_array = rand_tensors(dims) - clip_up = maximum(abs.(j_array)) / 2 - clip_down = 0 - clipped = clamp(nd_array, clip_down, clip_up) + @info("NDArray::clamp::dims") + + A = [1 2 3; + 4 5 6; + 7 8 9.] + B = [3 3 3; + 4 5 6; + 7 8 8.] + x = NDArray(A) + y = clamp(x, 3., 8.) # make sure the original array is not modified - @test copy(nd_array) ≈ j_array - - @test all(clip_down .<= copy(clipped) .<= clip_up) + @test copy(x) ≈ A + @test copy(y) ≈ B @info("NDArray::clamp!") let
[incubator-mxnet] branch ib/jl-fix-clamp-test created (now 9f2159b)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-fix-clamp-test in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at 9f2159b julia/ndarray: fix flaky test cases for `clamp` This branch includes the following new commits: new 9f2159b julia/ndarray: fix flaky test cases for `clamp` The 1 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] branch ib/jl-fix-clamp-test updated (9f2159b -> ae2e430)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-fix-clamp-test in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 9f2159b julia/ndarray: fix flaky test cases for `clamp` discard 871626e Improve CMake handling of sse2 and sse3 Fix #14304 where CFLAGS were overriden instead of appended to. new 68efc15 fix custom op fork test (#14753) new 494c29e [BUGFIX] fix ELU function will appear nan when calculating the gradient (#14673) new da7fff7 fix min max on zero-sized ndarray (#14745) new ae2e430 julia/ndarray: fix flaky test cases for `clamp` This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9f2159b) \ N -- N -- N refs/heads/ib/jl-fix-clamp-test (ae2e430) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9515 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. Summary of changes: CMakeLists.txt | 14 +--- python/mxnet/gluon/nn/activations.py | 3 ++- src/operator/tensor/broadcast_reduce_op.h| 27 src/operator/tensor/broadcast_reduce_op_value.cc | 4 ++-- tests/python/gpu/test_operator_gpu.py| 1 + tests/python/unittest/test_gluon.py | 2 +- tests/python/unittest/test_operator.py | 20 +- 7 files changed, 57 insertions(+), 14 deletions(-)
[incubator-mxnet] branch ib/jl-fix-clamp-test deleted (was ae2e430)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-fix-clamp-test in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was ae2e430 julia/ndarray: fix flaky test cases for `clamp` The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/jl-mxnet-root-env updated (36076c4 -> c0ab006)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 36076c4 Merge branch 'master' into ib/jl-mxnet-root-env add 67acbe5 [DOC] Fix many arguments in the doc: reshape_like, arange_like, shape_array (#15752) add 8c2bef5 Add Gather_nd Scatter_nd to NDArray API category doc (#15689) add 51c07e5 [Dependency Update] Dependency update doc (#15045) add ce62873 Add quantization support for GluonCV (#15754) add 7186123 Revert "Dynamic Library Loading Support" (#15755) add aadef2d Fix flaky test test_global_metric (#15756) add 45db8ea Add matrix determinant operator in linalg (#15007) add 07eb482 fix tvm cmake (#15781) add a2b11ae Fix PR #15489 (Dynamic Library Loading Support) (#15760) add be49b3b Numpy-compatible Infra (#15581) add 79d8d86 Fix the bug of `MXEnginePushAsyncND` and `MXEnginePushSyncND` (#15751) add b6972bb add int8 bn mkldnn implementation and test (#15664) add b77f524 [MXNET-1206] Support NDArray indexing with None and Ellipsis (#13143) add a3babc4 numpy-compatible sum (#15810) add 19916af fix license issues (#15806) add bfd3bb8 Refactor LibraryInitializer so it's thread safe. Fixes random sporadical concurrency crashes. (#15762) add 0eb213d Fix backward_clip num inputs and type of clip params (#15688) add 44a7fca [Numpy] Numpy compatible slicing (#15798) add 614cba3 Making Features as a singleton for improved caching (#15835) add 57927a9 Clojure package remove source images (#15828) add c3f5eea Numpy Tensordot and Dot Operator (#15820) add bd32de4 fixing problem with existing Singleton Caching (#15868) add 795990b numpy linspace (#15852) add 05f3ae1 Large Index Support for Slice (#15593) add 67daae7 tvm infra for op attrs (#15854) add c81535c cuDNN support cleanup (#15812) add 39bf4e0 Port several np ops to master (#15867) add 11ce2a2 Add large tensor support binary arithmetic (#15785) add 24a5cf0 Allow operators with multiple outputs in get_atomic_symbol (#15740) add f32b58e numpy-compatible split upstream (#15841) add b914d0a Large tensor support for random ops (#15783) add 843c3ab Add Large Tensor Support for Sequence, NN Ops (#15807) add 3d8035b Numpy-compatible concatenate upstream (#15894) add 78733f0 Numpy-compatible concatenate upstream (#15894) add b98f297 Numpy-compatible concatenate upstream (#15894) add 9dbfc2d Numpy-compatible concatenate upstream (#15894) add 40593c6 Fix ConcatType backward type inference (#15829) add f586c07 [OpPerf] Profiler flag for Python, Cpp (#15881) add acc7865 added check for empty params file and unknown param (not arg/aux) (#15917) add c8f0b21 Remove Scala package test on build (#15915) add c0ab006 Merge branch 'master' into ib/jl-mxnet-root-env No new revisions were added by this update. Summary of changes: CMakeLists.txt | 19 +- LICENSE| 355 +++- Makefile |5 +- benchmark/opperf/nd_operations/array_rearrange.py |4 +- benchmark/opperf/nd_operations/binary_operators.py |8 +- benchmark/opperf/nd_operations/gemm_operators.py |6 +- .../nd_operations/nn_activation_operators.py |5 +- .../opperf/nd_operations/nn_basic_operators.py |5 +- .../opperf/nd_operations/nn_conv_operators.py | 12 +- .../opperf/nd_operations/nn_optimizer_operators.py |4 +- .../nd_operations/random_sampling_operators.py |4 +- .../opperf/nd_operations/reduction_operators.py|4 +- .../nd_operations/sorting_searching_operators.py |4 +- benchmark/opperf/nd_operations/unary_operators.py |4 +- benchmark/opperf/opperf.py | 40 +- benchmark/opperf/utils/benchmark_utils.py | 27 +- benchmark/opperf/utils/common_utils.py | 38 +- benchmark/opperf/utils/ndarray_utils.py|4 - benchmark/opperf/utils/profiler_utils.py | 57 +- ci/jenkins/Jenkins_steps.groovy| 10 +- ci/jenkins/Jenkinsfile_unix_cpu|2 +- ci/publish/scala/build.sh |2 +- cmake/BuildTVM.cmake |2 +- contrib/clojure-package/.gitignore |1 + .../infer/objectdetector/images/marcel.jpg | Bin 116161 -> 0 bytes .../clojure-package/scripts/get_test_images.sh | 26 +- .../test/org/apache/clojure_mxnet/image_test.clj |6 +- .../clojure_mxnet/infer/imageclassifier_test.clj |5 +- .../test/test-images/Pug-Cookie.jpg| Bin 104323 -> 0 bytes .../clojure-package/test/test-i
[incubator-mxnet] branch master updated (287e3b5 -> d9364ba)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 287e3b5 Numpy add numpy op indices (#15837) add d9364ba julia: fix `mx.forward` kwargs checking (#16138) No new revisions were added by this update. Summary of changes: julia/src/executor.jl | 2 +- julia/test/unittest/bind.jl | 15 +++ 2 files changed, 16 insertions(+), 1 deletion(-)
[incubator-mxnet] branch ib/fix-forward deleted (was bb8a6f4)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/fix-forward in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was bb8a6f4 julia: fix `mx.forward` kwargs checking The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/backport-jl updated (aa3677d -> 6559b80)
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. from aa3677d update julia install doc (#15609) add 6559b80 julia: fix `mx.forward` kwargs checking (#16138) No new revisions were added by this update. Summary of changes: julia/src/executor.jl | 2 +- julia/test/unittest/bind.jl | 15 +++ 2 files changed, 16 insertions(+), 1 deletion(-)
[incubator-mxnet] branch ib/jl-cmake-build created (now 82a8b6e)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-cmake-build in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at 82a8b6e julia: migrate build process to cmake This branch includes the following new commits: new 82a8b6e julia: migrate build process to cmake The 1 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] 01/01: julia: migrate build process to cmake
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/jl-cmake-build in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit 82a8b6e9796d352beabc19351d729edcf9219990 Author: Iblis Lin AuthorDate: Mon Sep 9 05:01:02 2019 + julia: migrate build process to cmake The original build process triggered by `Pkg.add` is done by GNU make. --- julia/Project.toml | 1 + julia/deps/build.jl | 141 julia/src/base.jl | 19 +++ 3 files changed, 53 insertions(+), 108 deletions(-) diff --git a/julia/Project.toml b/julia/Project.toml index 994a696..ca41bb7 100644 --- a/julia/Project.toml +++ b/julia/Project.toml @@ -5,6 +5,7 @@ version = "1.6.0" [deps] BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee" +CMake = "631607c0-34d2-5d66-819e-eb0f9aa2061a" Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0" JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" diff --git a/julia/deps/build.jl b/julia/deps/build.jl index dfd3f78..96b1634 100644 --- a/julia/deps/build.jl +++ b/julia/deps/build.jl @@ -15,6 +15,7 @@ # specific language governing permissions and limitations # under the License. +using CMake using JSON using Libdl using LinearAlgebra @@ -75,7 +76,7 @@ if Sys.isunix() nvcc_path = Sys.which("nvcc") if nvcc_path ≢ nothing @info "Found nvcc: $nvcc_path" -push!(CUDAPATHS, replace(nvcc_path, "bin/nvcc", "lib64")) +push!(CUDAPATHS, replace(nvcc_path, "bin/nvcc" => "lib64")) end end @@ -114,19 +115,17 @@ else end # propagate more build flags from ENV -const CC = get(ENV, "CC", nothing) -const CXX = get(ENV, "CXX", nothing) -const ADD_CFLAGS = get(ENV, "ADD_CFLAGS", nothing) -const ADD_LDFLAGS = get(ENV, "ADD_LDFLAGS", nothing) -const USE_JEMALLOC = get(ENV, "USE_JEMALLOC", nothing) # "0" or "1" - -function get_cpucore() -if haskey(ENV, "TRAVIS") # on travis-ci -2 -else -min(Sys.CPU_THREADS, 32) -end -end +const USE_JEMALLOC = get(ENV, "USE_JEMALLOC", nothing) # "ON" or "OFF" + +get_cpucore() = min(Sys.CPU_THREADS, 32) + +cmake_bool(x::Bool) = ifelse(x ≡ true, "ON", "OFF") + +cmake_jemalloc(::Nothing) = "" +cmake_jemalloc(x::Bool) = "-DUSE_JEMALLOC=" * cmake_bool(x) + +cmake_cuda_path(::Nothing) = "" +cmake_cuda_path(x::String) = "-DUSE_CUDA_PATH=" * x using BinDeps @BinDeps.setup @@ -167,7 +166,7 @@ if !libmxnet_detected # testing run(`cmd /c dir "usr\\lib"`) return - end + end # if Sys.iswindows() # If not found, try to build automatically using BinDeps @@ -181,7 +180,6 @@ if !libmxnet_detected ilp64 = "-DINTERFACE64" end - FORCE_LAPACK = false if blas_vendor == :unknown @info("Julia is built with an unkown blas library ($blas_path).") @info("Attempting build without reusing the blas library") @@ -191,33 +189,34 @@ if !libmxnet_detected @info("Attempting build anyway.") USE_JULIA_BLAS = true else -USE_JULIA_BLAS = true -FORCE_LAPACK = true +USE_JULIA_BLAS = false end @info("USE_JULIA_BLAS -> $USE_JULIA_BLAS") - blas_name = blas_vendor == :openblas64 ? "openblas" : string(blas_vendor) - MSHADOW_LDFLAGS = "MSHADOW_LDFLAGS=-lm $blas_path" + blas_name = occursin("openblas", string(blas_vendor)) ? "open" : string(blas_vendor) # # Build libmxnet mxnet = library_dependency("mxnet", aliases=["mxnet", "libmxnet", "libmxnet.so"]) - _prefix = joinpath(BinDeps.depsdir(mxnet), "usr") + _blddir = joinpath(BinDeps.depsdir(mxnet), "build") _srcdir = joinpath(BinDeps.depsdir(mxnet), "src") _mxdir = joinpath(_srcdir, "mxnet") - _libdir = joinpath(_prefix, "lib") - # We have do eagerly delete the installed libmxnet.so + + # We have do eagerly delete the build stuffs. # Otherwise we won't rebuild on an update. - run(`rm -f $_libdir/libmxnet.$(Libdl.dlext)`) + rm(_blddir, recursive=true, force=true) + + @debug "build dir -> $_blddir" + provides(BuildProcess, (@build_steps begin + CreateDirectory(_blddir) CreateDirectory(_srcdir) - CreateDirectory(_libdir) @build_steps begin BinDeps.DirectoryRule(_mxdir, @build_steps begin ChangeDirectory(_srcdi
[incubator-mxnet] 01/01: julia: fix `mx.forward` kwargs checking
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/fix-forward in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit bb8a6f42b89b090c9b134d5710157606e9b99494 Author: Iblis Lin AuthorDate: Wed Sep 11 04:18:45 2019 + julia: fix `mx.forward` kwargs checking close https://github.com/dmlc/MXNet.jl/issues/431 --- julia/src/executor.jl | 2 +- julia/test/unittest/bind.jl | 15 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/julia/src/executor.jl b/julia/src/executor.jl index e565617..37f2dde 100644 --- a/julia/src/executor.jl +++ b/julia/src/executor.jl @@ -176,7 +176,7 @@ end function forward(self::Executor; is_train::Bool = false, kwargs...) for (k,v) in kwargs -@assert(k ∈ self.arg_dict, "Unknown argument $k") +@assert(k ∈ keys(self.arg_dict), "Unknown argument $k") @assert(isa(v, NDArray), "Keyword argument $k must be an NDArray") copy!(self.arg_dict[k], v) end diff --git a/julia/test/unittest/bind.jl b/julia/test/unittest/bind.jl index 0ae0ab4..a221733 100644 --- a/julia/test/unittest/bind.jl +++ b/julia/test/unittest/bind.jl @@ -84,11 +84,26 @@ function test_arithmetic() end end +function test_forward() + # forward with data keyword argument + x = @var x + y = x .+ 42 + + A = 1:5 + B = A .+ 42 + + e = bind(y, args = Dict(:x => NDArray(24:28))) + z = forward(e, x = NDArray(A))[1] + + @test copy(z) == collect(B) +end + # Run tests @testset "Bind Test" begin test_arithmetic() + test_forward() end end
[incubator-mxnet] branch ib/fix-forward created (now bb8a6f4)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/fix-forward in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at bb8a6f4 julia: fix `mx.forward` kwargs checking This branch includes the following new commits: new bb8a6f4 julia: fix `mx.forward` kwargs checking The 1 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)
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 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 + + + + + + + + Pkg + Build from Source + + + + + + @@ -582,8 +597,23 @@ You can use the Maven packages defined in the following dependency to include MX + + +``` +]add MXNet#v1.5.0 +``` + +Install the latest release: + +``` +]add MXNet +``` + + + Refer to the Julia section of the MXNet Ubuntu installation guide. + @@ -593,7 +623,7 @@ Refer to the Jul Refer to the Perl section of the MXNet Ubuntu installation guide. - + @@ -884,8 +914,23 @@ Not available at this time. + + +``` +]add MXNet#v1.5.0 +``` + +Install the latest release: + +``` +]add MXNet +``` + + + Refer to the Julia section of the MXNet macOS installation guide. + @@ -1226,8 +1271,23 @@ MXNet-Java for Windows is not yet available. + + +``` +]add MXNet#v1.5.0 +``` + +Install the latest release: + +``` +]add MXNet +``` + + + Refer to the Julia section of the MXNet Windows installation guide. + @@ -1237,7 +1297,7 @@ Refer to the Ju Refer to the Perl section of the MXNet Windows installation guide. - +
[incubator-mxnet] 01/02: julia: bump window prebult binary version to v1.5.0 (#15608)
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 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..000 --- 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`)
[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] branch ib/jl-cmake-build updated (8c73cd9 -> 3ef9cf0)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-cmake-build in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 8c73cd9 submodule update add 3ef9cf0 USE_JULIA_BLAS No new revisions were added by this update. Summary of changes: julia/deps/build.jl | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-)
[incubator-mxnet] branch ib/jl-cmake-build updated (6f27f0e -> 8c73cd9)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-cmake-build in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 6f27f0e build with Julia's private libopenblas add 8c73cd9 submodule update No new revisions were added by this update. Summary of changes: julia/deps/build.jl | 1 + 1 file changed, 1 insertion(+)
[incubator-mxnet] branch ib/jl-cmake-build updated (82a8b6e -> 6f27f0e)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-cmake-build in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 82a8b6e julia: migrate build process to cmake add 6f27f0e build with Julia's private libopenblas No new revisions were added by this update. Summary of changes: cmake/Modules/FindOpenBLAS.cmake | 25 ++--- julia/deps/build.jl | 10 -- julia/docs/src/user-guide/install.md | 9 + 3 files changed, 31 insertions(+), 13 deletions(-)
[incubator-mxnet] branch ib/jl-mxnet-root-env updated (89f6b30 -> 711d120)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 89f6b30 Merge branch 'ib/jl-mxnet-root-env' of github.com:apache/incubator-mxnet into ib/jl-mxnet-root-env add 711d120 Update julia/deps/build.jl No new revisions were added by this update. Summary of changes: julia/deps/build.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[incubator-mxnet] branch ib/jl-mxnet-root-env updated (c0ab006 -> 89f6b30)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from c0ab006 Merge branch 'master' into ib/jl-mxnet-root-env add 09cf75b Add power, exponent, log ops large tensor support (#15794) add 5a4c01b [Opperf] Filter out deprecated ops (#15541) add a8b9728 Add disable attr to subgraph property (#15926) add 1a6fe60 Refactor for windows CI 'out of heap space' errors (#15922) add 8eb0f61 Numpy-compatible stack upstream (#15842) add bcbdc1c Re-enable flaky test_prelu (#15777) add 64a0502 declare explicitly the tblob default assign operator and copy constructor (#15937) add c50bfe2 [OpPerf] Handle positional arguments (#15761) add 92d2319 [OpPerf] Take care of 4d param (#15736) add 3b7f888 removing unnecessary int64 C apis that were added to support Large Tensors and Vectors (#15944) add 3dfb19a Discard needless test cases in `test_convolution_independent_gradients` (#15939) add 5656a18 creating ndarray directly using mxnet ndarray primitives to reduce memory footprint of tests for topk, sort and argsort (#15900) add cd397a3 Benchmark doc fix (#15769) add 308e4ac Adding tests to verify support for Large Tensors in additional Ops along with new C_Apis supporting 64bit indexing (#15895) add d225074 fix naive engine for multi-threaded inference (#15574) add 0b5526b [Quantization]support exclude operators while quantization (#15910) add 521e925 [Numpy] Numpy behavior random.uniform() (#15858) add bdeb7bc Softmax optimization for GPU (#15545) add 681cfc4 [Dependency Update] [Doc] move the general prerequisite software to the top (#15896) add 434f185 [MKLDNN]Support fullyconnected and element-wise ops fusion (#15950) add 9023256 Tvm broadcast backward (#15938) add fa16a9e Disable test coverage for Clang MKLDNN (#15977) add fade159 Fix get_rows_per_block (#15979) add 73a692e Fix a memory misalignment in topk operator (#15948) add d8c2d85 update support MKLDNN BN conditions (#15870) add 717d883 Remove requests_failed_to_import handling add 8d0b895 np elemwise unary ops upstream (#15831) add 1eb1925 remove Julia cat image for license issue (#15964) add cba7c4e Add fp16 support for topk (#15560) add 77a633f Fix Nightly Maven GPU (#15989) add 2e4242e Add symbol api for randn and fix shape issue for randn ndarray and symbol api (#15772) add 3b7e484 Decouple dtype from shape for Random multinomial (#15980) add c7a8a78 Fix dtype inference in arange_like operator (#15930) add 5042d2a [MKLDNN] Fix out of bound access of req vector (#16000) add 7d8c2ec Disable laop_6 (#15976) add d8b6e47 Update CODEOWNERS. (#15972) add 9410cc4 add uint8 bn mkldnn implementation (#16003) add 72c180c Correct ONNX documentation (#15914) add acc074f Add AMP Conversion support for BucketingModule (#15528) add ab60214 Add Median,p50,p99 to python profiler (#15953) add 79ed678 [Numpy] random.randint() implemented (#15956) add 0e71fbd Added tests to verify Large Vector Support for initial set of ops (#15943) add 8df9469 Refines NDArray indexing and adds numpy ndarray indexing [READY FOR REVIEW] (#15942) add b2c0cbc Windows cmake flags cleanup (#16013) add 9b906a5 Improve diagnose.py to display environment variables (#15715) add 649429d Disable flaky test in test_amp_conversion (#16031) add 3f7b6ee Improve quantization flow (#15961) add 2d86c70 Port ops from np branch (#16018) add 196d1f4 [MXNET-1399] multiclass-mcc metric enhancements (#14874) add b7cca01 [MXNET-895] ONNX import/export: TopK (#13627) add 61f3dbc numpy-compatible cumsum upstream (#15924) add 5d0d335 Update README.md (#16035) add 36455b2 Add RROIAlign (#16017) add 35d943e Updates git_init Jenkins utility function to support checking out a particular commit id add 1597498 Adds artifact repository scripts add 87207c5 Adds CD pipeline framework add b73b8d4 Adds static libmxnet release pipeline add 0ed97f1 Updates CD pipeline add 5fe1516 Adds documentation add 1196c15 Updates kvstore functions to use pushd and popd add 23a7a58 Throws exceptions instead o magic numbers add e539370 Updates artifact repository cli to use --libtype instead of --static or --dynamic add fff8c82 Clarifies ci_utils and cd_utils origin remark add 0570892 Adds clarifying note on why ubuntu 14.04 is being used for compilation add 2b12c59 Removes MXNET_SHA add a8c0fe8 Removes set_release_job_name add 5cb26fd Adds license headers add 98cdf30 Updates artifact repository to expect licenses add 3027296 Moves ci/cd to cd directory add f6d0fc2 Takes
[incubator-mxnet] branch master updated (27a9782 -> 75ee1e9)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 27a9782 [Dataset] Add take, filter, sample API to dataset (#16078) add 75ee1e9 julia: rename build env var `MXNET_HOME` to `MXNET_ROOT` (#15568) No new revisions were added by this update. Summary of changes: ci/docker/runtime_functions.sh | 8 ci/windows/test_jl07_cpu.ps1 | 2 +- ci/windows/test_jl10_cpu.ps1 | 2 +- julia/NEWS.md| 7 +++ julia/deps/build.jl | 33 +++-- julia/docs/src/user-guide/install.md | 20 julia/src/base.jl| 30 +- 7 files changed, 77 insertions(+), 25 deletions(-)
[incubator-mxnet] branch ib/jl-mxnet-root-env deleted (was 711d120)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 711d120 Update julia/deps/build.jl The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch master updated: update julia install doc (#15609)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new f2ac85a update julia install doc (#15609) f2ac85a is described below commit f2ac85a7efe24278c76184e3651c13091875dfd0 Author: Ksoy 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 4217780..db8dae8 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -109,7 +109,22 @@ Indicate your preferred configuration. Then, follow the customized commands to i + + + + + + + + Pkg + Build from Source + + + + + + @@ -583,8 +598,23 @@ You can use the Maven packages defined in the following dependency to include MX + + +``` +]add MXNet#v1.5.0 +``` + +Install the latest release: + +``` +]add MXNet +``` + + + Refer to the Julia section of the MXNet Ubuntu installation guide. + @@ -594,7 +624,7 @@ Refer to the Jul Refer to the Perl section of the MXNet Ubuntu installation guide. - + @@ -885,8 +915,23 @@ Not available at this time. + + +``` +]add MXNet#v1.5.0 +``` + +Install the latest release: + +``` +]add MXNet +``` + + + Refer to the Julia section of the MXNet macOS installation guide. + @@ -1227,8 +1272,23 @@ MXNet-Java for Windows is not yet available. + + +``` +]add MXNet#v1.5.0 +``` + +Install the latest release: + +``` +]add MXNet +``` + + + Refer to the Julia section of the MXNet Windows installation guide. + @@ -1238,7 +1298,7 @@ Refer to the Ju Refer to the Perl section of the MXNet Windows installation guide. - +
[incubator-mxnet] branch ib/jl-mxnet-root-env updated (f1a36fb -> 36076c4)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from f1a36fb Revert "runtime_functions: test backward compatibility" add 858e171 1.5.0 news (#15137) add 0e0c7f3 fix LinearRegressionOutput with empty label (#15620) add 01fae12 bump up version from 1.5.0 to 1.6.0 on master (#15072) add 81ae341 [Doc] add squeeze to Array change shape (#15549) add 8158ba4 fix typo (#15648) add b00bb81 [Opperf] Add array rearrange operators to opperf (#15606) add e98fea3 [MKLDNN] Enable subgraph backend mkldnn by default. (#15518) add 5e6ba7b [Flaky test] Skip test_operator_gpu.test_convolution_independent_gradients (#15631) add c310763 update profiler tutorial (#15580) add 7bc3db8 Bump Scala version to 1.6 (#15660) add 6b22aa4 handle fix_gamma in tensorrt subgraph conversion correctly (#15645) add 08fd98d update website for 1.5.0 (#15641) add 3ececb3 in-place reshape ops (#14053) add 33ea2db [OpPerf] PDF Random ops fix (#15661) add 3d366a3 [Opperf] Add optimizer update operator benchmarks to opperf (#15522) add d464a47 Fix subgraph with custom_op (#15671) add a26af2b Remove myself from CODEOWNERS (#15617) add 8e31dad [MXNET-978] Add higher order gradient support `tan`, `tanh` (#15253) add 90f881d Fix USE_BLAS == openblas check (#15691) add 93708eb Fix url (404 error) (#15683) add 0f28f5b Add -DMXNET_USE_OPENMP to Makefiles so libinfo gets updated accordingly (#15498) add f0b6d72 update previous flaky naive engine test (#15651) add f2ac85a update julia install doc (#15609) add f0c69f5 Add missing default axis value to symbol.squeeze op (#15707) add 776d9c4 add deconv in TRT subgraph (#15666) add 9d7fc7c Fix Scala Symbolic API some/Some typo (#15687) add 811d516 Add MKLDNN 4c layout to fix gluoncv se_resnext101_64x4d (#15692) add 42a47b1 Fix _copy_to on MKLDNN backend (#15637) add d5fcd98 [DOC] refine autograd docs (#15109) add 773f4dc Fix quantized concat when inputs are mixed int8 and uint8 (#15693) add b3064c5 [MKLDNN]Enhance Quantization APIs and Tutorial (#15448) add 90954ec make TransposeShape infer shape form both sides (#15713) add 4b07386 [MXNET-1358] Fit api tutorial (#15353) add 8c641b8 remove mshadow submodule add 1434b98 import mshadow source tree add b07211f Skip Flaky Test (#15722) add cf28b46 Add magic method `abs` to NDArray and Symbol. (#15680) add 87425d2 fix boolean_mask for 0-size output (#15731) add 24cce9e prevent TRT_Logger to be destroyed before TRT engine (#14898) add 7c26810 fix dropout mask output (#15697) add 3255d87 fix broadcast op param (#15714) add 3112893 Dynamic Library Loading Support (#15489) add 36076c4 Merge branch 'master' into ib/jl-mxnet-root-env No new revisions were added by this update. Summary of changes: .gitmodules|3 - 3rdparty/mshadow |1 - 3rdparty/mshadow/.gitignore| 21 + 3rdparty/mshadow/.travis.yml | 43 + 3rdparty/mshadow/CHANGES.md| 12 + 3rdparty/mshadow/CMakeLists.txt|6 + 3rdparty/mshadow/LICENSE | 13 + 3rdparty/mshadow/README.md | 37 + 3rdparty/mshadow/cmake/Cuda.cmake | 324 +++ 3rdparty/mshadow/cmake/Utils.cmake | 398 3rdparty/mshadow/cmake/mshadow.cmake | 91 + 3rdparty/mshadow/cmake/mshadowUtils.cmake |2 + 3rdparty/mshadow/doc/Doxyfile | 2358 3rdparty/mshadow/doc/README.md | 321 +++ 3rdparty/mshadow/doc/mkdoc.sh |4 + 3rdparty/mshadow/guide/.gitignore |3 + 3rdparty/mshadow/guide/Makefile| 37 + 3rdparty/mshadow/guide/README.md | 226 ++ 3rdparty/mshadow/guide/basic.cpp | 161 ++ 3rdparty/mshadow/guide/basic_stream.cu | 35 + 3rdparty/mshadow/guide/config.mk | 39 + 3rdparty/mshadow/guide/defop.cpp | 49 + 3rdparty/mshadow/guide/exp-template/.gitignore |1 + 3rdparty/mshadow/guide/exp-template/Makefile | 20 + 3rdparty/mshadow/guide/exp-template/README.md | 340 +++ 3rdparty/mshadow/guide/exp-template/exp_lazy.cpp | 45 + .../mshadow/guide/exp-template/exp_template.cpp| 72 + .../mshadow/guide/exp-template/exp_template_op.cpp | 92 + 3rdparty/mshadow/guide/mshadow-ps/.gitignore |4 + 3rdparty/mshadow/guide/mshadow-ps/2-levels.png | Bin 0 -> 59413 bytes 3rdparty/
[incubator-mxnet] branch ib/dump-win-prebult deleted (was 3aba159)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/dump-win-prebult in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 3aba159 julia: bump window prebult binary version to v1.5.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch master updated (cc861f0 -> d5df247)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from cc861f0 Tensor Inspector Tutorial (#15517) add d5df247 julia: bump window prebult binary version to v1.5.0 (#15608) No new revisions were added by this update. Summary of changes: julia/REQUIRE | 6 -- julia/deps/build.jl | 16 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 julia/REQUIRE
[incubator-mxnet] branch ib/bump-jl-ver deleted (was 897682e)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/bump-jl-ver in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 897682e julia: bump binding version to v1.6.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch master updated: julia: bump binding version to v1.6.0 (#15607)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git The following commit(s) were added to refs/heads/master by this push: new 399d3a0 julia: bump binding version to v1.6.0 (#15607) 399d3a0 is described below commit 399d3a0dc64386e106527257721a51c6152aff4e Author: Iblis Lin AuthorDate: Sun Jul 21 13:45:26 2019 +0800 julia: bump binding version to v1.6.0 (#15607) --- julia/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/julia/Project.toml b/julia/Project.toml index 82a94c5..994a696 100644 --- a/julia/Project.toml +++ b/julia/Project.toml @@ -1,7 +1,7 @@ name = "MXNet" uuid = "a7949054-b901-59c6-b8e3-7238c29bf7f0" authors = ["Chiyuan Zhang ", "Valentin Churavy ", "Iblis Lin "] -version = "1.5.0" +version = "1.6.0" [deps] BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
[incubator-mxnet] branch ib/cleanup-travis deleted (was 978bbd9)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/cleanup-travis in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. was 978bbd9 julia: remove Travis CI related files The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-mxnet] branch ib/jl-mxnet-root-env updated (ea65f51 -> f1a36fb)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard ea65f51 Revert "runtime_functions: test backward compatibility" discard 409ce0e runtime_functions: test backward compatibility discard 1575b2e backward compatibility discard 54077c7 update doc discard cf7f1a0 update NEWS discard 6f179d0 julia: rename build env var `MXNET_HOME` to `MXNET_ROOT` add 6bdcef2 Deprecate USE_PROFILER flag (#15595) add 076b2f3 Softmax with length (#15169) add eab6da6 Fix warnings in CLang: (#15270) add da71324 Fix dumps for Constant initializer (#15150) add 7e632c9 add myself to interested modules (#15590) add d14fa69 Update profiler.md (#15477) add cc861f0 Tensor Inspector Tutorial (#15517) add d5df247 julia: bump window prebult binary version to v1.5.0 (#15608) add 8f5930b fix normalize mean error bug (#15539) add f553b31 julia: remove Travis CI related files (#15616) add 5086ff0 changed constructor args (#15601) add 2b4c9c0 [fix] print `self` in warning. (#15614) add 399d3a0 julia: bump binding version to v1.6.0 (#15607) add d599bc3 [MXNET-1411] solve pylint error issue#14851 (#15113) add 9d859c8 logging (#15106) add 9a1a102 Add omp parallel optimization for _contrib_BilinearReisze2D (#15584) add 77254f2 Infra to use tvm write op kernels (#15550) add 62be441 julia: rename build env var `MXNET_HOME` to `MXNET_ROOT` add 0193d19 update NEWS add a63727b update doc add a119cec backward compatibility add 347c521 runtime_functions: test backward compatibility add f1a36fb Revert "runtime_functions: test backward compatibility" This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ea65f51) \ N -- N -- N refs/heads/ib/jl-mxnet-root-env (f1a36fb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: 3rdparty/dlpack| 2 +- 3rdparty/dmlc-core | 2 +- 3rdparty/tvm | 2 +- CMakeLists.txt | 24 +- CODEOWNERS | 18 +- Makefile | 38 ++ benchmark/opperf/README.md | 2 - cmake/BuildTVM.cmake | 135 +++ .../_constants.py => contrib/tvmop/__init__.py | 6 +- .../tvmop/basic}/__init__.py | 3 +- contrib/tvmop/basic/ufunc.py | 50 +++ contrib/tvmop/compile.py | 59 +++ contrib/tvmop/opdef.py | 111 ++ contrib/tvmop/prepare_tvm.sh | 63 +++ .../opencv/__init__.py => contrib/tvmop/utils.py | 7 +- docs/faq/add_op_in_backend.md | 3 + docs/faq/develop_and_hack.md | 1 + docs/faq/env_var.md| 2 +- docs/faq/perf.md | 4 +- docs/faq/tensor_inspector_tutorial.md | 168 docs/install/osx_setup.md | 1 - docs/tutorials/mkldnn/MKLDNN_README.md | 2 +- docs/tutorials/python/profiler.md | 2 + example/named_entity_recognition/src/metrics.py| 13 +- example/named_entity_recognition/src/ner.py| 8 + example/named_entity_recognition/src/preprocess.py | 7 + example/profiler/README.md | 3 +- include/mxnet/c_api.h | 9 + include/mxnet/libinfo.h| 7 + julia/.travis.yml | 59 --- julia/Project.toml | 2 +- julia/REQUIRE | 6 - julia/deps/build.jl| 16 +- julia/test/travis/run_coverage.sh | 18 - julia/test/travis/run_test.sh | 28 -- julia/test/travis/setup_env.sh | 38 -- make/config.mk | 3 + make/maven/maven_darwin_mkl.mk | 2 - make/maven/maven_linux_c
[incubator-mxnet] branch ib/jl-mxnet-root-env updated (99283ca -> be780c5)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. from 99283ca update doc add be780c5 backward compatibility No new revisions were added by this update. Summary of changes: julia/deps/build.jl | 10 +- julia/docs/src/user-guide/install.md | 4 +++- julia/src/base.jl| 25 +++-- 3 files changed, 31 insertions(+), 8 deletions(-)
[incubator-mxnet] branch ib/jl-mxnet-root-env updated (be780c5 -> 409ce0e)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/jl-mxnet-root-env in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard be780c5 backward compatibility discard 99283ca update doc discard 83fa653 update NEWS discard aa9d149 julia: rename build env var `MXNET_HOME` to `MXNET_ROOT` add 57d097b Add transpose_conv, sorting and searching operator benchmarks to Opperf (#15475) add cb0697f Bypass cuda/cudnn checks if no driver. (#15551) add 35b5480 Utility to help developers debug operators: Tensor Inspector (#15490) add 9983adb make clojure api generator tests less brittle (#15579) add dd14c81 refine Nano setup directions (#15524) add c8a1de4 Julia path patch (#15561) add f44fdd6 Fix AMP Tutorial failures (#15526) add 67bbf5a [Dependency Update] Bump up the CI Nvidia docker to CUDA 10.1 (#14986) add 45c360c fixed config.mk and Makefile bugs for installing mkl (#15424) add b887c06 PDF operators for each distribution for which we have a random sampler (plus also the PDF of the Dirichlet). Supports probabilities and log-probabilities, as well as gradients. (#14617) add eec0fb4 Group Normalization (#14959) add 6f179d0 julia: rename build env var `MXNET_HOME` to `MXNET_ROOT` add cf7f1a0 update NEWS add 54077c7 update doc add 1575b2e backward compatibility add 409ce0e runtime_functions: test backward compatibility This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (be780c5) \ N -- N -- N refs/heads/ib/jl-mxnet-root-env (409ce0e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: Makefile | 8 +- benchmark/opperf/nd_operations/README.md | 6 - .../opperf/nd_operations/nn_conv_operators.py | 49 +- ...operators.py => sorting_searching_operators.py} | 32 +- benchmark/opperf/opperf.py | 12 +- benchmark/opperf/rules/default_params.py | 7 +- benchmark/opperf/utils/op_registry_utils.py| 26 +- ci/docker/Dockerfile.build.centos7_gpu | 2 +- ci/docker/Dockerfile.build.ubuntu_base_gpu | 2 +- ci/docker/Dockerfile.build.ubuntu_build_cuda | 2 +- ...gpu_cu100 => Dockerfile.build.ubuntu_gpu_cu101} | 4 +- ci/docker/Dockerfile.build.ubuntu_nightly_gpu | 2 +- ci/docker/Dockerfile.publish.ubuntu1404_gpu| 2 +- ci/docker/install/ubuntu_cudnn.sh | 4 + ci/docker/install/ubuntu_nvidia.sh | 2 +- ci/docker/runtime_functions.sh | 10 +- ci/jenkins/Jenkins_steps.groovy| 44 +- .../clojure-package/test/dev/generator_test.clj| 41 +- docs/faq/env_var.md| 4 +- docs/install/install-jetson.md | 66 +- docs/mxdoc.py | 2 + docs/tutorials/amp/amp_tutorial.md | 18 +- include/mxnet/base.h | 40 +- python/mxnet/contrib/amp/lists/symbol.py | 18 + python/mxnet/gluon/nn/basic_layers.py | 91 ++- src/base.cc| 95 +++ src/common/cuda_utils.cc | 105 --- src/common/tensor_inspector.h | 815 + src/operator/nn/group_norm-inl.h | 347 + src/operator/nn/group_norm.cc | 131 src/operator/nn/{moments.cu => group_norm.cu} | 16 +- src/operator/random/pdf_op.cc | 319 src/operator/random/pdf_op.cu | 48 ++ src/operator/random/pdf_op.h | 622 tests/nightly/JenkinsfileForBinaries | 4 +- tests/python/unittest/test_gluon.py| 9 + tests/python/unittest/test_operator.py | 91 +++ tests/python/unittest/test_random.py | 111 ++- tools/setup_gpu_build_tools.sh | 2 +- 39 files changed, 2951 insertions(+), 258 deletions(-) copy benchmark/opperf/nd_operations/{reduction_operators.py => sorting_searching_operators.py} (63%) copy ci/docker/{Dockerfile.build.ubuntu_gpu_cu100 => Dockerfile.build.ubuntu_gpu_c
[incubator-mxnet] branch ib/bump-jl-ver created (now 873f2ad)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/bump-jl-ver in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at 873f2ad julia: bump binding version to v1.6.0 This branch includes the following new commits: new 873f2ad julia: bump binding version to v1.6.0 The 1 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] 01/01: julia: bump binding version to v1.6.0
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/bump-jl-ver in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit 873f2ad07268c7de443763b0442ac9d1c19f1275 Author: Iblis Lin AuthorDate: Fri Jul 19 15:29:49 2019 +0800 julia: bump binding version to v1.6.0 --- julia/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/julia/Project.toml b/julia/Project.toml index 82a94c5..994a696 100644 --- a/julia/Project.toml +++ b/julia/Project.toml @@ -1,7 +1,7 @@ name = "MXNet" uuid = "a7949054-b901-59c6-b8e3-7238c29bf7f0" authors = ["Chiyuan Zhang ", "Valentin Churavy ", "Iblis Lin "] -version = "1.5.0" +version = "1.6.0" [deps] BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
[incubator-mxnet] 01/01: julia: bump window prebult binary version to v1.5.0
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/dump-win-prebult in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit 15db992484b75339e9643bdd3dc10d0082a84c8c Author: Iblis Lin AuthorDate: Fri Jul 19 15:47:28 2019 +0800 julia: bump window prebult binary version to v1.5.0 - 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..000 --- 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`)
[incubator-mxnet] branch ib/dump-win-prebult created (now 15db992)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/dump-win-prebult in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. at 15db992 julia: bump window prebult binary version to v1.5.0 This branch includes the following new commits: new 15db992 julia: bump window prebult binary version to v1.5.0 The 1 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] branch ib/bump-jl-ver updated (873f2ad -> 897682e)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/bump-jl-ver in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 873f2ad julia: bump binding version to v1.6.0 add 6bdcef2 Deprecate USE_PROFILER flag (#15595) add 076b2f3 Softmax with length (#15169) add eab6da6 Fix warnings in CLang: (#15270) add da71324 Fix dumps for Constant initializer (#15150) add 7e632c9 add myself to interested modules (#15590) add d14fa69 Update profiler.md (#15477) add cc861f0 Tensor Inspector Tutorial (#15517) add 897682e julia: bump binding version to v1.6.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (873f2ad) \ N -- N -- N refs/heads/ib/bump-jl-ver (897682e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CMakeLists.txt | 1 - CODEOWNERS | 18 +- benchmark/opperf/README.md | 2 - docs/faq/add_op_in_backend.md | 3 + docs/faq/develop_and_hack.md | 1 + docs/faq/env_var.md| 2 +- docs/faq/perf.md | 4 +- docs/faq/tensor_inspector_tutorial.md | 168 + docs/install/osx_setup.md | 1 - docs/tutorials/mkldnn/MKLDNN_README.md | 2 +- docs/tutorials/python/profiler.md | 2 + example/profiler/README.md | 3 +- make/maven/maven_darwin_mkl.mk | 2 - make/maven/maven_linux_cu90mkl.mk | 3 - make/maven/maven_linux_cu92mkl.mk | 3 - make/maven/maven_linux_mkl.mk | 3 - make/pip/pip_darwin_cpu.mk | 3 - make/pip/pip_darwin_mkl.mk | 3 - make/pip/pip_linux_cpu.mk | 3 - make/pip/pip_linux_cu100.mk| 3 - make/pip/pip_linux_cu100mkl.mk | 3 - make/pip/pip_linux_cu101.mk| 3 - make/pip/pip_linux_cu101mkl.mk | 3 - make/pip/pip_linux_cu75.mk | 3 - make/pip/pip_linux_cu75mkl.mk | 3 - make/pip/pip_linux_cu80.mk | 3 - make/pip/pip_linux_cu80mkl.mk | 3 - make/pip/pip_linux_cu90.mk | 3 - make/pip/pip_linux_cu90mkl.mk | 3 - make/pip/pip_linux_cu91.mk | 3 - make/pip/pip_linux_cu91mkl.mk | 3 - make/pip/pip_linux_cu92.mk | 3 - make/pip/pip_linux_cu92mkl.mk | 3 - make/pip/pip_linux_mkl.mk | 3 - python/mxnet/initializer.py| 6 + src/engine/naive_engine.cc | 6 +- src/engine/threaded_engine.h | 2 +- src/kvstore/kvstore_local.h| 4 +- src/operator/mxnet_op.h| 51 src/operator/nn/softmax-inl.h | 428 - src/operator/nn/softmax.cc | 33 ++- src/profiler/profiler.h| 4 +- tests/jenkins/run_test.sh | 1 - tests/jenkins/run_test_ubuntu.sh | 1 - tests/python/unittest/test_init.py | 19 +- tests/python/unittest/test_operator.py | 39 ++- 46 files changed, 706 insertions(+), 160 deletions(-) create mode 100644 docs/faq/tensor_inspector_tutorial.md
[incubator-mxnet] branch ib/dump-win-prebult updated (15db992 -> 3aba159)
This is an automated email from the ASF dual-hosted git repository. iblis pushed a change to branch ib/dump-win-prebult in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git. discard 15db992 julia: bump window prebult binary version to v1.5.0 add 6bdcef2 Deprecate USE_PROFILER flag (#15595) add 076b2f3 Softmax with length (#15169) add eab6da6 Fix warnings in CLang: (#15270) add da71324 Fix dumps for Constant initializer (#15150) add 7e632c9 add myself to interested modules (#15590) add d14fa69 Update profiler.md (#15477) add cc861f0 Tensor Inspector Tutorial (#15517) add 3aba159 julia: bump window prebult binary version to v1.5.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (15db992) \ N -- N -- N refs/heads/ib/dump-win-prebult (3aba159) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CMakeLists.txt | 1 - CODEOWNERS | 18 +- benchmark/opperf/README.md | 2 - docs/faq/add_op_in_backend.md | 3 + docs/faq/develop_and_hack.md | 1 + docs/faq/env_var.md| 2 +- docs/faq/perf.md | 4 +- docs/faq/tensor_inspector_tutorial.md | 168 + docs/install/osx_setup.md | 1 - docs/tutorials/mkldnn/MKLDNN_README.md | 2 +- docs/tutorials/python/profiler.md | 2 + example/profiler/README.md | 3 +- make/maven/maven_darwin_mkl.mk | 2 - make/maven/maven_linux_cu90mkl.mk | 3 - make/maven/maven_linux_cu92mkl.mk | 3 - make/maven/maven_linux_mkl.mk | 3 - make/pip/pip_darwin_cpu.mk | 3 - make/pip/pip_darwin_mkl.mk | 3 - make/pip/pip_linux_cpu.mk | 3 - make/pip/pip_linux_cu100.mk| 3 - make/pip/pip_linux_cu100mkl.mk | 3 - make/pip/pip_linux_cu101.mk| 3 - make/pip/pip_linux_cu101mkl.mk | 3 - make/pip/pip_linux_cu75.mk | 3 - make/pip/pip_linux_cu75mkl.mk | 3 - make/pip/pip_linux_cu80.mk | 3 - make/pip/pip_linux_cu80mkl.mk | 3 - make/pip/pip_linux_cu90.mk | 3 - make/pip/pip_linux_cu90mkl.mk | 3 - make/pip/pip_linux_cu91.mk | 3 - make/pip/pip_linux_cu91mkl.mk | 3 - make/pip/pip_linux_cu92.mk | 3 - make/pip/pip_linux_cu92mkl.mk | 3 - make/pip/pip_linux_mkl.mk | 3 - python/mxnet/initializer.py| 6 + src/engine/naive_engine.cc | 6 +- src/engine/threaded_engine.h | 2 +- src/kvstore/kvstore_local.h| 4 +- src/operator/mxnet_op.h| 51 src/operator/nn/softmax-inl.h | 428 - src/operator/nn/softmax.cc | 33 ++- src/profiler/profiler.h| 4 +- tests/jenkins/run_test.sh | 1 - tests/jenkins/run_test_ubuntu.sh | 1 - tests/python/unittest/test_init.py | 19 +- tests/python/unittest/test_operator.py | 39 ++- 46 files changed, 706 insertions(+), 160 deletions(-) create mode 100644 docs/faq/tensor_inspector_tutorial.md
[incubator-mxnet] 01/01: julia: remove Travis CI related files
This is an automated email from the ASF dual-hosted git repository. iblis pushed a commit to branch ib/cleanup-travis in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git commit 978bbd939b55bc5690e48adf53628ab90de00b60 Author: Iblis Lin AuthorDate: Sat Jul 20 15:07:07 2019 +0800 julia: remove Travis CI related files We do not use travis since Julia package got merged into main repo. --- julia/.travis.yml | 59 --- julia/test/travis/run_coverage.sh | 18 julia/test/travis/run_test.sh | 28 --- julia/test/travis/setup_env.sh| 38 - 4 files changed, 143 deletions(-) diff --git a/julia/.travis.yml b/julia/.travis.yml deleted file mode 100644 index 680df7a..000 --- a/julia/.travis.yml +++ /dev/null @@ -1,59 +0,0 @@ -# Documentation: http://docs.travis-ci.com/user/languages/julia/ -sudo: false - -language: julia - -os: - - linux - - osx -osx_image: xcode8 - -julia: - - 0.6 -# - nightly 0.6 supports depends on #170 - -branches: - only: -- master -- stable -- /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # for tagging - -cache: - directories: -- $TRAVIS_BUILD_DIR/deps/src - -# dependent apt packages -addons: - apt: -sources: - - ubuntu-toolchain-r-test -packages: - - doxygen - - wget - - git - - libcurl4-openssl-dev - - unzip - - libatlas-base-dev - - libatlas-dev - - libopencv-dev - - gcc-4.8 - - g++-4.8 - -before_install: - - export TRAVIS_DIR=test/travis - - source ${TRAVIS_DIR}/setup_env.sh - -notifications: - email: false - -script: - - ${TRAVIS_DIR}/run_test.sh - -after_success: - # See https://github.com/dmlc/MXNet.jl/pull/303#issuecomment-341171774 - - julia -e 'using MXNet; mx._sig_checker()' - - - source ${TRAVIS_DIR}/run_coverage.sh - - echo $TRAVIS_JULIA_VERSION - - julia -e 'Pkg.add("Documenter")' - - julia -e 'cd(Pkg.dir("MXNet")); include(joinpath("docs", "make.jl"))' diff --git a/julia/test/travis/run_coverage.sh b/julia/test/travis/run_coverage.sh deleted file mode 100644 index ee22b25..000 --- a/julia/test/travis/run_coverage.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -julia -e 'cd(Pkg.dir("MXNet")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())' diff --git a/julia/test/travis/run_test.sh b/julia/test/travis/run_test.sh deleted file mode 100755 index 414b145..000 --- a/julia/test/travis/run_test.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -e - -if [[ -a .git/shallow ]]; then git fetch --unshallow; fi -julia -e 'Pkg.clone(pwd())' -( -cd `julia -e 'println(Pkg.dir("MXNet", "deps"))'` && -ln -fs $TRAVIS_BUILD_DIR/deps/src -) -julia -e 'Pkg.build("MXNet"); Pkg.test("MXNet"; coverage=true)' diff --git a/julia/test/travis/setup_env.sh b/julia/test/travis/setup_env.sh deleted file mode 100755 index 9d2f734..000 --- a/julia/test/travis/setup_env.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright owner