Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Set the correct CPATH for oneAPI toolkit #2979

Merged
merged 2 commits into from
Nov 15, 2024
+4 −4
Merged

fix: Set the correct CPATH for oneAPI toolkit #2979

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39eda69
fix
Alexandr-Solovev Nov 15, 2024
577baaf
upd paths
Alexandr-Solovev Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions deploy/local/vars_lnx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 3 additions & 2 deletions deploy/local/vars_win.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand All @@ -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" (
Expand Down
Loading