Fboemer/ngtf v0.11.0 (#138)

* Fixed SEAL tag * ng-tf version to v0.11.0; added missing ops
NervanaSystems · Mar 4, 2019 · fc446f5 · fc446f5
1 parent cfd9712
commit fc446f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/cmake/ngraph-tf.cmake b/cmake/ngraph-tf.cmake
@@ -20,7 +20,7 @@ set(EXTERNAL_NGRAPH_INSTALL_DIR ${EXTERNAL_INSTALL_DIR})
 set(NGRAPH_TF_CMAKE_PREFIX ext_ngraph_tf)
 
 SET(NGRAPH_TF_REPO_URL https://github.com/NervanaSystems/ngraph-tf.git)
-SET(NGRAPH_TF_GIT_LABEL v0.10.0)
+SET(NGRAPH_TF_GIT_LABEL v0.11.0)
 
 SET(NGRAPH_TF_SRC_DIR ${CMAKE_BINARY_DIR}/${NGRAPH_TF_CMAKE_PREFIX}/src/${NGRAPH_TF_CMAKE_PREFIX})
 SET(NGRAPH_TF_BUILD_DIR ${NGRAPH_TF_SRC_DIR}/build)

diff --git a/cmake/seal.cmake b/cmake/seal.cmake
@@ -21,7 +21,7 @@ include(ExternalProject)
 set(SEAL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ext_seal)
 set(SEAL_SRC_DIR ${SEAL_PREFIX}/src/ext_seal/src)
 SET(SEAL_REPO_URL https://github.com/Microsoft/SEAL.git)
-SET(SEAL_GIT_TAG v3.1)
+SET(SEAL_GIT_TAG origin/3.1.0)
 set(SEAL_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
 set(SEAL_USE_CXX17 ON)
@@ -36,9 +36,8 @@ message("SEAL_USE_CXX17 ${SEAL_USE_CXX17}")
 ExternalProject_Add(
    ext_seal
    GIT_REPOSITORY ${SEAL_REPO_URL}
-   GIT_TAG ${SEAL_GIT_LABEL}
+   GIT_TAG ${SEAL_GIT_TAG}
    PREFIX ${SEAL_PREFIX}
-   UPDATE_COMMAND ""
    CONFIGURE_COMMAND cmake ${SEAL_SRC_DIR}
    -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_DIR}
    -DCMAKE_CXX_FLAGS=${SEAL_CXX_FLAGS}

diff --git a/src/he_backend.cpp b/src/he_backend.cpp
@@ -987,6 +987,13 @@ void runtime::he::HEBackend::generate_calls(
     case OP_TYPEID::Power:
     case OP_TYPEID::Product:
     case OP_TYPEID::Quantize:
+    case OP_TYPEID::QuantizedAvgPool:
+    case OP_TYPEID::QuantizedConvolutionBias:
+    case OP_TYPEID::QuantizedConvolutionBiasAdd:
+    case OP_TYPEID::QuantizedConvolutionBiasSignedAdd:
+    case OP_TYPEID::QuantizedConvolutionRelu:
+    case OP_TYPEID::QuantizedConvolution:
+    case OP_TYPEID::QuantizedMaxPool:
     case OP_TYPEID::Relu:
     case OP_TYPEID::ReluBackprop:
     case OP_TYPEID::ReplaceSlice:
@@ -1005,10 +1012,7 @@ void runtime::he::HEBackend::generate_calls(
     case OP_TYPEID::Tanh:
     case OP_TYPEID::TopK:
     default:
-      NGRAPH_INFO << "Supposedly unsupported op";
-      NGRAPH_INFO << "node.get_friendly_name() " << node.get_friendly_name();
-      NGRAPH_INFO << "node.get_name() " << node.get_name();
-// throw unsupported_op("Unsupported op '" + node.description() + "'");
+      throw unsupported_op("Unsupported op '" + node.description() + "'");
 #pragma GCC diagnostic pop
   }
 }