Merge pull request #408 from sony/feature/20190412-upgrade-onnx-version

Upgrade onnx version to 1.4.1
sony · Apr 17, 2019 · f041106 · f041106
2 parents fec8da1 + 4ccbc4b
commit f041106
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/docker/development/Dockerfile.build-armhf b/docker/development/Dockerfile.build-armhf
@@ -75,7 +75,7 @@ RUN pip install --no-cache-dir \
     cython \
     mako \
     numpy\<1.16 \
-    onnx==1.3.0 \
+    onnx==1.4.1 \
     pillow \
     protobuf \
     pytest \
@@ -98,7 +98,7 @@ RUN pip3 install --no-cache-dir \
     cython \
     mako \
     numpy\<1.16 \
-    onnx==1.3.0 \
+    onnx==1.4.1 \
     pillow \
     protobuf \
     pytest \

diff --git a/docker/development/Dockerfile.onnx-test b/docker/development/Dockerfile.onnx-test
@@ -120,8 +120,8 @@ RUN set -xe \
         tqdm \
         wheel \
         virtualenv \
-    && pip install pyyaml onnx==1.3.0 future Cython autopep8 requests \
-        graphviz pytablewriter \
+    && pip install pyyaml onnx==1.4.1 future Cython autopep8 requests \
+        graphviz \
     && pip install cntk || true \
     && conda install -y -c pytorch pytorch-nightly-cpu \
     && rm -rf /opt/miniconda3/pkgs
diff --git a/docker/development/Dockerfile.onnx-test-armhf b/docker/development/Dockerfile.onnx-test-armhf
@@ -73,7 +73,7 @@ RUN pip install --no-cache-dir \
     cython \
     mako \
     numpy\<1.16 \
-    onnx==1.3.0 \
+    onnx==1.4.1 \
     pillow \
     protobuf \
     pytest \
@@ -96,7 +96,7 @@ RUN pip3 install --no-cache-dir \
     cython \
     mako \
     numpy\<1.16 \
-    onnx==1.3.0 \
+    onnx==1.4.1 \
     pillow \
     protobuf \
     pytest \

diff --git a/docker/development/Dockerfile.tf-test b/docker/development/Dockerfile.tf-test
@@ -120,7 +120,7 @@ RUN set -xe \
         tqdm \
         wheel \
         virtualenv \
-    && pip install pyyaml onnx==1.3.0 future Cython autopep8 requests \
+    && pip install pyyaml onnx==1.4.1 future Cython autopep8 requests \
         graphviz tensorflow onnx_tf \
     && pip install cntk || true \
     && conda install -y -c pytorch pytorch-nightly-cpu \

diff --git a/python/src/nnabla/utils/converter/onnx/utils.py b/python/src/nnabla/utils/converter/onnx/utils.py
@@ -1,6 +1,6 @@
 NNABLA_DOMAIN = "org.nnabla"
 NNABLA_OPSET_VERSION = 1
-ONNX_IR_VERSION = 3
+ONNX_IR_VERSION = 4
 ONNX_OPSET_VERSION = 6
 PRODUCER_NAME = "nnabla-onnx"
 PRODUCER_VERSION = "0.1"