Merge branch 'master' into tzerrell-pml-quantize-master

.ci/onnx/onnxruntime/Jenkinsfile

+// ******************************************************************************
+// Copyright 2018-2019 Intel Corporation
+//
+// Licensed 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.
+// ******************************************************************************
+
+try{ if(LABEL.trim() == "") {throw new Exception();} }catch(Exception e){LABEL="onnx && ci"}; echo "${LABEL}"
+
+NGRPAH_REPOSITORY = "https://github.com/NervanaSystems/ngraph.git"
+NGRAPH_COMMIT_HASH = "${ghprbActualCommit}" // particular nGraph PR commit hash 
+
+ONNX_REPOSITORY = "https://github.com/NervanaSystems/onnxruntime.git"
+ONNX_RUNTIME_BRANCH = "release"
+
+def main(){
+    timeout(activity: true, time: 15) {
+        try{
+            stage("CloneRepos"){
+                CloneRepos()
+            }
+            stage("Apply Patch"){
+                ApplyPatch()
+            }
+            stage("Onnx Models"){
+                BuildAndTest()
+            }            
+        }
+        catch(e) {
+            // Set result to ABORTED if exception contains exit code of a process interrupted by SIGTERM
+            if ("$e".contains("143")) {
+                currentBuild.result = "ABORTED"
+            } else {
+                currentBuild.result = "FAILURE"
+            }
+        }
+        stage("Clean"){
+            Clean()
+        }
+    }
+}
+
+
+def CloneRepos() {
+    dir("ngraph"){
+        checkout([
+            $class: 'GitSCM',
+            branches: [[name: "${NGRAPH_COMMIT_HASH}"]],
+            doGenerateSubmoduleConfigurations: false,
+            extensions: [[
+                $class: 'SubmoduleOption',
+                disableSubmodules: false,
+                parentCredentials: true,
+                recursiveSubmodules: true,
+                reference: '',
+                trackingSubmodules: false,
+                timeout: 15
+            ]],
+            submoduleCfg: [],
+            userRemoteConfigs: [[
+                refspec: '+refs/pull/*:refs/remotes/origin/pr/*',
+                url: "${NGRPAH_REPOSITORY}"
+            ]]
+        ])
+    }
+    dir("onnxruntime") {
+        checkout([
+            $class: 'GitSCM',
+            branches: [[name: "${ONNX_RUNTIME_BRANCH}"]],
+            doGenerateSubmoduleConfigurations: false,
+            extensions: [[
+                $class: 'SubmoduleOption',
+                disableSubmodules: false,
+                parentCredentials: true,
+                recursiveSubmodules: true,
+                reference: '',
+                trackingSubmodules: false,
+                timeout: 15
+            ]],
+            submoduleCfg: [],
+            userRemoteConfigs: [[                    
+                url: "${ONNX_REPOSITORY}"
+            ]]
+        ])
+    }
+}
+
+def ApplyPatch(){
+    dir("onnxruntime"){
+        echo "Update cmake/external/ngraph.cmake with ${NGRAPH_COMMIT_HASH}"
+        sh """
+            sed -i 's/set(ngraph_TAG ".*")/set(ngraph_TAG "${NGRAPH_COMMIT_HASH}")/g' cmake/external/ngraph.cmake 
+            grep -q "${NGRAPH_COMMIT_HASH}" cmake/external/ngraph.cmake 
+        """
+        echo "Add proxy to tools/ci_build/github/linux/docker/Dockerfile.ubuntu"
+        sh """
+            sed -i 's|{HTTP_PROXY}|${env.http_proxy}|g' ../ngraph/.ci/onnx/onnxruntime/proxy.patch
+            sed -i 's|{SOCKS_PROXY}|${env.socks_proxy}|g' ../ngraph/.ci/onnx/onnxruntime/proxy.patch
+            grep -q "${env.http_proxy}" ../ngraph/.ci/onnx/onnxruntime/proxy.patch
+            git apply ../ngraph/.ci/onnx/onnxruntime/proxy.patch
+        """
+    }
+}
+
+def BuildAndTest(){
+    dir("onnxruntime"){
+        sh "mkdir -p `pwd`/build/models && chmod 777 `pwd`/build/models"
+        sh """
+            //!/bin/bash
+            ./tools/ci_build/github/linux/run_dockerbuild.sh \
+                -o ubuntu16.04 \
+                -d ngraph \
+                -r `pwd`/build -x '--use_ngraph --use_full_protobuf --test_data_url https://onnxruntimetestdata.blob.core.windows.net/models/20190327.zip --test_data_checksum 45166d81c021c8aae212b53c92101792'
+        """
+    }
+}
+
+def Clean(){
+    deleteDir()
+}
+
+node(LABEL) {
+    main()
+}

