Skip to content

Commit dea3dd2

Browse files
ZhennanQinpengzhao-intel
authored andcommitted
[mkldnn-1.0]Rebase to master (apache#16648)
* fixed broken links across multiple files (apache#16581) * fix missing docs due to git add issues (apache#16496) * Create SECURITY.md (apache#16573) * Create SECURITY.md * Update SECURITY.md * [Numpy] Support N_D(N>=3) batch_dot (apache#16586) * Support N_D(N>=3) batch_dot * use 1E-4 * fix lint * remove unnecessary comment * Update test_numpy_op.py * Large Vector tests for DGL Ops Part 2 (apache#16497) * add hyperbolic, logical, sign and regression tests for large vector * changed hyperbolic functions into existing trignometric functions * fix trigo and simple bind needs shape as tuple * fix logical ops, add with_seed * fix arcosh in largearray, remove regression from largevector * [Numpy] Loading numpy-incompatible NDArray in numpy-compatible mode (apache#16597) * Make MXIsNumpyShape return enum * address the comment * Surpress subgraph log in CI (apache#16607) Change-Id: Ia2ed6fdbb1d2cb5cc607a8856ca13ee338e27eac * Fix dequantize memory corruption (apache#16606) Change-Id: I51b62a32987bdbcf96f04b1bc6617e66796f648b * [MKLDNN]Fix reorder2default (apache#16602) * Fix reorder2default Change-Id: I74c87af9535f6264e6d1ea7eaed089a6480a3358 * fix Change-Id: I6d07b43b520a47e7c78bd4b4b6390f5fb95e6957 * Fix Change-Id: Id72f25c34291be4711f55569c6d61467edd6113d * Fix CI Change-Id: I8c33a82555d5ace2d0b682c1e3eefa13f3a44768 * Run CI Change-Id: Ie8a6dab80ef91c0337cafbae4e3db277e0c7ebf7 * second round of fixing broken links in multiple files (apache#16598) * Python Docstring Convetion (apache#16550) * Docstring convetnion for * Docstring convention for * Docstring convention for * Docstring convention for * Docstring convention for * Docstring convention for * Docstring convention * Revert removing new line * Remove white space * [MXNET-1434] Fix a broken link for basic C++ tutorial (apache#16461) * Fix for wrong reqs set after switching from training to inference (apache#16553) * Debugging reqs * Move literal strings to const static members * Fix lint * julia/docs: more DRY on page rendering (apache#16396)
1 parent 19038d0 commit dea3dd2

File tree

93 files changed

+875
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+875
-405
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ script:
3434
# Temporarily disable travis build due to travis constantly time out, tracked in
3535
# https://github.com/apache/incubator-mxnet/issues/16535:
3636
- export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
37+
- export MXNET_SUBGRAPH_VERBOSE=0
3738
- mv make/osx.mk config.mk
3839
# - make -j 2
3940

SECURITY.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--- Licensed to the Apache Software Foundation (ASF) under one -->
2+
<!--- or more contributor license agreements. See the NOTICE file -->
3+
<!--- distributed with this work for additional information -->
4+
<!--- regarding copyright ownership. The ASF licenses this file -->
5+
<!--- to you under the Apache License, Version 2.0 (the -->
6+
<!--- "License"); you may not use this file except in compliance -->
7+
<!--- with the License. You may obtain a copy of the License at -->
8+
9+
<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
10+
11+
<!--- Unless required by applicable law or agreed to in writing, -->
12+
<!--- software distributed under the License is distributed on an -->
13+
<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
14+
<!--- KIND, either express or implied. See the License for the -->
15+
<!--- specific language governing permissions and limitations -->
16+
<!--- under the License. -->
17+
18+
# Security Policy
19+
20+
## Reporting a Vulnerability
21+
The Apache Software Foundation takes a very active stance in eliminating security problems and denial of service attacks against its products.
22+
23+
We strongly encourage folks to report such problems to our private security mailing list first, before disclosing them in a public forum.
24+
25+
For instructions how to report a security vulnerability, please consult our [security guide](https://mxnet.apache.org/api/faq/security).

ci/docker/runtime_functions.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@ cd_unittest_ubuntu() {
10071007
export PYTHONPATH=./python/
10081008
export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
10091009
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1010+
export MXNET_SUBGRAPH_VERBOSE=0
10101011
export MXNET_ENABLE_CYTHON=0
10111012
export CD_JOB=1 # signal this is a CD run so any unecessary tests can be skipped
10121013

@@ -1049,6 +1050,7 @@ unittest_ubuntu_python2_cpu_cython() {
10491050
export PYTHONPATH=./python/
10501051
export MXNET_MKLDNN_DEBUG=1
10511052
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1053+
export MXNET_SUBGRAPH_VERBOSE=0
10521054
export MXNET_ENABLE_CYTHON=1
10531055
export MXNET_ENFORCE_CYTHON=1
10541056
check_cython 2
@@ -1062,6 +1064,7 @@ unittest_ubuntu_python2_cpu() {
10621064
export PYTHONPATH=./python/
10631065
export MXNET_MKLDNN_DEBUG=0
10641066
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1067+
export MXNET_SUBGRAPH_VERBOSE=0
10651068
export MXNET_ENABLE_CYTHON=0
10661069
nosetests-2.7 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_unittest.xml --verbose tests/python/unittest
10671070
nosetests-2.7 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_train.xml --verbose tests/python/train
@@ -1073,6 +1076,7 @@ unittest_ubuntu_python3_cpu() {
10731076
export PYTHONPATH=./python/
10741077
export MXNET_MKLDNN_DEBUG=0 # Ignored if not present
10751078
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1079+
export MXNET_SUBGRAPH_VERBOSE=0
10761080
export MXNET_ENABLE_CYTHON=0
10771081
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_unittest.xml --verbose tests/python/unittest
10781082
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_quantization.xml --verbose tests/python/quantization
@@ -1083,6 +1087,7 @@ unittest_ubuntu_python3_cpu_mkldnn() {
10831087
export PYTHONPATH=./python/
10841088
export MXNET_MKLDNN_DEBUG=0 # Ignored if not present
10851089
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1090+
export MXNET_SUBGRAPH_VERBOSE=0
10861091
export MXNET_ENABLE_CYTHON=0
10871092
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_unittest.xml --verbose tests/python/unittest
10881093
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_mkl.xml --verbose tests/python/mkl
@@ -1093,6 +1098,7 @@ unittest_ubuntu_python2_gpu() {
10931098
export PYTHONPATH=./python/
10941099
export MXNET_MKLDNN_DEBUG=0 # Ignored if not present
10951100
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1101+
export MXNET_SUBGRAPH_VERBOSE=0
10961102
export CUDNN_VERSION=${CUDNN_VERSION:-7.0.3}
10971103
nosetests-2.7 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_gpu.xml --verbose tests/python/gpu
10981104
}
@@ -1102,6 +1108,7 @@ unittest_ubuntu_python3_gpu() {
11021108
export PYTHONPATH=./python/
11031109
export MXNET_MKLDNN_DEBUG=0 # Ignored if not present
11041110
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1111+
export MXNET_SUBGRAPH_VERBOSE=0
11051112
export CUDNN_VERSION=${CUDNN_VERSION:-7.0.3}
11061113
export MXNET_ENABLE_CYTHON=0
11071114
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_gpu.xml --verbose tests/python/gpu
@@ -1112,6 +1119,7 @@ unittest_ubuntu_python3_gpu_cython() {
11121119
export PYTHONPATH=./python/
11131120
export MXNET_MKLDNN_DEBUG=1 # Ignored if not present
11141121
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1122+
export MXNET_SUBGRAPH_VERBOSE=0
11151123
export CUDNN_VERSION=${CUDNN_VERSION:-7.0.3}
11161124
export MXNET_ENABLE_CYTHON=1
11171125
export MXNET_ENFORCE_CYTHON=1
@@ -1123,6 +1131,7 @@ unittest_ubuntu_python3_gpu_nocudnn() {
11231131
set -ex
11241132
export PYTHONPATH=./python/
11251133
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1134+
export MXNET_SUBGRAPH_VERBOSE=0
11261135
export CUDNN_OFF_TEST_ONLY=true
11271136
export MXNET_ENABLE_CYTHON=0
11281137
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_gpu.xml --verbose tests/python/gpu
@@ -1132,6 +1141,7 @@ unittest_ubuntu_tensorrt_gpu() {
11321141
set -ex
11331142
export PYTHONPATH=./python/
11341143
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1144+
export MXNET_SUBGRAPH_VERBOSE=0
11351145
export LD_LIBRARY_PATH=/work/mxnet/lib:$LD_LIBRARY_PATH
11361146
export CUDNN_VERSION=${CUDNN_VERSION:-7.0.3}
11371147
export MXNET_ENABLE_CYTHON=0
@@ -1146,6 +1156,7 @@ unittest_ubuntu_python2_quantization_gpu() {
11461156
export PYTHONPATH=./python/
11471157
export MXNET_MKLDNN_DEBUG=0 # Ignored if not present
11481158
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1159+
export MXNET_SUBGRAPH_VERBOSE=0
11491160
export CUDNN_VERSION=${CUDNN_VERSION:-7.0.3}
11501161
export MXNET_ENABLE_CYTHON=0
11511162
nosetests-2.7 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_quantization_gpu.xml --verbose tests/python/quantization_gpu
@@ -1158,6 +1169,7 @@ unittest_ubuntu_python3_quantization_gpu() {
11581169
export PYTHONPATH=./python/
11591170
export MXNET_MKLDNN_DEBUG=0 # Ignored if not present
11601171
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1172+
export MXNET_SUBGRAPH_VERBOSE=0
11611173
export CUDNN_VERSION=${CUDNN_VERSION:-7.0.3}
11621174
export MXNET_ENABLE_CYTHON=0
11631175
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_quantization_gpu.xml --verbose tests/python/quantization_gpu
@@ -1320,6 +1332,7 @@ integrationtest_ubuntu_gpu_python() {
13201332
set -ex
13211333
export PYTHONPATH=./python/
13221334
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1335+
export MXNET_SUBGRAPH_VERBOSE=0
13231336
python example/image-classification/test_score.py
13241337
}
13251338

@@ -1348,6 +1361,7 @@ integrationtest_ubuntu_cpu_dist_kvstore() {
13481361
pushd .
13491362
export PYTHONPATH=./python/
13501363
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1364+
export MXNET_SUBGRAPH_VERBOSE=0
13511365
export MXNET_USE_OPERATOR_TUNING=0
13521366
cd tests/nightly/
13531367
../../tools/launch.py -n 7 --launcher local python dist_sync_kvstore.py --type=gluon_step_cpu
@@ -1382,6 +1396,7 @@ integrationtest_ubuntu_gpu_dist_kvstore() {
13821396
pushd .
13831397
export PYTHONPATH=./python/
13841398
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1399+
export MXNET_SUBGRAPH_VERBOSE=0
13851400
cd tests/nightly/
13861401
../../tools/launch.py -n 4 --launcher local python dist_device_sync_kvstore.py
13871402
../../tools/launch.py -n 4 --launcher local python dist_sync_kvstore.py --type=init_gpu
@@ -1569,6 +1584,7 @@ nightly_tutorial_test_ubuntu_python3_gpu() {
15691584
export MXNET_DOCS_BUILD_MXNET=0
15701585
make html
15711586
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1587+
export MXNET_SUBGRAPH_VERBOSE=0
15721588
export PYTHONPATH=/work/mxnet/python/
15731589
export MXNET_TUTORIAL_TEST_KERNEL=python3
15741590
cd /work/mxnet/tests/tutorials
@@ -1582,6 +1598,7 @@ nightly_tutorial_test_ubuntu_python2_gpu() {
15821598
export MXNET_DOCS_BUILD_MXNET=0
15831599
make html
15841600
export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
1601+
export MXNET_SUBGRAPH_VERBOSE=0
15851602
export PYTHONPATH=/work/mxnet/python/
15861603
export MXNET_TUTORIAL_TEST_KERNEL=python2
15871604
cd /work/mxnet/tests/tutorials
@@ -1975,7 +1992,7 @@ cd_package_pypi() {
19751992
popd
19761993
}
19771994

1978-
# Sanity checks wheel file
1995+
# Sanity checks wheel file
19791996
cd_integration_test_pypi() {
19801997
set -ex
19811998
local python_cmd=${1:?"This function requires a python command as the first argument"}

ci/windows/test_py2_cpu.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
$env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll
2121
$env:PYTHONPATH=join-path $pwd.Path windows_package\python
2222
$env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
23+
$env:MXNET_SUBGRAPH_VERBOSE=0
2324
$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home')
2425

2526
C:\Python27\Scripts\pip install -r tests\requirements.txt

ci/windows/test_py2_gpu.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
$env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll
2121
$env:PYTHONPATH=join-path $pwd.Path windows_package\python
2222
$env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
23+
$env:MXNET_SUBGRAPH_VERBOSE=0
2324
$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home')
2425

2526
C:\Python27\Scripts\pip install -r tests\requirements.txt

ci/windows/test_py3_cpu.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
$env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll
2121
$env:PYTHONPATH=join-path $pwd.Path windows_package\python
2222
$env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
23+
$env:MXNET_SUBGRAPH_VERBOSE=0
2324
$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home')
2425

2526
C:\Python37\Scripts\pip install -r tests\requirements.txt

ci/windows/test_py3_gpu.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
$env:MXNET_LIBRARY_PATH=join-path $pwd.Path windows_package\lib\libmxnet.dll
2121
$env:PYTHONPATH=join-path $pwd.Path windows_package\python
2222
$env:MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0
23+
$env:MXNET_SUBGRAPH_VERBOSE=0
2324
$env:MXNET_HOME=[io.path]::combine($PSScriptRoot, 'mxnet_home')
2425

2526
C:\Python37\Scripts\pip install -r tests\requirements.txt

cpp-package/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ In order to consume the C++ API please follow the steps below.
5555
5656
## Tutorial
5757
58-
A basic tutorial can be found at <https://mxnet.apache.org/tutorials/c++/basics.html>.
58+
A basic tutorial can be found at <https://mxnet.apache.org/api/cpp/docs/tutorials/basics>.
5959
6060
## Examples
6161
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
.. Licensed to the Apache Software Foundation (ASF) under one
2+
or more contributor license agreements. See the NOTICE file
3+
distributed with this work for additional information
4+
regarding copyright ownership. The ASF licenses this file
5+
to you under the Apache License, Version 2.0 (the
6+
"License"); you may not use this file except in compliance
7+
with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.
17+
18+
gluon.data
19+
==========
20+
21+
.. automodule:: mxnet.gluon.data
22+
23+
Datasets
24+
--------
25+
26+
.. autosummary::
27+
28+
Dataset
29+
ArrayDataset
30+
RecordFileDataset
31+
SimpleDataset
32+
33+
Sampling
34+
--------
35+
36+
.. autosummary::
37+
38+
Sampler
39+
SequentialSampler
40+
RandomSampler
41+
BatchSampler
42+
43+
DataLoader
44+
----------
45+
46+
.. autosummary::
47+
48+
DataLoader
49+
50+
51+
API Reference
52+
-------------
53+
.. automodule:: mxnet.gluon.data
54+
:members:
55+
:imported-members:
56+
:autosummary:
57+
58+
.. toctree::
59+
:hidden:
60+
:maxdepth: 2
61+
:glob:
62+
63+
*/index
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
.. Licensed to the Apache Software Foundation (ASF) under one
2+
or more contributor license agreements. See the NOTICE file
3+
distributed with this work for additional information
4+
regarding copyright ownership. The ASF licenses this file
5+
to you under the Apache License, Version 2.0 (the
6+
"License"); you may not use this file except in compliance
7+
with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.
17+
18+
vision.datasets
19+
===============
20+
21+
Gluon provides pre-defined vision datasets functions in the :py:mod:`mxnet.gluon.data.vision.datasets`
22+
module.
23+
24+
.. automodule:: mxnet.gluon.data.vision.datasets
25+
:members:
26+
:autosummary:
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
.. Licensed to the Apache Software Foundation (ASF) under one
2+
or more contributor license agreements. See the NOTICE file
3+
distributed with this work for additional information
4+
regarding copyright ownership. The ASF licenses this file
5+
to you under the Apache License, Version 2.0 (the
6+
"License"); you may not use this file except in compliance
7+
with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.
17+
18+
data.vision
19+
============
20+
21+
.. automodule:: mxnet.gluon.data.vision
22+
23+
Datasets
24+
^^^^^^^^
25+
26+
.. autosummary::
27+
:nosignatures:
28+
29+
mxnet.gluon.data.vision.datasets
30+
31+
32+
Data transformations
33+
^^^^^^^^^^^^^^^^^^^^
34+
35+
36+
.. autosummary::
37+
:nosignatures:
38+
39+
mxnet.gluon.data.vision.transforms
40+
41+
42+
API Reference
43+
-------------
44+
.. automodule:: mxnet.gluon.data.vision
45+
:members:
46+
:autosummary:
47+
48+
.. toctree::
49+
:hidden:
50+
:maxdepth: 2
51+
:glob:
52+
53+
*/index

0 commit comments

Comments
 (0)