[incubator-mxnet] branch master updated: Fix doc link (#8776)
This is an automated email from the ASF dual-hosted git repository. madjam 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 e835777 Fix doc link (#8776) e835777 is described below commit e835777bdf2dd586ccefa94e4dc34678cced1835 Author: Madan Jampani <mad...@users.noreply.github.com> AuthorDate: Wed Nov 22 10:38:18 2017 -0800 Fix doc link (#8776) --- docs/faq/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq/index.md b/docs/faq/index.md index e29bda0..883d8e6 100644 --- a/docs/faq/index.md +++ b/docs/faq/index.md @@ -41,7 +41,7 @@ and full working examples, visit the [tutorials section](../tutorials/index.md). * [How to convert MXNet models to Apple CoreML format?](https://github.com/apache/incubator-mxnet/tree/master/tools/coreml) ## Security -* [How to run MXNet securely?](http://mxnet.io/how_to/security.md) +* [How to run MXNet securely?](http://mxnet.io/how_to/security.html) ## Extend and Contribute to MXNet -- To stop receiving notification emails like this one, please contact ['"comm...@mxnet.apache.org" <comm...@mxnet.apache.org>'].
[incubator-mxnet] branch master updated: Changing each task timeout from 60minutes to 120minutes (#7777)
This is an automated email from the ASF dual-hosted git repository. madjam 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 38381c7 Changing each task timeout from 60minutes to 120minutes (#) 38381c7 is described below commit 38381c74fa1b691a5d3d0ace0036614a4c564c5a Author: mbaijal <30911248+mbai...@users.noreply.github.com> AuthorDate: Wed Sep 6 12:50:19 2017 -0700 Changing each task timeout from 60minutes to 120minutes (#) --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5b2f819..d6111a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, dmlc-core/libdmlc.a, nnvm/lib/libnnvm // command to start a docker container docker_run = 'tests/ci_build/ci_build.sh' // timeout in minutes -max_time = 60 +max_time = 120 // assign any caught errors here err = null -- To stop receiving notification emails like this one, please contact ['"comm...@mxnet.apache.org" <comm...@mxnet.apache.org>'].
[incubator-mxnet] branch master updated: Clean amalgamation ws and skip failing test (#7678)
This is an automated email from the ASF dual-hosted git repository.
madjam 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 da7c5bc Clean amalgamation ws and skip failing test (#7678)
da7c5bc is described below
commit da7c5bc7041fddfc411c4e59b2a23204d2532c3a
Author: Sandeep Krishnamurthy <sandeep.krishn...@gmail.com>
AuthorDate: Tue Sep 5 12:36:31 2017 -0700
Clean amalgamation ws and skip failing test (#7678)
* Clean amalgamation ws and skip failing test
* Undo skipping the failing test_ce_loss
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6adbea1..5b2f819 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -164,7 +164,7 @@ try {
},
'Amalgamation MIN': {
node('mxnetlinux') {
- ws('workspace/amalgamation') {
+ ws('workspace/amalgamationmin') {
init_git()
make('cpu', '-C amalgamation/ clean')
make('cpu', '-C amalgamation/ USE_BLAS=openblas MIN=1')
--
To stop receiving notification emails like this one, please contact
['"comm...@mxnet.apache.org" <comm...@mxnet.apache.org>'].
[incubator-mxnet] branch master updated: [R] fix CI test (#7674)
This is an automated email from the ASF dual-hosted git repository.
madjam 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 ee5bf32 [R] fix CI test (#7674)
ee5bf32 is described below
commit ee5bf32a8eec0f2ce8e66463a89d6a48f591a032
Author: Qiang Kou (KK) <q...@qkou.info>
AuthorDate: Wed Aug 30 22:42:05 2017 -0400
[R] fix CI test (#7674)
---
R-package/tests/testthat/test_img_seg.R | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/R-package/tests/testthat/test_img_seg.R
b/R-package/tests/testthat/test_img_seg.R
index fbca92e..b3400cd 100644
--- a/R-package/tests/testthat/test_img_seg.R
+++ b/R-package/tests/testthat/test_img_seg.R
@@ -90,7 +90,7 @@ context("Image segmentation")
test_that("UNET", {
list.of.packages <- c("imager")
new.packages <- list.of.packages[!(list.of.packages %in%
installed.packages()[,"Package"])]
- if(length(new.packages)) install.packages(new.packages)
+ if(length(new.packages)) install.packages(new.packages, repos =
"https://cloud.r-project.org/;)
GetISBI_data()
library(imager)
IMG_SIZE <- 168
@@ -132,4 +132,4 @@ test_that("UNET", {
learning.rate = 0.05,
momentum = 0.99,
array.batch.size = 2)
-})
\ No newline at end of file
+})
--
To stop receiving notification emails like this one, please contact
['"comm...@mxnet.apache.org" <comm...@mxnet.apache.org>'].
[incubator-mxnet] branch master updated: Initial commit of an MXNet converter. (#7413)
This is an automated email from the ASF dual-hosted git repository. madjam 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 1a3faa6 Initial commit of an MXNet converter. (#7413) 1a3faa6 is described below commit 1a3faa63f2a24820427e6454f5d6eaa72ea636c1 Author: Krishna Sridhar <1875987+srik...@users.noreply.github.com> AuthorDate: Thu Aug 10 15:22:07 2017 -0700 Initial commit of an MXNet converter. (#7413) --- tools/coreml/__init__.py| 18 ++ tools/coreml/_layers.py | 397 ++ tools/coreml/_mxnet_converter.py| 210 tools/coreml/test_mxnet_converer.py | 477 4 files changed, 1102 insertions(+) diff --git a/tools/coreml/__init__.py b/tools/coreml/__init__.py new file mode 100644 index 000..e56490a --- /dev/null +++ b/tools/coreml/__init__.py @@ -0,0 +1,18 @@ +# 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. + +from _mxnet_converter import * diff --git a/tools/coreml/_layers.py b/tools/coreml/_layers.py new file mode 100644 index 000..5148984 --- /dev/null +++ b/tools/coreml/_layers.py @@ -0,0 +1,397 @@ +# 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. +import numpy as _np + +def _get_input_output_name(net, node, index = 0): +name = node['name'] +inputs = node['inputs'] + +if index == 'all': +input_name = [_get_node_name(net, inputs[id][0]) for id in range(len(inputs))] +elif type(index) == int: +input_name = _get_node_name(net, inputs[0][0]) +else: +input_name = [_get_node_name(net, inputs[id][0]) for id in index] +return input_name, name + +def _get_node_name(net, node_id): +return net['nodes'][node_id]['name'] + +def _get_node_shape(net, node_id): +return net['nodes'][node_id]['shape'] + +def convert_transpose(net, node, model, builder): +"""Convert a transpose layer from mxnet to coreml. + +Parameters +-- +network: net +A mxnet network object. + +layer: node +Node to convert. + +model: model +An model for MXNet + +builder: NeuralNetworkBuilder +A neural network builder object. +""" +input_name, output_name = _get_input_output_name(net, node) +name = node['name'] +param = node['attr'] +from ast import literal_eval +axes = literal_eval(param['axes']) +builder.add_permute(name, input_name, output_name, axes) + +def convert_flatten(net, node, model, builder): +"""Convert a flatten layer from mxnet to coreml. + +Parameters +-- +network: net +A mxnet network object. + +layer: node +Node to convert. + +model: model +An model for MXNet + +builder: NeuralNetworkBuilder +A neural network builder object. +""" +input_name, output_name = _get_input_output_name(net, node) +name = node['name'] +builder.add_flatten(0, name, input_name, output_name) + +def convert_softmax(net, node, model, builder): +"""Convert a softmax layer from mxnet to coreml. + +Parameters +-- +network: net +A mxnet network object. + +layer: node +Node to convert. + +model: model +An model for M
[incubator-mxnet] branch master updated: Fix data tutorial (#7329)
This is an automated email from the ASF dual-hosted git repository.
madjam 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 c198572 Fix data tutorial (#7329)
c198572 is described below
commit c1985725c4a877a3658cafd4e791aafb4c063e55
Author: Yao Wang <kevinthesu...@gmail.com>
AuthorDate: Mon Aug 7 10:08:11 2017 -0700
Fix data tutorial (#7329)
---
docs/tutorials/basic/data.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/tutorials/basic/data.md b/docs/tutorials/basic/data.md
index dba1391..93a1db0 100644
--- a/docs/tutorials/basic/data.md
+++ b/docs/tutorials/basic/data.md
@@ -19,7 +19,7 @@ $ pip install opencv-python requests matplotlib jupyter
```
$ git clone https://github.com/dmlc/mxnet ~/mxnet
-$ MXNET_HOME = '~/mxnet'
+$ export MXNET_HOME='~/mxnet'
```
## MXNet Data Iterator
@@ -366,7 +366,7 @@ Now let's convert them into record io format using the
`im2rec.py` utility scrip
First, we need to make a list that contains all the image files and their
categories:
```python
-os.system('python %s/tools/im2rec.py --list=1 --recursive=1 --shuffle=1
--test-ratio=0.2 data/caltech data/101_ObjectCategories'%MXNET_HOME)
+os.system('python %s/tools/im2rec.py --list=1 --recursive=1 --shuffle=1
--test-ratio=0.2 data/caltech
data/101_ObjectCategories'%os.environ['MXNET_HOME'])
```
The resulting list file (./data/caltech_train.lst) is in the format
`index\t(one or more label)\tpath`. In this case, there is only one label for
each image but you can modify the list to add in more for multi-label training.
@@ -375,7 +375,7 @@ Then we can use this list to create our record io file:
```python
-os.system("python %s/tools/im2rec.py --num-thread=4 --pass-through=1
data/caltech data/101_ObjectCategories"%MXNET_HOME)
+os.system("python %s/tools/im2rec.py --num-thread=4 --pass-through=1
data/caltech data/101_ObjectCategories"%os.environ['MXNET_HOME'])
```
The record io files are now saved at here (./data)
--
To stop receiving notification emails like this one, please contact
['"comm...@mxnet.apache.org" <comm...@mxnet.apache.org>'].