.ci/onnx/onnxruntime/proxy.patch

+diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu
+index bdff95e1..cd9c0008 100644
+--- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu
++++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu
+@@ -3,6 +3,18 @@ FROM ubuntu:${OS_VERSION}
+ 
+ ARG PYTHON_VERSION=3.5
+ 
++ENV http_proxy={HTTP_PROXY}
++ENV socks_proxy={SOCKS_PROXY}
++ENV https_proxy={HTTP_PROXY}
++ENV ftp_proxy={HTTP_PROXY}
++ENV rsync_proxy={HTTP_PROXY}
++ENV no_proxy=intel.com,.intel.com,localhost
++ENV HTTP_PROXY={HTTP_PROXY}
++ENV HTTPS_PROXY={HTTP_PROXY}
++ENV FTP_PROXY={HTTP_PROXY}
++ENV SOCKS_PROXY={SOCKS_PROXY}
++ENV NO_PROXY=intel.com,.intel.com,localhost
++
+ ADD scripts /tmp/scripts
+ RUN /tmp/scripts/install_ubuntu.sh -p ${PYTHON_VERSION} && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts
+ 

CONTRIB.md

 Contributor Guidelines
 ======================
 
-https://ngraph.nervanasys.com/docs/latest/project/code-contributor-README.html
+The latest version of this file can be found at: 
+
+https://ngraph.nervanasys.com/docs/latest/project/contribution-guide.html
 
 
 License

test/models/onnx/lstm_fwd_large_batch_no_clip.prototxt

+ir_version: 4
+producer_name: "nGraph ONNX Importer"
+graph {
+  node {
+    input: "X"
+    input: "W"
+    input: "R"
+    output: ""
+    output: "Y_h"
+    op_type: "LSTM"
+    attribute {
+      name: "clip"
+      f: 9999.0
+      type: FLOAT
+    }
+    attribute {
+      name: "direction"
+      s: "forward"
+      type: STRING
+    }
+    attribute {
+      name: "hidden_size"
+      i: 3
+      type: INT
+    }
+  }
+  name: "compute_graph"
+  input {
+    name: "X"
+    type {
+      tensor_type {
+        elem_type: 1
+        shape {
+          dim {
+            dim_value: 2
+          }
+          dim {
+            dim_value: 32
+          }
+          dim {
+            dim_value: 1
+          }
+        }
+      }
+    }
+  }
+  input {
+    name: "W"
+    type {
+      tensor_type {
+        elem_type: 1
+        shape {
+          dim {
+            dim_value: 1
+          }
+          dim {
+            dim_value: 12
+          }
+          dim {
+            dim_value: 1
+          }
+        }
+      }
+    }
+  }
+  input {
+    name: "R"
+    type {
+      tensor_type {
+        elem_type: 1
+        shape {
+          dim {
+            dim_value: 1
+          }
+          dim {
+            dim_value: 12
+          }
+          dim {
+            dim_value: 3
+          }
+        }
+      }
+    }
+  }
+  output {
+    name: "Y_h"
+    type {
+      tensor_type {
+        elem_type: 1
+        shape {
+          dim {
+            dim_value: 1
+          }
+          dim {
+            dim_value: 32
+          }
+          dim {
+            dim_value: 3
+          }
+        }
+      }
+    }
+  }
+}
+opset_import {
+  version: 7
+}

