From 39eda69417af1bbd8c0ff68b3b09c6913dca581a Mon Sep 17 00:00:00 2001 From: Alexandr-Solovev Date: Fri, 15 Nov 2024 02:28:49 -0800 Subject: [PATCH 1/2] fix --- deploy/local/vars_lnx.sh | 5 +++-- deploy/local/vars_win.bat | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy/local/vars_lnx.sh b/deploy/local/vars_lnx.sh index b3b5bbc149c..00dc75bfd7b 100644 --- a/deploy/local/vars_lnx.sh +++ b/deploy/local/vars_lnx.sh @@ -247,11 +247,12 @@ if [ "$(basename "${my_script_path}")" = "env" ] ; then # assume stand-alone export DALROOT="$__daal_tmp_dir" export PKG_CONFIG_PATH="$__daal_tmp_dir/lib/pkgconfig${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}" export CMAKE_PREFIX_PATH="$__daal_tmp_dir${CMAKE_PREFIX_PATH+:${CMAKE_PREFIX_PATH}}" - export CPATH="$__daal_tmp_dir/include${CPATH+:${CPATH}}" if [ -d "${component_root}/include/dal" ]; then + export CPATH="$__daal_tmp_dir/include/dal${CPATH+:${CPATH}}" export LIBRARY_PATH="$__daal_tmp_dir/lib${LIBRARY_PATH+:${LIBRARY_PATH}}" export LD_LIBRARY_PATH="$__daal_tmp_dir/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" else + export CPATH="$__daal_tmp_dir/include${CPATH+:${CPATH}}" export LIBRARY_PATH="$__daal_tmp_dir/lib/$ARCH_DIR_ONEDAL${LIBRARY_PATH+:${LIBRARY_PATH}}" export LD_LIBRARY_PATH="$__daal_tmp_dir/lib/$ARCH_DIR_ONEDAL${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" fi @@ -277,7 +278,7 @@ else # must be a consolidated layout # *"etc"*) export DALROOT="$ONEAPI_ROOT" - export CPATH="$ONEAPI_ROOT/include${CPATH+:${CPATH}}" + export CPATH="$ONEAPI_ROOT/include/dal${CPATH+:${CPATH}}" # ;; # esac fi diff --git a/deploy/local/vars_win.bat b/deploy/local/vars_win.bat index ddc0035719e..369bd549666 100644 --- a/deploy/local/vars_win.bat +++ b/deploy/local/vars_win.bat @@ -35,7 +35,7 @@ if "%SCRIPT_PATH%"=="%DAAL%\env\" ( ) else ( set "DALROOT=%ONEAPI_ROOT%" set "INCLUDE=%ONEAPI_ROOT%\include\dal;%INCLUDE%" - set "CPATH=%ONEAPI_ROOT%\include;%CPATH%" + set "CPATH=%ONEAPI_ROOT%\include\dal;%CPATH%" goto :GoodArgs2024 ) @@ -53,14 +53,15 @@ exit /b 0 :GoodArgs set "DALROOT=%DAAL%" -set "CPATH=%DAAL%\include;%CPATH%" if exist "%DAAL%\include\dal" ( set "INCLUDE=%DAAL%\include\dal;%INCLUDE%" + set "CPATH=%DAAL%\include\dal;%CPATH%" set "LIB=%DAAL%\lib;%LIB%" set "CLASSPATH=%DAAL%\share\java\onedal.jar;%CLASSPATH%" set "PATH=%DAAL%\bin;%PATH%" ) else ( set "INCLUDE=%DAAL%\include;%INCLUDE%" + set "CPATH=%DAAL%\include;%CPATH%" set "LIB=%DAAL%\lib\%DAAL_IA%;%LIB%" set "CLASSPATH=%DAAL%\lib\onedal.jar;%CLASSPATH%" if exist "%DAAL_UP_OLD%\redist" ( From 577baafacbb95e99f73e16ba31c0c989cfccfaf1 Mon Sep 17 00:00:00 2001 From: Alexandr-Solovev Date: Fri, 15 Nov 2024 07:04:45 -0800 Subject: [PATCH 2/2] upd paths --- deploy/local/vars_lnx.sh | 5 ++--- deploy/local/vars_win.bat | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/deploy/local/vars_lnx.sh b/deploy/local/vars_lnx.sh index 00dc75bfd7b..24a443637a1 100644 --- a/deploy/local/vars_lnx.sh +++ b/deploy/local/vars_lnx.sh @@ -247,12 +247,11 @@ if [ "$(basename "${my_script_path}")" = "env" ] ; then # assume stand-alone export DALROOT="$__daal_tmp_dir" export PKG_CONFIG_PATH="$__daal_tmp_dir/lib/pkgconfig${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}" export CMAKE_PREFIX_PATH="$__daal_tmp_dir${CMAKE_PREFIX_PATH+:${CMAKE_PREFIX_PATH}}" + export CPATH="$__daal_tmp_dir/include:$__daal_tmp_dir/include/dal${CPATH+:${CPATH}}" if [ -d "${component_root}/include/dal" ]; then - export CPATH="$__daal_tmp_dir/include/dal${CPATH+:${CPATH}}" export LIBRARY_PATH="$__daal_tmp_dir/lib${LIBRARY_PATH+:${LIBRARY_PATH}}" export LD_LIBRARY_PATH="$__daal_tmp_dir/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" else - export CPATH="$__daal_tmp_dir/include${CPATH+:${CPATH}}" export LIBRARY_PATH="$__daal_tmp_dir/lib/$ARCH_DIR_ONEDAL${LIBRARY_PATH+:${LIBRARY_PATH}}" export LD_LIBRARY_PATH="$__daal_tmp_dir/lib/$ARCH_DIR_ONEDAL${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" fi @@ -278,7 +277,7 @@ else # must be a consolidated layout # *"etc"*) export DALROOT="$ONEAPI_ROOT" - export CPATH="$ONEAPI_ROOT/include/dal${CPATH+:${CPATH}}" + export CPATH="$ONEAPI_ROOT/include:$ONEAPI_ROOT/include/dal${CPATH+:${CPATH}}" # ;; # esac fi diff --git a/deploy/local/vars_win.bat b/deploy/local/vars_win.bat index 369bd549666..3666a72f5a9 100644 --- a/deploy/local/vars_win.bat +++ b/deploy/local/vars_win.bat @@ -35,7 +35,7 @@ if "%SCRIPT_PATH%"=="%DAAL%\env\" ( ) else ( set "DALROOT=%ONEAPI_ROOT%" set "INCLUDE=%ONEAPI_ROOT%\include\dal;%INCLUDE%" - set "CPATH=%ONEAPI_ROOT%\include\dal;%CPATH%" + set "CPATH=%ONEAPI_ROOT%\include;%ONEAPI_ROOT%\include\dal;%CPATH%" goto :GoodArgs2024 ) @@ -53,15 +53,14 @@ exit /b 0 :GoodArgs set "DALROOT=%DAAL%" +set "CPATH=%DAAL%\include;%DAAL%\include\dal;%CPATH%" if exist "%DAAL%\include\dal" ( set "INCLUDE=%DAAL%\include\dal;%INCLUDE%" - set "CPATH=%DAAL%\include\dal;%CPATH%" set "LIB=%DAAL%\lib;%LIB%" set "CLASSPATH=%DAAL%\share\java\onedal.jar;%CLASSPATH%" set "PATH=%DAAL%\bin;%PATH%" ) else ( set "INCLUDE=%DAAL%\include;%INCLUDE%" - set "CPATH=%DAAL%\include;%CPATH%" set "LIB=%DAAL%\lib\%DAAL_IA%;%LIB%" set "CLASSPATH=%DAAL%\lib\onedal.jar;%CLASSPATH%" if exist "%DAAL_UP_OLD%\redist" (