From 946ed119c883e309739333d5c8c834841a761cd3 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 27 May 2020 13:06:20 +0300 Subject: [PATCH] [IE CMAKE] Fix OpenBLAS dependency handling for Yocto ARM64 platfrom (#562) Use `THIRDPARTY_SERVER_PATH` variable to override remote artifacts path. --- inference-engine/cmake/dependencies.cmake | 34 +++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake index 368adc8..b42b841 100644 --- a/inference-engine/cmake/dependencies.cmake +++ b/inference-engine/cmake/dependencies.cmake @@ -46,21 +46,33 @@ endif() ## enable cblas_gemm from OpenBLAS package if (ENABLE_MKL_DNN AND GEMM STREQUAL "OPENBLAS") if(AARCH64) - reset_deps_cache(OpenBLAS_DIR) + if(DEFINED ENV{THIRDPARTY_SERVER_PATH}) + set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}") + elseif(DEFINED THIRDPARTY_SERVER_PATH) + set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}") + else() + message(WARNING "OpenBLAS is not found!") + endif() - RESOLVE_DEPENDENCY(OpenBLAS - ARCHIVE_LIN "keembay/openblas_0.3.7_yocto_kmb.tar.xz" - TARGET_PATH "${TEMP}/openblas_0.3.7_yocto_kmb" - ENVIRONMENT "OpenBLAS_DIR") + if(DEFINED IE_PATH_TO_DEPS) + reset_deps_cache(OpenBLAS_DIR) + + RESOLVE_DEPENDENCY(OpenBLAS + ARCHIVE_LIN "keembay/openblas_0.3.7_yocto_kmb.tar.xz" + TARGET_PATH "${TEMP}/openblas_0.3.7_yocto_kmb" + ENVIRONMENT "OpenBLAS_DIR") - update_deps_cache(OpenBLAS_DIR "${OpenBLAS}/lib/cmake/openblas" "Path to OpenBLAS package folder") + update_deps_cache(OpenBLAS_DIR "${OpenBLAS}/lib/cmake/openblas" "Path to OpenBLAS package folder") - find_package(OpenBLAS QUIET) + find_package(OpenBLAS QUIET) - if(OpenBLAS_FOUND) - set(BLAS_FOUND TRUE) - set(BLAS_INCLUDE_DIRS ${OpenBLAS_INCLUDE_DIRS}) - set(BLAS_LIBRARIES ${OpenBLAS_LIBRARIES}) + if(OpenBLAS_FOUND) + set(BLAS_FOUND TRUE) + set(BLAS_INCLUDE_DIRS ${OpenBLAS_INCLUDE_DIRS}) + set(BLAS_LIBRARIES ${OpenBLAS_LIBRARIES}) + endif() + + unset(IE_PATH_TO_DEPS) endif() endif() -- 2.7.4