test/onnx/onnx_import_rnn.in.cpp

@@ -20,6 +20,7 @@
 #include <fstream>
 #include <iterator>
 #include <limits>
+#include <numeric>
 #include <sstream>
 #include <stdexcept>
 #include <vector>
@@ -203,3 +204,48 @@ NGRAPH_TEST(onnx_${BACKEND_NAME}, model_lstm_fwd_hardsigmoid_activation)
     test_case.set_tolerance(6);
     test_case.run();
 }
+
+NGRAPH_TEST(onnx_${BACKEND_NAME}, model_lstm_fwd_large_batch_no_clip)
+{
+    auto function = onnx_import::import_onnx_model(
+        file_util::path_join(SERIALIZED_ZOO, "onnx/lstm_fwd_large_batch_no_clip.prototxt"));
+
+    auto test_case = ngraph::test::NgraphTestCase(function, "${BACKEND_NAME}");
+
+    std::size_t seq_length = 2;
+    std::size_t batch_size = 32;
+    std::size_t input_size = 1;
+    std::size_t hidden_size = 3;
+
+    std::vector<float> in_X(seq_length * batch_size * input_size);
+    std::iota(std::begin(in_X), std::end(in_X), 1.f);
+    std::vector<float> in_R(4 * hidden_size * hidden_size, 0.1f);
+
+    // X
+    test_case.add_input<float>(in_X);
+    // W
+    test_case.add_input<float>(
+        {0.1f, 0.2f, 0.3f, 0.4f, 1.f, 2.f, 3.f, 4.f, 10.f, 11.f, 12.f, 13.f});
+    // R
+    test_case.add_input<float>(in_R);
+
+    // Y_h_data
+    test_case.add_expected_output<float>(
+        Shape{1, batch_size, hidden_size},
+        {0.90387899f, 0.9135572f,  0.91772245f, 0.90897038f, 0.92132433f, 0.92825467f, 0.91365823f,
+         0.92815113f, 0.93676105f, 0.91799162f, 0.93406357f, 0.94344562f, 0.92199681f, 0.93912057f,
+         0.94859476f, 0.92569357f, 0.94340185f, 0.95250664f, 0.92909964f, 0.94699686f, 0.95545127f,
+         0.93223207f, 0.94999634f, 0.95765468f, 0.93510761f, 0.9524867f,  0.95929726f, 0.93774272f,
+         0.9545467f,  0.96051891f, 0.9401536f,  0.95624603f, 0.96142619f, 0.94235605f, 0.95764499f,
+         0.96209939f, 0.94436539f, 0.95879495f, 0.96259862f, 0.94619635f, 0.95973921f, 0.96296872f,
+         0.94786299f, 0.96051397f, 0.96324302f, 0.94937864f, 0.96114929f, 0.96344629f, 0.95075587f,
+         0.96167006f, 0.96359692f, 0.95200645f, 0.96209679f, 0.96370852f, 0.95314133f, 0.9624464f,
+         0.9637912f,  0.95417069f, 0.96273278f, 0.96385246f, 0.95510395f, 0.96296733f, 0.96389785f,
+         0.95594975f, 0.96315942f, 0.96393147f, 0.95671607f, 0.96331673f, 0.96395638f, 0.9574102f,
+         0.96344554f, 0.96397483f, 0.9580388f,  0.96355102f, 0.9639885f,  0.95860795f, 0.96363739f,
+         0.96399863f, 0.95912322f, 0.96370811f, 0.96400613f, 0.95958963f, 0.96376601f, 0.96401169f,
+         0.96001179f, 0.96381342f, 0.96401581f, 0.96039386f, 0.96385224f, 0.96401886f, 0.96073964f,
+         0.96388402f, 0.96402112f, 0.96105254f, 0.96391004f, 0.96402279f});
+
+    test_case.run();
+}