Sfoglia il codice sorgente

Add ability to skip oneapi generate

This follows the same pattern for cuda and rocm to allow
disabling the build even when we detect the dependent libraries
Daniel Hiltgen 11 mesi fa
parent
commit
ab8c929e20
2 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 1 1
      llm/generate/gen_linux.sh
  2. 1 1
      llm/generate/gen_windows.ps1

+ 1 - 1
llm/generate/gen_linux.sh

@@ -211,7 +211,7 @@ if [ -z "${ONEAPI_ROOT}" ]; then
     ONEAPI_ROOT=/opt/intel/oneapi
     ONEAPI_ROOT=/opt/intel/oneapi
 fi
 fi
 
 
-if [ -d "${ONEAPI_ROOT}" ]; then
+if [ -z "${OLLAMA_SKIP_ONEAPI_GENERATE}" -a -d "${ONEAPI_ROOT}" ]; then
     echo "OneAPI libraries detected - building dynamic OneAPI library"
     echo "OneAPI libraries detected - building dynamic OneAPI library"
     init_vars
     init_vars
     source ${ONEAPI_ROOT}/setvars.sh --force # set up environment variables for oneAPI
     source ${ONEAPI_ROOT}/setvars.sh --force # set up environment variables for oneAPI

+ 1 - 1
llm/generate/gen_windows.ps1

@@ -290,7 +290,7 @@ function build_cuda() {
 }
 }
 
 
 function build_oneapi() {
 function build_oneapi() {
-  if ((-not "${env:OLLAMA_SKIP_CUDA_GENERATE}") -and ("${env:ONEAPI_ROOT}"))  {
+  if ((-not "${env:OLLAMA_SKIP_ONEAPI_GENERATE}") -and ("${env:ONEAPI_ROOT}"))  {
     # Get oneAPI version
     # Get oneAPI version
     $script:ONEAPI_VERSION = icpx --version
     $script:ONEAPI_VERSION = icpx --version
     $script:ONEAPI_VERSION = [regex]::Match($script:ONEAPI_VERSION, '(?<=oneAPI DPC\+\+/C\+\+ Compiler )(?<version>\d+\.\d+\.\d+)').Value
     $script:ONEAPI_VERSION = [regex]::Match($script:ONEAPI_VERSION, '(?<=oneAPI DPC\+\+/C\+\+ Compiler )(?<version>\d+\.\d+\.\d+)').Value