Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
763 commits
Select commit Hold shift + click to select a range
d59b214
Merge pull request #192 from dmlc/vc/review_comments
vchuravy Jan 28, 2017
0ee926e
remove usr/setupenv.cmd because it is too invasive
vchuravy Jan 29, 2017
79d80b6
Merge pull request #196 from dmlc/vc/fix_win
vchuravy Jan 29, 2017
75060bc
Fix for symbolic node (#199)
Arkoniak Feb 5, 2017
f33f1dc
get_name (#206)
MikeInnes Feb 24, 2017
17a5442
fix data URL error (#204)
pluskid Feb 28, 2017
c58eb46
fix for issue #207 (#208)
mcreel Mar 3, 2017
fa25ad6
metric: intro NMSE
iblislin Mar 9, 2017
f23b0a9
doc: update CDN link of MathJax
iblislin Mar 9, 2017
96191ea
metric: add test cases for NMSE
iblislin Mar 10, 2017
ba97d93
docs: add an explanation for normalized MSE
iblislin Mar 11, 2017
09d8f27
Merge pull request #211 from iblis17/nmse
vchuravy Mar 11, 2017
cf7f32b
Fixed data attribute
steventhornton Mar 9, 2017
c9eb71b
switch to Plots.jl from pyplot (#217)
mcreel Mar 19, 2017
1781290
Update ACE metric (#220)
vchuravy Mar 29, 2017
9474d95
provide an optional context in mx.load_checkpoint (#221)
vchuravy Mar 29, 2017
46440e3
Added initializers for Spatial Transformer Networks (STN) layers (#223)
facundoq Mar 30, 2017
9dd3291
docs: update renamed `every_n_batch`
iblislin Apr 2, 2017
fc2974f
Merge pull request #225 from iblis17/docs
vchuravy Apr 2, 2017
5c02fcb
Check if key stride exists in the node info when producing graphviz o…
facundoq Apr 2, 2017
867b1c5
Merge pull request #226 from facundoq/master
vchuravy Apr 3, 2017
31b95fb
Update mnist.md (#227)
ultradian Apr 10, 2017
1be1b87
fix conflict with Images
vchuravy Apr 12, 2017
7a6120a
Merge pull request #228 from dmlc/vc/images_subtype
vchuravy Apr 12, 2017
bfa966a
fixes bilinear initializer following approach in #34
vchuravy Apr 13, 2017
8947ead
adds test for bilinear initializer
vchuravy Apr 13, 2017
44a6c36
Merge pull request #229 from dmlc/vc/bilinear_initializer
vchuravy Apr 13, 2017
558adb7
add SeqMetric to apply different metrics for multi-output
vchuravy Mar 28, 2017
b4ece81
add NullMetric
vchuravy Mar 29, 2017
ced3f73
fix pointer(NDArray) for Float64
vchuravy Mar 30, 2017
86e3fa0
Merge pull request #231 from dmlc/vc/pointer
vchuravy Apr 14, 2017
3263b95
Merge pull request #230 from dmlc/vc/seqmetric
vchuravy Apr 14, 2017
d0253f1
XCode8 supports thread_local in C++
vchuravy Apr 14, 2017
68b67e8
Merge pull request #234 from dmlc/vc/mac_travis
vchuravy Apr 14, 2017
1697522
update MSE to be agnostic to dimensions.
vchuravy Mar 28, 2017
e12052c
convert single outputs to array so that inference has it easier
vchuravy Mar 30, 2017
def129f
convert eps to eltype of array
vchuravy Apr 14, 2017
c2044d5
adds THTT to enable metrics to support NDArray or Array
vchuravy Apr 14, 2017
349d2a7
convert MSE to use NDArray as an example for async
vchuravy Apr 14, 2017
4675ace
Merge pull request #233 from dmlc/vc/metrics
vchuravy Apr 15, 2017
c4a2658
ensure that new submodules are initialized
vchuravy Apr 15, 2017
9aac7e1
Update callback.jl (#235)
undefdev Apr 15, 2017
7a530fa
Fixed SpatialTransformerNetwork loc_bias initializer. Added lenet-stn…
facundoq Apr 26, 2017
06010b8
explicitly specify 7z (#239)
musm Apr 30, 2017
6cc9e99
add verbosity option to predict()
rdeits May 9, 2017
4cd5f3f
Merge pull request #244 from rdeits/predict-verbosity
vchuravy May 11, 2017
5d16305
explicitly specify 7z
musm May 12, 2017
02c7661
Merge pull request #246 from musm/patch-1
vchuravy May 12, 2017
8918f1b
update appveyor script (#195)
vchuravy May 12, 2017
60f5306
improve GPU detection.
vchuravy Jan 29, 2017
efff124
Add appveyor badge
pluskid May 12, 2017
07777d6
switch to vc14
vchuravy May 12, 2017
28344a4
actually copy the mxnet.dll to the right place on windows
vchuravy May 13, 2017
96bdfa7
Prebuilt binaries only work on windows 64bit
vchuravy May 13, 2017
aae9114
Merge pull request #194 from dmlc/vc/gpu_detection
vchuravy May 13, 2017
2ecf2c1
update NEWS.md
vchuravy May 14, 2017
9c70922
Update CI URLs to point to new caching infrastructure
staticfloat May 17, 2017
b63fd9b
Fix #242 (#247)
p-holl May 23, 2017
c7032f0
Merge pull request #249 from staticfloat/ci_url
vchuravy May 26, 2017
172af60
Use `Sys.CPU_CORES` not `nprocs()` when doing a parallel `make` (#250)
staticfloat May 30, 2017
2b26bc2
update for Julia v0.6 (#248)
ExpandingMan Jun 1, 2017
841e9ee
update regression example for julia v0.6(#254)
mcreel Jun 2, 2017
c965235
Add extra check on CUDA library detection
joshbode Jun 9, 2017
18547b8
Merge pull request #255 from joshbode/cudalib_check
vchuravy Jun 10, 2017
e7d1b62
Added cblas_[ds]tr[sm]m to cblas include file (#259)
joshbode Jun 20, 2017
10ad90b
Added MXNET_COMMIT env variable for upstream commit/tag (#260)
joshbode Jun 23, 2017
0750c41
build: bump curr_win to 20170819, MXNet 0.11.0
iblislin Sep 8, 2017
778529c
Merge pull request #268 from iblis17/win-prebuild
vchuravy Sep 8, 2017
85a2d97
ndarray: add kInt8 and kInt64 into TypeFlag enum
iblislin Sep 9, 2017
873715b
cblas: import all func prototype into header
iblislin Sep 8, 2017
8bd307f
Merge pull request #270 from iblis17/nd-typeflag
vchuravy Sep 9, 2017
4e5ab13
travis : set make -j4 and travis_wait
iblislin Sep 6, 2017
d1bbcc4
base/build: using `Libdl.dlext` for searching lib
iblislin Sep 1, 2017
0d54f4b
build: force enable LAPACK when Julia's OpenBLAS is available
iblislin Sep 9, 2017
f34643b
Merge pull request #271 from iblis17/fix-travis
vchuravy Sep 10, 2017
b68ce5b
Merge pull request #265 from iblis17/ext
vchuravy Sep 10, 2017
21ccc56
Merge pull request #269 from iblis17/build-lapack
vchuravy Sep 10, 2017
23866bd
build: fix macOS LAPACK build
iblislin Sep 11, 2017
2c5120d
Merge pull request #277 from iblis17/mac-lapack
vchuravy Sep 11, 2017
4e439ed
build: remove FileRule on config.mk and fix CUDA config
iblislin Sep 10, 2017
7cc66d1
executor: fix docstring of `bind`
iblislin Sep 12, 2017
5d739da
ndarray: implement deepcopy via MXNDArrayGetDataNDArray
iblislin Sep 13, 2017
f20534d
Merge pull request #273 from iblis17/issue-273
vchuravy Sep 17, 2017
a51cba4
Merge pull request #281 from iblis17/bind-doc
vchuravy Sep 17, 2017
16c2c5a
base: update GRAD_REQ enumeration
iblislin Sep 18, 2017
d824631
Merge pull request #275 from iblis17/file-rule-cuda
vchuravy Sep 18, 2017
e3ad29d
travis: bring coverage report back
iblislin Sep 19, 2017
dcba690
build: CuDNN detection
iblislin Sep 11, 2017
3d4adfb
ndarray: `reshape` share the same API with Base
iblislin Sep 10, 2017
bbd0e66
Merge pull request #285 from iblis17/cov-report
vchuravy Sep 24, 2017
b68ca2e
Merge pull request #272 from iblis17/issue-272
vchuravy Sep 24, 2017
0b9bf78
sym-node: support `print` for debugging
iblislin Sep 11, 2017
4e89c91
sym-node: extract a until function _create_atomic_symbol
iblislin Sep 12, 2017
63a34cc
sym-node: implement reshape api as Base
iblislin Sep 12, 2017
68d6ff7
sym-node: update deprecation for reshape
iblislin Sep 25, 2017
a2e270e
sym-node: update NEWS for reshape API
iblislin Sep 25, 2017
bb88d79
Merge pull request #283 from iblis17/issue-283
vchuravy Sep 25, 2017
9e0844a
sym-node: add reverse keyword arg
iblislin Sep 25, 2017
55ccbfa
sym-node: more test cases for reshape
iblislin Sep 25, 2017
3595403
Merge pull request #280 from iblis17/build-cudnn
vchuravy Sep 25, 2017
df13ddd
Merge pull request #276 from iblis17/print-symbol
vchuravy Sep 25, 2017
6d1ba53
Merge pull request #279 from iblis17/sym-reshape
vchuravy Sep 25, 2017
ff0556b
random: rename srand! to srand
iblislin Sep 13, 2017
5b3c507
random: update NEWS and deprecated.jl
iblislin Sep 25, 2017
251a8b3
random: upstream api change
iblislin Oct 4, 2017
ebb03d0
Merge pull request #288 from iblis17/upstream-random
vchuravy Oct 4, 2017
077a8cb
build: improve cuda detection
iblislin Oct 4, 2017
0a53778
Merge pull request #282 from iblis17/srand
vchuravy Oct 5, 2017
ac7bbd0
base: support MXGetVersion
iblislin Oct 7, 2017
904eb20
rand: docstring
iblislin Oct 10, 2017
aae016c
ndarray: pretty printing
iblislin Oct 7, 2017
19082ef
Merge pull request #289 from iblis17/mx-get-ver
vchuravy Oct 10, 2017
9d90506
Merge pull request #295 from iblis17/doc-rand
vchuravy Oct 10, 2017
15def2c
Merge pull request #290 from iblis17/nd-pretty-print
vchuravy Oct 10, 2017
81b134f
ndarray: implement `fill` and `fill!` (#297)
iblislin Oct 24, 2017
a79e33c
Merge pull request #287 from iblis17/issue-286
vchuravy Oct 25, 2017
71f2d40
base: merge _julia_to_mx_param into dump_mx_param (#296)
iblislin Oct 25, 2017
3824df0
Fix mx.chain var reference in macro (#299)
iblislin Oct 26, 2017
41f8f55
visualize: fix node_attr on upstream master (#301)
iblislin Oct 31, 2017
9fcab40
symbol: add Base.show (#302)
iblislin Nov 6, 2017
4f182ee
ndarray: more Base-like APIs (#303)
iblislin Nov 6, 2017
a3317f1
ndarray: implement rdiv (#292)
iblislin Nov 6, 2017
8cc5c1c
util: docstring of _sig_checker (#305)
iblislin Nov 7, 2017
a488d7a
ndarray: intro TakingBroadcastSeriously and broadcast unfusing (#300)
iblislin Nov 7, 2017
57cc677
ndarray: elementwise power (#293)
iblislin Nov 8, 2017
eea128a
ndarray: fix `add` broadcasting and more tests (#308)
iblislin Nov 8, 2017
f839be1
Fix deprecations (#307)
iblislin Nov 8, 2017
4919273
ndarray: getindex/setindex! linear indexing (#294)
iblislin Nov 9, 2017
1fc03f2
ndarray: elementwise power for irrational (#310)
iblislin Nov 9, 2017
00d61d2
executor: return `outputs` on forward (#312)
iblislin Nov 9, 2017
3f93ffc
git: union merge policy for NEWS.md (#309)
iblislin Nov 9, 2017
678b49e
ndarray: regularize fill! API (#311)
iblislin Nov 9, 2017
e083e5f
doc: cleanup useless enc file (#315)
iblislin Nov 10, 2017
09b9718
build: prevent CUDA_HOME KeyError (#316)
iblislin Nov 13, 2017
9304e6e
sym: broadcast unfusion (#314)
iblislin Nov 13, 2017
f8e1938
Remove Compat and src/compat.jl (#318)
iblislin Nov 13, 2017
a19fc93
test: replace `reldiff` with `isapprox` (#321)
iblislin Nov 13, 2017
526857e
docs: address docstring override warning (#320)
iblislin Nov 13, 2017
8071186
travis: enable 'build branch updates' on master/stable only (#319)
iblislin Nov 13, 2017
e4b6c0e
docs: update examples in overview (#317)
iblislin Nov 13, 2017
a51d9b5
docs: fix more example rendering in overview (#322)
iblislin Nov 14, 2017
73b856b
Update README badge (#324)
iblislin Nov 15, 2017
1dfb5b3
Cut a release for mxnet v0.12.0 (#304)
iblislin Nov 16, 2017
b56c44e
Bump upstream to v0.12.1 (#326)
iblislin Nov 16, 2017
9efedbc
Update releasing note (#327)
iblislin Nov 16, 2017
a4aab01
docs: minor changes in overview (#330)
iblislin Nov 17, 2017
57b50d4
build: set upstream version back to master (#328)
iblislin Nov 17, 2017
8564f19
executor: add Base.show and Base.print (#337)
iblislin Nov 20, 2017
ceb7fbf
travis: enable caching for reducing build time (#329)
iblislin Nov 20, 2017
1a7887c
ndarray: add outer constrcutor for AbstractArray (#334)
iblislin Nov 20, 2017
010ea3c
sym: implement get_children (#333)
iblislin Nov 20, 2017
1f50a14
sym: fix printing of symbol generated via get_internals (#332)
iblislin Nov 20, 2017
b0556e6
Update regression-example.jl (#339)
mcreel Nov 22, 2017
91a410e
test: minor style changes for mlp-test (#340)
iblislin Nov 22, 2017
f126482
sym: handy macro `mx.var` for creating `mx.Variable` (#338)
iblislin Nov 22, 2017
cb06a9a
build: bump max number of make jobs to 32 (#343)
iblislin Nov 25, 2017
45d6279
ndarray: add `Base.show(io, MIME"text/plain")` (#347)
iblislin Nov 27, 2017
e0f625a
example: fix batchsize config in regression-example (#342)
iblislin Nov 27, 2017
935eb35
ndarray: make _minus type stable (#345)
iblislin Nov 27, 2017
2a5a284
model: refine and test cases for FeedForward constructor (#346)
iblislin Nov 27, 2017
cb042fd
parametric NDArray (#331)
iblislin Dec 1, 2017
914fab6
ndarray: minor style changes (#349)
iblislin Dec 2, 2017
c43d0dd
model: fix test cases macro (#355)
iblislin Dec 2, 2017
09ee1f4
ndarray: implement `size(x, dims...)` (#350)
iblislin Dec 2, 2017
8a19651
ndarray: implement endof (#351)
iblislin Dec 2, 2017
fd7fb79
ndarray: make _plus type stable (#352)
iblislin Dec 2, 2017
b9855c4
ndarray: type convert of _mul_scalar (#356)
iblislin Dec 4, 2017
ad57be9
ndarray: type convertion of _plus_scalar (#360)
iblislin Dec 4, 2017
642b17b
ndarray: type convertion of _rdiv_scalar (#358)
iblislin Dec 4, 2017
ce0e237
doc: sort out table for ndarray api (#362)
iblislin Dec 6, 2017
f8d4f62
ndarray: type convertion of _minus_scalar (#354)
iblislin Dec 7, 2017
14f9748
ndarray: do not auto-import _full, _ones and _zeros (#359)
iblislin Dec 8, 2017
daf787c
ndarray: make trigonometric functions dot-call only (#361)
iblislin Dec 9, 2017
233fcfc
ndarray: change internal api of plus to help autograd (#364)
iblislin Dec 9, 2017
eb819b0
ndarray: change internal api of mul/div to help autograd (#366)
iblislin Dec 9, 2017
2ca5565
ndarray: change internal api of minus to help autograd (#365)
iblislin Dec 9, 2017
12198f0
ndarray: copy(AbstractArray, context) (#367)
iblislin Dec 10, 2017
2d7cdc6
Reexporting NDArray and SymbolicNode (#306)
iblislin Dec 10, 2017
db09528
example: fix parametric NDArray in lstm example (#370)
iblislin Dec 10, 2017
27c66ec
sym: overload `bind` (#372)
iblislin Dec 12, 2017
bfb1cc4
ndarray: remap hyperbolic function (#374)
iblislin Dec 15, 2017
6609616
ndarray: support transpose on 1D array (#375)
iblislin Dec 15, 2017
881759f
example: fix MSE init (#376)
iblislin Dec 15, 2017
5908d97
base: cleanup stale code in _defstruct_impl (#377)
iblislin Dec 15, 2017
a941f3a
ndarray: add modulo operator (#373)
iblislin Dec 15, 2017
8135a63
ndarray: type convertion of _div_scalar (#357)
iblislin Dec 15, 2017
1e20f50
ndarray: protect from diving zero for non-inplace op (#378)
iblislin Dec 15, 2017
d921225
doc/ndarray: add ref table for hyperbolic function (#382)
iblislin Dec 16, 2017
4507598
ndarray: `cat`, `hcat`, `vcat` (#380)
iblislin Dec 16, 2017
39ecb32
base: improve MXError display (#379)
iblislin Dec 16, 2017
cb443b7
ndarray: porting Python's autograd (#274)
iblislin Dec 18, 2017
883cdd3
build: make appending lib to MXNET_HOME optional (#386)
nstiurca Dec 18, 2017
bfeba81
ndarray: support matrix/tensor multiplication (#384)
iblislin Dec 21, 2017
3787895
ndarray: remap expand_dims (#381)
iblislin Dec 21, 2017
813bfdc
random: Base-like APIs for rand, rand!, randn, randn! (#383)
iblislin Dec 21, 2017
d3cdbf6
ndarray: remap activation functions (#387)
iblislin Dec 28, 2017
9d60663
ndarray: refine signature of `clip` (#391)
iblislin Dec 30, 2017
a4143e9
Bump :copyright: (#397)
iblislin Jan 1, 2018
ae425bf
doc: append 'Defined in' into operator docstring (#393)
iblislin Jan 1, 2018
930090b
ndarray: fix 1D NDArray display (#399)
iblislin Jan 2, 2018
a1cef7f
ndarray: fix type convertion in setindex! (#398)
iblislin Jan 2, 2018
86ffb5d
ndarray: inplace modulo operators (#389)
iblislin Jan 4, 2018
30852dd
ndarray: support modulo operation in macro inplace (#390)
iblislin Jan 4, 2018
0ef5966
ndarray: add Base.ones(::NDArray) and Base.zeros (#363)
iblislin Jan 4, 2018
49399fc
ndarray: broadcasting along dimension on arith operators (#401)
iblislin Jan 7, 2018
e79ce71
ndarray: broadcast comparison operators (#402)
iblislin Jan 10, 2018
2ab0584
ndarray: copy!(NDArray, AbstractArray) (#405)
iblislin Jan 13, 2018
1c990bc
ndarray: new constructor NDArray(Type, AbstractArray) (#404)
iblislin Jan 17, 2018
0fba766
ndarray: broadcast_min/max (#403)
iblislin Jan 19, 2018
39beaaf
remap broadcast_to/axis/axes (#406)
iblislin Jan 22, 2018
ec2b699
ndarray: remap hypot (#407)
iblislin Jan 24, 2018
157b088
doc: update predict section of mnist tutorial (#411)
iblislin Jan 28, 2018
9f4f533
Optimizer module overhaul (#396)
iblislin Jan 31, 2018
2c09c26
Update README: `predict` section (#412)
iblislin Feb 4, 2018
6ac37f9
kvstore: refine and copy docstring from Python (#388)
iblislin Feb 5, 2018
4038704
build: Propagate more build flags from ENV (#414)
iblislin Feb 15, 2018
3c8e9d3
build: propagate CC/CXX into config.mk (#419)
iblislin Mar 4, 2018
3df1214
build: propagate USE_JEMALLOC (#422)
iblislin Mar 8, 2018
0ccf8b4
build: add `libmxnet.so` into lib search list. (#424)
iblislin Apr 3, 2018
b74a516
Update README.md
iblislin Aug 20, 2018
224ae96
Typo in README
iblislin Aug 20, 2018
06e1d36
Add 'julia/' from commit '224ae962db8ae252ce1ac317c6d4a2cfe67a7d77'
iblislin Oct 2, 2018
9f8425b
import Julia binding
iblislin Sep 28, 2018
39054b3
Updating the readme file for cpp-package and adding readme file for e…
leleamol Oct 4, 2018
be0c6ef
Fix #12672, importing numpy scalars (zero-dimensional arrays) (#12678)
arogozhnikov Oct 4, 2018
e41faf0
[MXNET-908] Speed up travis builds to avoid timeouts (#12706)
KellenSunderland Oct 4, 2018
931555c
Merge branch 'pr-10149' import Julia binding
gigasquid Oct 5, 2018
e1fe7b1
Throw exception if MXSymbolInferShape fails. (#12733)
Oct 5, 2018
e93af41
[MXNET-716] Adding Scala Inference Benchmarks (#12721)
piyushghai Oct 5, 2018
f9f7416
[MXNET-623] Fixing an integer overflow bug in large NDArray (#11742)
apeforest Oct 5, 2018
d6dfd41
Change numpy version to 1.15.2 in python and docker install requireme…
apivovarov Oct 5, 2018
857cea1
Reenable test_gluon.test_conv (#12718)
stu1130 Oct 5, 2018
c2bb012
Refine mxnet python installation (#12696)
stu1130 Oct 5, 2018
c993ef1
Update packages and tests in the straight dope nightly (#12744)
vishaalkapoor Oct 6, 2018
836ba78
Fix failing GPU test on single GPU host (kvstore) (#12726)
larroy Oct 6, 2018
5314cf4
Add option for automatic downcasting dtype for cudnn to allow using T…
sbodenstein Oct 8, 2018
7e46b5e
[MXNET-1026] [Perl] Sync with recent changes in Python's API (#12739)
sergeykolychev Oct 8, 2018
077253d
fix benchmark on control flow operators. (#12693)
zheng-da Oct 8, 2018
610d79c
[MXNET-982] Provide example to illustrate usage of CSVIter in C++ API…
leleamol Oct 8, 2018
a2bafe1
[MXNET-912] Refactoring ctc loss operator (#12637)
apeforest Oct 9, 2018
167355b
Add new name to CONTRIBUTORS.md (#12763)
LuckyPigeon Oct 9, 2018
3c3506f
Add resnet50-v1 to benchmark_score (#12595)
xinyu-intel Oct 9, 2018
f0140b3
[MXNET-716][MIRROR #12723] Scala Benchmark Extension pack (#12758)
lanking520 Oct 9, 2018
ad027ca
Implement mkldnn convolution fusion and quantization. (#12530)
ZhennanQin Oct 9, 2018
4968900
Introduction to Clojure-MXNet video link. (#12754)
leontalbot Oct 9, 2018
bcbac41
[MXNET-915] Java Inference API core wrappers and tests (#12757)
andrewfayres Oct 9, 2018
c98b19e
Disabled flaky test: test_mkldnn.test_Deconvolution (#12770)
lebeg Oct 9, 2018
90fbbd7
Updating the readme file for cpp-package and adding readme file for e…
leleamol Oct 4, 2018
9ee38de
Addressed the review comments.
leleamol Oct 9, 2018
2776712
Meged the latest chages.
leleamol Oct 9, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ sudo: true

language: cpp

cache: ccache
cache:
directories:
- $HOME/.ccache
- $HOME/.cache/pip
- $HOME/.mxnet
- $HOME/Library/Caches/Homebrew

os:
- osx
Expand All @@ -17,7 +22,7 @@ before_install:
- export PYTHONPATH=${PYTHONPATH}:${PWD}/python

install:
- brew install ccache
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
- export PATH="/usr/local/opt/ccache/libexec:$PATH"
- source ci/travis/install.sh

Expand All @@ -29,4 +34,7 @@ script:
- export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
- mv make/osx.mk config.mk
- make -j 2
- python -m nose --verbose tests/python/unittest/
# We ignore several tests to avoid possible timeouts on large PRs.
# This lowers our test coverage, but is required for consistent Travis runs.
# These tests will be tested in a variety of environments in Jenkins based tests.
- python -m nose --with-timer --exclude-test=test_sparse_operator.test_elemwise_binary_ops --exclude-test=test_gluon_model_zoo.test_models --exclude-test=test_random.test_shuffle --exclude-test=test_operator.test_broadcast_binary_op --exclude-test=test_operator.test_pick --exclude-test=test_profiler.test_continuous_profile_and_instant_marker --exclude-test=test_metric_perf.test_metric_performance --exclude-test=test_operator.test_order --verbose tests/python/unittest/
2 changes: 1 addition & 1 deletion 3rdparty/mshadow
4 changes: 3 additions & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,6 @@ List of Contributors
* [Per Goncalves da Silva](https://github.com/perdasilva)
* [Zhijingcheng Yu](https://github.com/jasonyu1996)
* [Cheng-Che Lee](https://github.com/stu1130)
* [Chaitanya Bapat](https://github.com/ChaiBapchya)
* [Chaitanya Bapat](https://github.com/ChaiBapchya)
* [LuckyPigeon](https://github.com/LuckyPigeon)

44 changes: 35 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,30 @@ def python3_gpu_ut_nocudnn(docker_container_name) {
}
}

def deploy_docs() {
parallel 'Docs': {
node(NODE_LINUX_CPU) {
ws('workspace/docs') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run('ubuntu_cpu', 'deploy_docs', false)
sh "ci/other/ci_deploy_doc.sh ${env.BRANCH_NAME} ${env.BUILD_NUMBER}"
}
}
}
},
'Julia docs': {
node(NODE_LINUX_CPU) {
ws('workspace/julia-docs') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init('cpu', mx_lib)
utils.docker_run('ubuntu_cpu', 'deploy_jl_docs', false)
}
}
}
}
}

node('mxnetlinux-cpu') {
// Loading the utilities requires a node context unfortunately
checkout scm
Expand Down Expand Up @@ -746,6 +770,16 @@ core_logic: {
}
}
},
'Julia 0.6: CPU': {
node(NODE_LINUX_CPU) {
ws('workspace/ut-julia06-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init('cpu', mx_lib)
utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_julia06', false)
}
}
}
},

'Python 2: CPU Win':{
node(NODE_WINDOWS_CPU) {
Expand Down Expand Up @@ -911,15 +945,7 @@ core_logic: {
}

stage('Deploy') {
node(NODE_LINUX_CPU) {
ws('workspace/docs') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run('ubuntu_cpu', 'deploy_docs', false)
sh "ci/other/ci_deploy_doc.sh ${env.BRANCH_NAME} ${env.BUILD_NUMBER}"
}
}
}
deploy_docs()
}
}
,
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ $(warning "USE_MKL2017 is deprecated. We will switch to USE_MKLDNN.")
endif

ifeq ($(USE_MKLDNN), 1)
MKLDNNROOT = $(ROOTDIR)/3rdparty/mkldnn/install
MKLROOT = $(ROOTDIR)/3rdparty/mkldnn/install
MKLDNNROOT = $(ROOTDIR)/3rdparty/mkldnn/build/install
MKLROOT = $(ROOTDIR)/3rdparty/mkldnn/build/install
export USE_MKLML = 1
endif

Expand Down
2 changes: 1 addition & 1 deletion amalgamation/python/mxnet_predict.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def forward(self, **kwargs):
for k, v in kwargs.items():
if not isinstance(v, np.ndarray):
raise ValueError("Expect numpy ndarray as input")
v = np.ascontiguousarray(v, dtype=np.float32)
v = np.asarray(v, dtype=np.float32, order='C')
_check_call(_LIB.MXPredSetInput(
self.handle, c_str(k),
v.ctypes.data_as(mx_float_p),
Expand Down
8 changes: 5 additions & 3 deletions benchmark/python/control_flow/rnn.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
_parser.add_argument('--benchmark', choices=["foreach", "while_loop"], required=True)
_parser.add_argument('--warmup_rounds', type=int, default=20)
_parser.add_argument('--test_rounds', type=int, default=100)
_parser.add_argument('--gpu', type=bool, default=False)
args = _parser.parse_args()


Expand Down Expand Up @@ -66,8 +67,7 @@ def _func(*states):
loop_vars=states,
max_iterations=self.length,
)
assert len(out) == 1
return out[0]
return out


def _zeros(shape, ctx):
Expand Down Expand Up @@ -124,7 +124,9 @@ def main():
cell_types = [gluon.rnn.RNNCell,
gluon.rnn.GRUCell,
gluon.rnn.LSTMCell]
ctxs = [mx.cpu(0)] + [mx.gpu(i) for i in _get_gpus()]
ctxs = [mx.cpu(0)]
if args.gpu:
ctxs = ctxs + [mx.gpu(i) for i in _get_gpus()]
seq_lens = [100]
batch_sizes = [1, 32]
hidden_dims = [512]
Expand Down
3 changes: 3 additions & 0 deletions ci/docker/Dockerfile.build.ubuntu_cpu
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ RUN /work/ubuntu_r.sh
COPY install/ubuntu_perl.sh /work/
RUN /work/ubuntu_perl.sh

COPY install/ubuntu_julia.sh /work/
RUN /work/ubuntu_julia.sh

COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh

Expand Down
2 changes: 1 addition & 1 deletion ci/docker/install/docs_requirements
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ h5py==2.8.0rc1
mock==2.0.0
nose==1.3.7
nose-timer==0.7.3
numpy<1.15.0,>=1.8.2
numpy<=1.15.2,>=1.8.2
pylint==1.8.3
pypandoc==1.4
recommonmark==0.4.0
Expand Down
37 changes: 37 additions & 0 deletions ci/docker/install/ubuntu_julia.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/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.

# build and install are separated so changes to build don't invalidate
# the whole docker cache for the image

set -ex

export JLBINARY='julia.tar.gz'
export JULIADIR='/work/julia'
export JULIA="${JULIADIR}/bin/julia"

mkdir -p $JULIADIR
# The julia version in Ubuntu repo is too old
# We download the tarball from the official link:
# https://julialang.org/downloads/
wget -O $JLBINARY https://julialang-s3.julialang.org/bin/linux/x64/0.6/julia-0.6.2-linux-x86_64.tar.gz
tar xzvf $JLBINARY -C $JULIADIR --strip 1
rm $JLBINARY

$JULIA -e 'versioninfo()'
4 changes: 2 additions & 2 deletions ci/docker/install/ubuntu_nightly_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ apt-get -y install time
apt-get install -y subversion maven -y #>/dev/null

# Packages needed for the Straight Dope Nightly tests.
pip2 install pandas scikit-image
pip3 install pandas scikit-image
pip2 install pandas scikit-image prompt_toolkit
pip3 install pandas scikit-image prompt_toolkit
4 changes: 2 additions & 2 deletions ci/docker/install/ubuntu_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ wget -nv https://bootstrap.pypa.io/get-pip.py
python3 get-pip.py
python2 get-pip.py

pip2 install nose cpplint==1.3.0 pylint==1.9.3 'numpy<1.15.0,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip3 install nose cpplint==1.3.0 pylint==2.1.1 'numpy<1.15.0,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip2 install nose cpplint==1.3.0 pylint==1.9.3 'numpy<=1.15.2,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip3 install nose cpplint==1.3.0 pylint==2.1.1 'numpy<=1.15.2,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
54 changes: 54 additions & 0 deletions ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,35 @@ unittest_ubuntu_gpu_R() {
make rpkgtest R_LIBS=/tmp/r-site-library R_GPU_ENABLE=1
}

unittest_ubuntu_cpu_julia06() {
set -ex
export PATH="/work/julia/bin:$PATH"
export MXNET_HOME='/work/mxnet'
export JULIA_PKGDIR='/work/julia-pkg'
export DEPDIR=`julia -e 'print(Pkg.dir())'`

julia -e 'versioninfo()'
julia -e 'Pkg.init()'

# install package
ln -sf ${MXNET_HOME}/julia ${DEPDIR}/MXNet

# install dependencies
julia -e 'Pkg.resolve()'

# FIXME
export LD_PRELOAD='/usr/lib/x86_64-linux-gnu/libjemalloc.so'

# use the prebuilt binary from $MXNET_HOME/lib
julia -e 'Pkg.build("MXNet")'

# run the script `julia/test/runtests.jl`
julia -e 'Pkg.test("MXNet")'

# See https://github.com/dmlc/MXNet.jl/pull/303#issuecomment-341171774
julia -e 'using MXNet; mx._sig_checker()'
}

unittest_centos7_cpu() {
set -ex
cd /work/mxnet
Expand Down Expand Up @@ -1090,6 +1119,31 @@ deploy_docs() {
popd
}

deploy_jl_docs() {
set -ex
export PATH="/work/julia/bin:$PATH"
export MXNET_HOME='/work/mxnet'
export JULIA_PKGDIR='/work/julia-pkg'
export DEPDIR=`julia -e 'print(Pkg.dir())'`

julia -e 'versioninfo()'
julia -e 'Pkg.init()'
ln -sf ${MXNET_HOME}/julia ${DEPDIR}/MXNet
julia -e 'Pkg.resolve()'

# FIXME
export LD_PRELOAD='/usr/lib/x86_64-linux-gnu/libjemalloc.so'

# use the prebuilt binary from $MXNET_HOME/lib
julia -e 'Pkg.build("MXNet")'
# build docs
julia -e 'Pkg.add("Documenter")'
julia -e 'cd(Pkg.dir("MXNet")); include(joinpath("docs", "make.jl"))'

# TODO: make Jenkins worker push to MXNet.jl ph-pages branch if master build
# ...
}

# broken_link_checker

broken_link_checker() {
Expand Down
12 changes: 4 additions & 8 deletions ci/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@
# specific language governing permissions and limitations
# under the License.

# Disable brew auto-update to avoid long running updates while running tests in CI.
export HOMEBREW_NO_AUTO_UPDATE=1

if [ ${TRAVIS_OS_NAME} == "osx" ]; then
brew update
brew install opencv
brew install python3
brew install fftw
brew install libpng
brew install ImageMagick
brew install swig
python -m pip install --user nose numpy cython scipy requests mock
python3 -m pip install --user nose numpy cython scipy requests mock
python -m pip install --user nose numpy cython scipy requests mock nose-timer nose-exclude
fi
2 changes: 2 additions & 0 deletions contrib/clojure-package/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ The motivation for creating a Clojure package is to be able to open the deep lea

For high leverage, the Clojure package has been built on the existing Scala package using interop. This has allowed rapid development and close parity with the Scala functionality. This also leaves the door open to directly developing code against the jni-bindings with Clojure in the future in an incremental fashion, using the test suites as a refactoring guide.

For a **video introduction**, see [Clojure MXNet with Carin Meier - Clojure Virtual Meetup](https://www.crowdcast.io/e/clojure-mxnet-with-carin) (setup instructions from 20:49)

## Current State and Plans

The Clojure package is nearing the end of its first development milestone which is to achieve a close parity with the Scala package.
Expand Down
49 changes: 37 additions & 12 deletions cpp-package/README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,46 @@
# MXNet C++ Package

To build the C++ package, please refer to [this guide](<https://mxnet.incubator.apache.org/install/build_from_source#build-the-c-package>).
The MXNet C++ Package provides C++ API bindings to the users of MXNet. Currently, these bindings are not available as standalone package.
The users of these bindings are required to build this package as mentioned below.

A basic tutorial can be found at <https://mxnet.incubator.apache.org/tutorials/c++/basics.html>.
## Building C++ Package

The example directory contains examples for you to get started.
The cpp-package directory contains the implementation of C++ API. As mentioned above, users are required to build this directory or package before using it.
**The cpp-package is built while building the MXNet shared library, *libmxnet.so*.**

###Steps to build the C++ package:
1. Building the MXNet C++ package requires building MXNet from source.
2. Clone the MXNet GitHub repository **recursively** to ensure the code in submodules is available for building MXNet.
```
git clone --recursive https://github.com/apache/incubator-mxnet mxnet
```

3. Install the [prerequisites](<https://mxnet.incubator.apache.org/install/build_from_source#prerequisites>), desired [BLAS libraries](<https://mxnet.incubator.apache.org/install/build_from_source#blas-library>) and optional [OpenCV, CUDA, and cuDNN](<https://mxnet.incubator.apache.org/install/build_from_source#optional>) for building MXNet from source.
4. There is a configuration file for make, [make/config.mk](<https://github.com/apache/incubator-mxnet/blob/master/make/config.mk>) that contains all the compilation options. You can edit this file and set the appropriate options prior to running the **make** command.
5. Please refer to [platform specific build instructions](<https://mxnet.incubator.apache.org/install/build_from_source#build-instructions-by-operating-system>) and available [build configurations](https://mxnet.incubator.apache.org/install/build_from_source#build-configurations) for more details.
5. For enabling the build of C++ Package, set the **USE\_CPP\_PACKAGE = 1** in [make/config.mk](<https://github.com/apache/incubator-mxnet/blob/master/make/config.mk>). Optionally, the compilation flag can also be specified on **make** command line as follows.
```
make -j USE_CPP_PACKAGE=1
```

## Usage

## Building C++ examples in examples folder
In order to consume the C++ API please follow the steps below.

From cpp-package/examples directory
- Build all examples in release mode: **make all**
- Build all examples in debug mode : **make debug**
1. Ensure that the MXNet shared library is built from source with the **USE\_CPP\_PACKAGE = 1**.
2. Include the [MxNetCpp.h](<https://github.com/apache/incubator-mxnet/blob/master/cpp-package/include/mxnet-cpp/MxNetCpp.h>) in the program that is going to consume MXNet C++ API.
```
#include <mxnet-cpp/MxNetCpp.h>
```
3. While building the program, ensure that the correct paths to the directories containing header files and MXNet shared library.
4. The program links the MXNet shared library dynamically. Hence the library needs to be accessible to the program during runtime. This can be achieved by including the path to the shared library in the environment variable **LD\_LIBRARY\_PATH** for Linux, Mac. and Ubuntu OS and **PATH** for Windows OS.

By default, the examples are build to be run on GPU.
To build examples to run on CPU:
- Release: **make all MXNET_USE_CPU=1**
- Debug: **make debug MXNET_USE_CPU=1**

## Tutorial

A basic tutorial can be found at <https://mxnet.incubator.apache.org/tutorials/c++/basics.html>.

## Examples

The example directory contains examples for you to get started.

The makefile will also download the necessary data files and store in data folder. (The download will take couple of minutes, but will be done only once on a fresh installation.)
Loading