Remove code designed to support the Ninja cmake generator (#2241)

* update build byproducts to support ninja

* remove unused cmake code

* more cmake cleanup

* display error message if Ninja generator is requested

* fix mkldnn ext project

* revert onnx cmake file

* revert protobuf cmake file

* revert mlsl cmake file

* more fixing

CMakeLists.txt

@@ -20,6 +20,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
     message(FATAL_ERROR "In-source builds are not allowed.")
 endif()
 
+if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+    message(FATAL_ERROR "Ninja generator not supported.")
+endif()
+
 include(cmake/Modules/git_tags.cmake)
 
 NGRAPH_GET_VERSION_LABEL()

cmake/external_eigen.cmake

@@ -24,45 +24,17 @@ set(EIGEN_GIT_URL https://github.com/NervanaSystems/eigen)
 # Download Eigen
 #------------------------------------------------------------------------------
 
-# The 'BUILD_BYPRODUCTS' argument was introduced in CMake 3.2.
-if (${CMAKE_VERSION} VERSION_LESS 3.2)
-    ExternalProject_Add(
-        ext_eigen
-        PREFIX eigen
-        GIT_REPOSITORY ${EIGEN_GIT_URL}
-        GIT_TAG ${EIGEN_GIT_TAG}
-        UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-        TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/tmp"
-        STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/stamp"
-        DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/download"
-        SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/src"
-        BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/build"
-        INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen"
-        EXCLUDE_FROM_ALL TRUE
-        )
-else()
-    ExternalProject_Add(
-        ext_eigen
-        PREFIX eigen
-        GIT_REPOSITORY ${EIGEN_GIT_URL}
-        GIT_TAG ${EIGEN_GIT_TAG}
-        UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-        TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/tmp"
-        STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/stamp"
-        DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/download"
-        SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/src"
-        BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen/build"
-        INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/eigen"
-        BUILD_BYPRODUCTS "${EXTERNAL_PROJECTS_ROOT}/eigen/src/Eigen/Core"
-        EXCLUDE_FROM_ALL TRUE
-        )
-endif()
+ExternalProject_Add(
+    ext_eigen
+    PREFIX eigen
+    GIT_REPOSITORY ${EIGEN_GIT_URL}
+    GIT_TAG ${EIGEN_GIT_TAG}
+    UPDATE_COMMAND ""
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    EXCLUDE_FROM_ALL TRUE
+    )
 
 #------------------------------------------------------------------------------
 

cmake/external_gtest.cmake

@@ -46,45 +46,18 @@ if(WIN32)
     )
 endif()
 
-# The 'BUILD_BYPRODUCTS' argument was introduced in CMake 3.2.
-if (${CMAKE_VERSION} VERSION_LESS 3.2)
-    ExternalProject_Add(
-        ext_gtest
-        PREFIX gtest
-        GIT_REPOSITORY ${GTEST_GIT_REPO_URL}
-        GIT_TAG ${GTEST_GIT_LABEL}
-        # Disable install step
-        INSTALL_COMMAND ""
-        UPDATE_COMMAND ""
-        CMAKE_ARGS ${GTEST_CMAKE_ARGS}
-        TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/tmp"
-        STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/stamp"
-        DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/download"
-        SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/src"
-        BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/build"
-        INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest"
-        EXCLUDE_FROM_ALL TRUE
-        )
-else()
-    ExternalProject_Add(
-        ext_gtest
-        PREFIX gtest
-        GIT_REPOSITORY ${GTEST_GIT_REPO_URL}
-        GIT_TAG ${GTEST_GIT_LABEL}
-        # Disable install step
-        INSTALL_COMMAND ""
-        UPDATE_COMMAND ""
-        CMAKE_ARGS ${GTEST_CMAKE_ARGS}
-        TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/tmp"
-        STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/stamp"
-        DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/download"
-        SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/src"
-        BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/build"
-        INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest"
-        BUILD_BYPRODUCTS "${EXTERNAL_PROJECTS_ROOT}/gtest/build/googlemock/gtest/libgtest.a"
-        EXCLUDE_FROM_ALL TRUE
-        )
-endif()
+ExternalProject_Add(
+    ext_gtest
+    PREFIX gtest
+    GIT_REPOSITORY ${GTEST_GIT_REPO_URL}
+    GIT_TAG ${GTEST_GIT_LABEL}
+    # Disable install step
+    INSTALL_COMMAND ""
+    UPDATE_COMMAND ""
+    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
+    BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/gtest/build"
+    EXCLUDE_FROM_ALL TRUE
+    )
 
 #------------------------------------------------------------------------------
 

cmake/external_halide.cmake

@@ -57,56 +57,50 @@ ExternalProject_Add(
     -DWITH_TUTORIALS=OFF
     -DWITH_TESTS=OFF
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-    TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/halide/tmp"
-    STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/halide/stamp"
-    DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/halide/download"
-    SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/halide/src"
-    BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/halide/build"
-    INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/halide"
     EXCLUDE_FROM_ALL TRUE
     )
 
 # Not sure if all of these are used by Halide but we can trim it down later
 # if needed
 set(HALIDE_LLVM_LINK_LIBS
-    ${SOURCE_DIR}/lib/libLLVMX86AsmParser.a
-    ${SOURCE_DIR}/lib/libLLVMX86CodeGen.a
-    ${SOURCE_DIR}/lib/libLLVMGlobalISel.a
-    ${SOURCE_DIR}/lib/libLLVMSelectionDAG.a
-    ${SOURCE_DIR}/lib/libLLVMAsmPrinter.a
-    ${SOURCE_DIR}/lib/libLLVMDebugInfoCodeView.a
-    ${SOURCE_DIR}/lib/libLLVMX86Desc.a
-    ${SOURCE_DIR}/lib/libLLVMMCDisassembler.a
-    ${SOURCE_DIR}/lib/libLLVMX86Info.a
-    ${SOURCE_DIR}/lib/libLLVMX86AsmPrinter.a
-    ${SOURCE_DIR}/lib/libLLVMX86Utils.a
-    ${SOURCE_DIR}/lib/libLLVMMCJIT.a
-    ${SOURCE_DIR}/lib/libLLVMLineEditor.a
-    ${SOURCE_DIR}/lib/libLLVMInterpreter.a
-    ${SOURCE_DIR}/lib/libLLVMExecutionEngine.a
-    ${SOURCE_DIR}/lib/libLLVMRuntimeDyld.a
-    ${SOURCE_DIR}/lib/libLLVMCodeGen.a
-    ${SOURCE_DIR}/lib/libLLVMTarget.a
-    ${SOURCE_DIR}/lib/libLLVMCoroutines.a
-    ${SOURCE_DIR}/lib/libLLVMipo.a
-    ${SOURCE_DIR}/lib/libLLVMInstrumentation.a
-    ${SOURCE_DIR}/lib/libLLVMVectorize.a
-    ${SOURCE_DIR}/lib/libLLVMScalarOpts.a
-    ${SOURCE_DIR}/lib/libLLVMLinker.a
-    ${SOURCE_DIR}/lib/libLLVMIRReader.a
-    ${SOURCE_DIR}/lib/libLLVMAsmParser.a
-    ${SOURCE_DIR}/lib/libLLVMInstCombine.a
-    ${SOURCE_DIR}/lib/libLLVMTransformUtils.a
-    ${SOURCE_DIR}/lib/libLLVMBitWriter.a
-    ${SOURCE_DIR}/lib/libLLVMAnalysis.a
-    ${SOURCE_DIR}/lib/libLLVMProfileData.a
-    ${SOURCE_DIR}/lib/libLLVMObject.a
-    ${SOURCE_DIR}/lib/libLLVMMCParser.a
-    ${SOURCE_DIR}/lib/libLLVMMC.a
-    ${SOURCE_DIR}/lib/libLLVMBitReader.a
-    ${SOURCE_DIR}/lib/libLLVMCore.a
-    ${SOURCE_DIR}/lib/libLLVMBinaryFormat.a
-    ${SOURCE_DIR}/lib/libLLVMSupport.a
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMX86AsmParser${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMX86CodeGen${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMGlobalISel${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMSelectionDAG${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMAsmPrinter${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMDebugInfoCodeView${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMX86Desc${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMMCDisassembler${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMX86Info${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMX86AsmPrinter${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMX86Utils${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMMCJIT${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMLineEditor${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMInterpreter${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMExecutionEngine${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMRuntimeDyld${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMCodeGen${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMTarget${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMCoroutines${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMipo${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMInstrumentation${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMVectorize${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMScalarOpts${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMLinker${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMIRReader${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMAsmParser${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMInstCombine${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMTransformUtils${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMBitWriter${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMAnalysis${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMProfileData${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMObject${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMMCParser${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMMC${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMBitReader${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMCore${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMBinaryFormat${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${SOURCE_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMSupport${CMAKE_STATIC_LIBRARY_SUFFIX}
 )
 
 add_library(libhalidellvm INTERFACE)

cmake/external_llvm.cmake

@@ -30,12 +30,6 @@ ExternalProject_Add(
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     UPDATE_COMMAND ""
-    TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/clang/tmp"
-    STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/clang/stamp"
-    DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/clang/download"
-    SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/clang/src"
-    BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/clang/build"
-    INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/clang"
     EXCLUDE_FROM_ALL TRUE
 )
 
@@ -50,12 +44,6 @@ ExternalProject_Add(
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     UPDATE_COMMAND ""
-    TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/openmp/tmp"
-    STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/openmp/stamp"
-    DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/openmp/download"
-    SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/openmp/src"
-    BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/openmp/build"
-    INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/openmp"
     EXCLUDE_FROM_ALL TRUE
 )
 
@@ -87,13 +75,6 @@ ExternalProject_Add(
                 -DLLVM_EXTERNAL_CLANG_SOURCE_DIR=${CLANG_SOURCE_DIR}
                 -DLLVM_EXTERNAL_OPENMP_SOURCE_DIR=${OPENMP_SOURCE_DIR}
     UPDATE_COMMAND ""
-    TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/llvm/tmp"
-    STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/llvm/stamp"
-    DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/llvm/download"
-    SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/llvm/src"
-    BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/llvm/build"
-    INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/llvm"
-    BUILD_BYPRODUCTS ${EXTERNAL_PROJECTS_ROOT}/llvm/lib/libLLVMCore.a
     EXCLUDE_FROM_ALL TRUE
 )
 
@@ -175,6 +156,8 @@ set(LLVM_LINK_LIBS
     ${EXTERNAL_PROJECTS_ROOT}/llvm/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LLVMDemangle${CMAKE_STATIC_LIBRARY_SUFFIX}
 )
 
+ExternalProject_Get_Property(ext_llvm INSTALL_DIR)
+
 if(APPLE)
     set(LLVM_LINK_LIBS ${LLVM_LINK_LIBS} curses z m)
 else()

cmake/external_mkldnn.cmake

@@ -78,8 +78,10 @@ set(MKL_SOURCE_DIR ${source_dir})
 add_library(libmkl INTERFACE)
 add_dependencies(libmkl ext_mkl)
 foreach(LIB ${MKL_LIBS})
-    target_link_libraries(libmkl INTERFACE ${EXTERNAL_PROJECTS_ROOT}/mkldnn/lib/${LIB})
+    list(APPEND TMP_PATHS ${EXTERNAL_PROJECTS_ROOT}/mkldnn/lib/${LIB})
 endforeach()
+set(MKL_LIBS ${TMP_PATHS})
+target_link_libraries(libmkl INTERFACE ${MKL_LIBS})
 
 set(MKLDNN_GIT_REPO_URL https://github.com/intel/mkl-dnn)
 set(MKLDNN_GIT_TAG "830a100")
@@ -88,77 +90,41 @@ if(NGRAPH_LIB_VERSIONING_ENABLE)
 else()
     set(MKLDNN_PATCH_FILE mkldnn_no_so_link.patch)
 endif()
+set(MKLDNN_LIBS ${EXTERNAL_PROJECTS_ROOT}/mkldnn/lib/libmkldnn${CMAKE_SHARED_LIBRARY_SUFFIX})
 
-# The 'BUILD_BYPRODUCTS' argument was introduced in CMake 3.2.
-if(${CMAKE_VERSION} VERSION_LESS 3.2)
-    ExternalProject_Add(
-        ext_mkldnn
-        DEPENDS ext_mkl
-        GIT_REPOSITORY ${MKLDNN_GIT_REPO_URL}
-        GIT_TAG ${MKLDNN_GIT_TAG}
-        UPDATE_COMMAND ""
-        CONFIGURE_COMMAND
-        # Patch gets mad if it applied for a second time so:
-        #    --forward tells patch to ignore if it has already been applied
-        #    --reject-file tells patch to not right a reject file
-        #    || exit 0 changes the exit code for the PATCH_COMMAND to zero so it is not an error
-        # I don't like it, but it works
-        PATCH_COMMAND patch -p1 --forward --reject-file=- -i ${CMAKE_SOURCE_DIR}/cmake/${MKLDNN_PATCH_FILE} || exit 0
-        # Uncomment below with any in-flight MKL-DNN patches
-        # PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/third-party/patches/mkldnn-cmake-openmp.patch
-        CMAKE_ARGS
-            -DWITH_TEST=FALSE
-            -DWITH_EXAMPLE=FALSE
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-            -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-            -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-            -DCMAKE_INSTALL_PREFIX=${EXTERNAL_PROJECTS_ROOT}/mkldnn
-            -DMKLDNN_ENABLE_CONCURRENT_EXEC=ON
-            -DMKLROOT=${MKL_ROOT}
-            "-DARCH_OPT_FLAGS=-march=${NGRAPH_TARGET_ARCH} -mtune=${NGRAPH_TARGET_ARCH}"
-        TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/tmp"
-        STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/stamp"
-        DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/download"
-        SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/src"
-        BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/build"
-        INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn"
-        EXCLUDE_FROM_ALL TRUE
-        )
-else()
-    ExternalProject_Add(
-        ext_mkldnn
-        DEPENDS ext_mkl
-        GIT_REPOSITORY ${MKLDNN_GIT_REPO_URL}
-        GIT_TAG ${MKLDNN_GIT_TAG}
-        UPDATE_COMMAND ""
-        # Patch gets mad if it applied for a second time so:
-        #    --forward tells patch to ignore if it has already been applied
-        #    --reject-file tells patch to not right a reject file
-        #    || exit 0 changes the exit code for the PATCH_COMMAND to zero so it is not an error
-        # I don't like it, but it works
-        PATCH_COMMAND patch -p1 --forward --reject-file=- -i ${CMAKE_SOURCE_DIR}/cmake/${MKLDNN_PATCH_FILE} || exit 0
-        # Uncomment below with any in-flight MKL-DNN patches
-        # PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/third-party/patches/mkldnn-cmake-openmp.patch
-        CMAKE_ARGS
-            -DWITH_TEST=FALSE
-            -DWITH_EXAMPLE=FALSE
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-            -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-            -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-            -DCMAKE_INSTALL_PREFIX=${EXTERNAL_PROJECTS_ROOT}/mkldnn
-            -DMKLDNN_ENABLE_CONCURRENT_EXEC=ON
-            -DMKLROOT=${MKL_ROOT}
-            "-DARCH_OPT_FLAGS=-march=${NGRAPH_TARGET_ARCH} -mtune=${NGRAPH_TARGET_ARCH}"
-        TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/tmp"
-        STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/stamp"
-        DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/download"
-        SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/src"
-        BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/build"
-        INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn"
-        BUILD_BYPRODUCTS "${EXTERNAL_PROJECTS_ROOT}/mkldnn/include/mkldnn.hpp"
-        EXCLUDE_FROM_ALL TRUE
-        )
-endif()
+ExternalProject_Add(
+    ext_mkldnn
+    DEPENDS ext_mkl
+    GIT_REPOSITORY ${MKLDNN_GIT_REPO_URL}
+    GIT_TAG ${MKLDNN_GIT_TAG}
+    UPDATE_COMMAND ""
+    CONFIGURE_COMMAND
+    # Patch gets mad if it applied for a second time so:
+    #    --forward tells patch to ignore if it has already been applied
+    #    --reject-file tells patch to not right a reject file
+    #    || exit 0 changes the exit code for the PATCH_COMMAND to zero so it is not an error
+    # I don't like it, but it works
+    PATCH_COMMAND patch -p1 --forward --reject-file=- -i ${CMAKE_SOURCE_DIR}/cmake/${MKLDNN_PATCH_FILE} || exit 0
+    # Uncomment below with any in-flight MKL-DNN patches
+    # PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/third-party/patches/mkldnn-cmake-openmp.patch
+    CMAKE_ARGS
+        -DWITH_TEST=FALSE
+        -DWITH_EXAMPLE=FALSE
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        -DCMAKE_INSTALL_PREFIX=${EXTERNAL_PROJECTS_ROOT}/mkldnn
+        -DMKLDNN_ENABLE_CONCURRENT_EXEC=ON
+        -DMKLROOT=${MKL_ROOT}
+        "-DARCH_OPT_FLAGS=-march=${NGRAPH_TARGET_ARCH} -mtune=${NGRAPH_TARGET_ARCH}"
+    TMP_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/tmp"
+    STAMP_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/stamp"
+    DOWNLOAD_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/download"
+    SOURCE_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/src"
+    BINARY_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn/build"
+    INSTALL_DIR "${EXTERNAL_PROJECTS_ROOT}/mkldnn"
+    EXCLUDE_FROM_ALL TRUE
+    )
 
 ExternalProject_Add_Step(
     ext_mkldnn