NervanaSystems
diff --git a/‎.ci/onnx/jenkins/Jenkinsfile‎
Lines changed: 4 additions & 4 deletions b/‎.ci/onnx/jenkins/Jenkinsfile‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎CMakeLists.txt‎
Lines changed: 24 additions & 23 deletions b/‎CMakeLists.txt‎
Lines changed: 24 additions & 23 deletions
diff --git a/‎cmake/Modules/fix_mode.cmake‎
Lines changed: 2 additions & 1 deletion b/‎cmake/Modules/fix_mode.cmake‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎cmake/external_gtest.cmake‎
Lines changed: 18 additions & 0 deletions b/‎cmake/external_gtest.cmake‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎cmake/external_mlir.cmake‎
Lines changed: 2 additions & 2 deletions b/‎cmake/external_mlir.cmake‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎cmake/external_protobuf.cmake‎
Lines changed: 31 additions & 8 deletions b/‎cmake/external_protobuf.cmake‎
Lines changed: 31 additions & 8 deletions
diff --git a/‎doc/examples/dynamic_tensor/partial_shape.cpp‎
Lines changed: 68 additions & 0 deletions b/‎doc/examples/dynamic_tensor/partial_shape.cpp‎
Lines changed: 68 additions & 0 deletions
diff --git a/‎doc/sphinx/ngraph_theme/layout.html‎
Lines changed: 9 additions & 8 deletions b/‎doc/sphinx/ngraph_theme/layout.html‎
Lines changed: 9 additions & 8 deletions
diff --git a/‎doc/sphinx/ngraph_theme/ngversions.html‎
Lines changed: 4 additions & 5 deletions b/‎doc/sphinx/ngraph_theme/ngversions.html‎
Lines changed: 4 additions & 5 deletions
@@ -113,10 +113,10 @@ pipeline {
         WORKDIR = "${WORKSPACE}/${BUILD_NUMBER}"
         JENKINS_GITHUB_CREDENTIAL_ID = "7157091e-bc04-42f0-99fd-dc4da2922a55"
         CI_DIR = "ngraph-onnx/.ci/jenkins"
-        NGRAPH_ONNX_REPO_ADDRESS = "https://github.com/NervanaSystems/ngraph-onnx.git"
-        NGRAPH_REPO_ADDRESS = "https://github.com/NervanaSystems/ngraph.git"
-        NGRAPH_ONNX_BRANCH="${CHANGE_BRANCH}"
-        NGRAPH_BRANCH="${CHANGE_BRANCH}"
+        NGRAPH_ONNX_REPO_ADDRESS = "git@github.com:NervanaSystems/ngraph-onnx.git"
+        NGRAPH_REPO_ADDRESS = "git@github.com:NervanaSystems/ngraph.git"
+        NGRAPH_ONNX_BRANCH = "${CHANGE_BRANCH}"
+        NGRAPH_BRANCH = "${CHANGE_BRANCH}"
     }
     options {
         skipDefaultCheckout true
 
@@ -69,14 +69,6 @@ if (UNIX AND NOT APPLE)
     set(LINUX TRUE)
 endif()
 
-if ("${CMAKE_GENERATOR}" MATCHES "^Visual Studio.*$")
-    set(MSVS TRUE)
-endif()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-    add_definitions(/bigobj)
-endif()
-
 # APPLE: Set CMAKE_OSX_SYSROOT if not set already.
 if (APPLE)
     execute_process(COMMAND sw_vers -productVersion
@@ -151,7 +143,7 @@ if (CMAKE_OSX_SYSROOT)
             )
 endif()
 
-if (NOT MSVS)
+if (NOT MSVC)
     if(NOT CMAKE_BUILD_TYPE)
         set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
     endif()
@@ -361,7 +353,16 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$" AND NOT NGRAPH_BUILD_DI
 endif()
 
 if (WIN32)
-    set(CMAKE_CXX_FLAGS "/W0 /EHsc /MP")
+    string(REPLACE "/W3" "/W0" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP")
+
+    if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+        # C4251 needs to have dll-interface to be used by clients of class
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251")
+        # C4275 non dll-interface class used as base for dll-interface class
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
+    endif()
 else()
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g")
     set(CMAKE_CXX_FLAGS_DEBUG  "-O0 -g")
@@ -461,36 +462,36 @@ if (NOT DEFINED NGRAPH_TBB_ENABLE)
     set(NGRAPH_TBB_ENABLE ${NGRAPH_CPU_ENABLE})
 endif()
 
-# Since UNIX and APPLE support Bash we can use a Bash script to do the clang-format functions
+# Since UNIX support Bash we can use a Bash script to do the clang-format functions
 # This is much faster than the cmake method
-if (UNIX OR APPLE)
+if (UNIX)
     add_custom_target(style-check COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/maint/check-code-format.sh)
     add_custom_target(style-apply COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/maint/apply-code-format.sh)
     add_custom_target(style COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/maint/apply-code-format.sh)
 else()
     add_custom_target(style-check
         COMMAND ${CMAKE_COMMAND}
-        -DNGRAPH_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
-        -P ${CMAKE_MODULE_PATH}style_check.cmake
+        -DNGRAPH_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/style_check.cmake
     )
 
     add_custom_target(style-apply
         COMMAND ${CMAKE_COMMAND}
-        -DNGRAPH_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
-        -P ${CMAKE_MODULE_PATH}style_apply.cmake
+        -DNGRAPH_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/style_apply.cmake
     )
 
     add_custom_target(style
         COMMAND ${CMAKE_COMMAND}
-        -DNGRAPH_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
-        -P ${CMAKE_MODULE_PATH}style_apply.cmake
+        -DNGRAPH_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/style_apply.cmake
     )
 endif()
 
 add_custom_target(fix-mode
     COMMAND ${CMAKE_COMMAND}
-    -DNGRAPH_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
-    -P ${CMAKE_MODULE_PATH}fix_mode.cmake
+    -DNGRAPH_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/fix_mode.cmake
 )
 
 #-----------------------------------------------------------------------------------------------
@@ -545,13 +546,13 @@ if(NOT DEFINED EXTERNAL_PROJECTS_ROOT)
 endif()
 
 if (NGRAPH_ONNX_IMPORT_ENABLE)
-    if (MSVS)
+    if (MSVC)
         # When we build dll libraries. These flags make sure onnx and protobuf build with /MD, not /MT.
         # These two options can't be mixed, because they requires link two imcompatiable runtime.
         set(ONNX_USE_MSVC_STATIC_RUNTIME OFF)
         set(protobuf_WITH_ZLIB  OFF CACHE BOOL "" FORCE)
         set(protobuf_MSVC_STATIC_RUNTIME OFF CACHE BOOL "Link protobuf to static runtime libraries" FORCE)
-    endif(MSVS)
+    endif()
     if (NOT NGRAPH_USE_SYSTEM_PROTOBUF)
         include(cmake/external_protobuf.cmake)
     else()
@@ -591,7 +592,7 @@ endif()
 if(NGRAPH_CODEGEN_ENABLE)
     if (NGRAPH_USE_PREBUILT_LLVM OR DEFINED LLVM_TARBALL_URL)
         include(cmake/external_llvm_prebuilt.cmake)
-    elseif (NOT MSVS)
+    elseif (NOT MSVC)
         include(cmake/external_llvm.cmake)
     else()
         message(FATAL_ERROR "CODEGEN is not supported on Windows!")
 
@@ -16,7 +16,8 @@
 
 function(MODE_APPLY_FILE PATH)
     execute_process(COMMAND git update-index --add --chmod=-x ${PATH}
-        OUTPUT_VARIABLE RESULT)
+        OUTPUT_VARIABLE RESULT
+        ERROR_QUIET)
 endfunction()
 
 set(DIRECTORIES_OF_INTEREST
 
@@ -35,6 +35,12 @@ if(WIN32)
     )
 endif()
 
+if(CMAKE_BUILD_TYPE)
+    list(APPEND GTEST_CMAKE_ARGS
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    )
+endif()
+
 if(UNIX)
     # workaround for compile error
     # related: https://github.com/intel/mkl-dnn/issues/55
@@ -43,6 +49,17 @@ else()
     set(GTEST_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 endif()
 
+#Build for ninja
+if(UNIX)
+    SET(GTEST_PATHS ${CMAKE_BINARY_DIR}/ngraph/gtest/build/googlemock/gtest/libgtest.a
+            ${CMAKE_BINARY_DIR}/ngraph/gtest/build/googlemock/libgmock.a)
+else()
+    SET(GTEST_PATHS ${CMAKE_BINARY_DIR}/ngraph/gtest/build/googlemock/gtest/gtest.lib
+            ${CMAKE_BINARY_DIR}/ngraph/gtest/build/googlemock/gtest/gmock.lib
+            ${CMAKE_BINARY_DIR}/ngraph/gtest/build/googlemock/gtest/gtestd.lib
+            ${CMAKE_BINARY_DIR}/ngraph/gtest/build/googlemock/gtest/gmockd.lib)
+endif()
+
 ExternalProject_Add(
     ext_gtest
     PREFIX gtest
@@ -60,6 +77,7 @@ ExternalProject_Add(
         ${GTEST_CMAKE_ARGS}
     BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/build"
     EXCLUDE_FROM_ALL TRUE
+    BUILD_BYPRODUCTS ${GTEST_PATHS}
     )
 
 #------------------------------------------------------------------------------
 
@@ -20,8 +20,8 @@ set(MLIR_LLVM_REPO_URL https://github.com/llvm/llvm-project.git)
 set(MLIR_REPO_URL https://github.com/tensorflow/mlir.git)
 
 # Change these commit IDs to move to latest stable versions
-set(MLIR_LLVM_COMMIT_ID 0845ac7331e)
-set(MLIR_COMMIT_ID 1f7893e0)
+set(MLIR_LLVM_COMMIT_ID e0f1d9d8729)
+set(MLIR_COMMIT_ID c61db4bb)
 
 # MLIR environment variables. Some of them are used by LIT tool.
 set(MLIR_PROJECT_ROOT ${CMAKE_CURRENT_BINARY_DIR}/mlir_project)
 
@@ -23,7 +23,12 @@ include(ExternalProject)
 
 # This version of PROTOBUF is required by Microsoft ONNX Runtime.
 set(NGRAPH_PROTOBUF_GIT_REPO_URL "https://github.com/protocolbuffers/protobuf")
-set(NGRAPH_PROTOBUF_GIT_TAG "v3.5.2")
+
+if(NGRAPH_ONNX_IMPORT_ENABLE)
+    set(NGRAPH_PROTOBUF_GIT_TAG "v3.5.2")
+else()
+    set(NGRAPH_PROTOBUF_GIT_TAG "v3.6.1")
+endif()
 
 if (WIN32)
     ExternalProject_Add(
@@ -103,14 +108,32 @@ if (WIN32)
 else()
     set(Protobuf_LIBRARY ${Protobuf_INSTALL_PREFIX}/lib/libprotobuf.a)
 endif()
-set(Protobuf_LIBRARIES ${Protobuf_LIBRARY})
 
-if (NOT TARGET protobuf::libprotobuf)
-    add_library(protobuf::libprotobuf UNKNOWN IMPORTED)
-    set_target_properties(protobuf::libprotobuf PROPERTIES
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}"
-        IMPORTED_LOCATION "${Protobuf_LIBRARY}")
-    add_dependencies(protobuf::libprotobuf ext_protobuf)
+if(NGRAPH_ONNX_IMPORT_ENABLE)
+    if (NOT TARGET libprotobuf)
+        add_library(libprotobuf INTERFACE)
+        if (WIN32)
+            target_link_libraries(libprotobuf INTERFACE
+                debug ${Protobuf_INSTALL_PREFIX}/lib/libprotobufd.lib
+                optimized ${Protobuf_INSTALL_PREFIX}/lib/libprotobuf.lib)
+        else()
+            target_link_libraries(libprotobuf INTERFACE
+                ${Protobuf_INSTALL_PREFIX}/lib/libprotobuf.a)
+        endif()
+        set_target_properties(libprotobuf PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}")
+        add_dependencies(libprotobuf ext_protobuf)
+    endif()
+    set(Protobuf_LIBRARIES libprotobuf)
+else()
+    if (NOT TARGET protobuf::libprotobuf)
+        add_library(protobuf::libprotobuf UNKNOWN IMPORTED)
+        set_target_properties(protobuf::libprotobuf PROPERTIES
+            INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}"
+            IMPORTED_LOCATION "${Protobuf_LIBRARY}")
+        add_dependencies(protobuf::libprotobuf ext_protobuf)
+    endif()
+    set(Protobuf_LIBRARIES protobuf::libprotobuf)
 endif()
 
 if (NOT TARGET protobuf::protoc)
 
@@ -0,0 +1,68 @@
+//*****************************************************************************
+// Copyright 2017-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.
+//*****************************************************************************
+
+#include <iostream>
+
+#include <ngraph/ngraph.hpp>
+
+using namespace ngraph;
+
+int main()
+{
+    // Create and compile a graph where the provided info of shape of x is
+    // (2,?)
+    auto x_shape_info = PartialShape{2, Dimension::dynamic()};
+    auto x = make_shared<op::Parameter>(element::i32, x_shape_info);
+    auto a = x + x;
+    auto f = make_shared<Function>({a}, {x});
+    auto be = runtime::backend::create();
+    auto ex = be->compile(f);
+
+    // Create a dynamic tensor of shape (2,?)
+    auto t_out = be->create_dynamic_tensor(element::i32, x_shape_info);
+
+    // Call the graph to write a value with shape (2,3) to t_out
+    auto t_in = be->create_tensor(element::i32, Shape{2, 3});
+    t_in->write();
+    ex->call({t_out}, {t_in})
+
+        // Call the graph again, to write a value with a different shape to
+        // t_out.
+        t_in = be->create_tensor(element::i32, Shape{2, 20});
+    t_in->write();
+    ex->call({t_out}, {t_in})
+
+        // Get the result. At this point t_out->get_shape() would return
+        // Shape{2,20},
+        // but t_out->get_partial_shape() would return "(2,?)"
+
+        float r[2][3];
+    t_result->read(&r, 0, sizeof(r));
+
+    std::cout << "[" << std::endl;
+    for (size_t i = 0; i < s[0]; ++i)
+    {
+        std::cout << " [";
+        for (size_t j = 0; j < s[1]; ++j)
+        {
+            std::cout << r[i][j] << ' ';
+        }
+        std::cout << ']' << std::endl;
+    }
+    std::cout << ']' << std::endl;
+
+    return 0;
+}
@@ -38,7 +38,9 @@
     <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
   {% endif %}
 
-<link href="https://fonts.googleapis.com/css?family=Nunito:300,300i,400&display=swap&subset=latin-ext" rel="stylesheet"> 
+<!-- <link href="https://fonts.googleapis.com/css?family=Nunito:300,300i,400&display=swap&subset=latin-ext" rel="stylesheet"> -->
+<link href="https://fonts.googleapis.com/css?family=Nunito+Sans:300,400,600,700,800,900" rel="stylesheet">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">  
 
   {% for cssfile in css_files %}
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
@@ -84,14 +86,13 @@
 
 <body> 
   <div id="menu-float" class="menu-float">
-    <a href="https://www.ngraph.ai" target="_blank">Home</a>
-    <a href="https://www.youtube.com/embed/C9S0nmNS8bQ" target="_blank">Video</a>
-    <a href="https://www.ngraph.ai/ecosystem" target="_blank">Ecosystem</a>
-    <a href="https://ngraph.nervanasys.com/docs/latest">Docs</a>
-    <a href="https://www.ngraph.ai/tutorials">Tutorials</a>
-    <a href="https://ngraph.slack.com/"><img src="https://cdn.brandfolder.io/5H442O3W/as/pl546j-7le8zk-5h439l/Slack_Mark_Monochrome_White.png?width=35&height=35"></a>
+    <a href="https://www.ngraph.ai" target="_blank"><i class="fa fa-home"></i></a>
+    <a href="https://ngraph.nervanasys.com/docs/latest" title="Documentation Home"><i class="fa fa-book"></i></a>
+    <a href="https://www.ngraph.ai/tutorials" title="Tutorials"><i class="fa fa-user-circle"></i></a>
+    <a href="https://www.youtube.com/embed/C9S0nmNS8bQ" target="_blank"><i class="fa fa-video-camera"></i></a>
+    <a href="https://ngraph.slack.com/" title="nGraph Slack Channel"><i class="fa fa-slack"></i></a>
     <a href="https://github.com/NervanaSystems/ngraph/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg"></a>
-    <a href="https://www.github.com/NervanaSystems/ngraph"><img src="https://travis-ci.org/NervanaSystems/ngraph.svg?branch=master"></a>&nbsp;&nbsp;&nbsp;</div></body>
+    <a href="https://www.github.com/NervanaSystems/ngraph"><img src="https://travis-ci.org/NervanaSystems/ngraph.svg?branch=master"></a></div></body>
 
 
 <body class="wy-body-for-nav" role="document">
 
@@ -2,16 +2,15 @@
     <span class="rst-current-version" data-toggle="rst-current-version">
       <span class="docvs">nGraph Compiler stack</span>
       v: {{ version }}
-      <span class="▼"></span>
+      <span></span>
     </span>
     <div class="rst-other-versions">
       <dl>
-        <dt>{{ _('Recent Versions') }}</dt>
+        <dt>{{ _('Recent Versions') }}<i class="fa fa-terminal"></i></dt>
         <dd><!-- Until our https://docs.ngraph.ai/ publishing is set up, we link to GitHub -->  
           <ul>
-           <!-- <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.26">0.26</a></li> -->
-           <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.26.0-rc.3">Prerelease 0.26</a></li>
-           <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.25.1-rc.4">0.25.1</a></li>
+           <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.26.0">0.26.0</a></li>
+           <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.25.1-rc.10">0.25.1</a></li>
            <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.25.0">0.25.0</a></li>
            <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.24.0">0.24.0</a></li>
            <li><a href="https://github.com/NervanaSystems/ngraph/releases/tag/v0.22.2-rc.0">0.22.2</a></li>