Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
Adjust layout to bin+lib/ollama
Daniel Hiltgen88bb9e332877
diff --git a/Dockerfile b/Dockerfileindex 99ba5b65c..d4b869180 100644--- a/Dockerfile+++ b/Dockerfile@@ -95,8 +95,8 @@ ARG AMDGPU_TARGETSENV GOARCH amd64RUN --mount=type=cache,target=/root/.ccache \OLLAMA_SKIP_STATIC_GENERATE=1 OLLAMA_SKIP_CPU_GENERATE=1 bash gen_linux.sh-RUN mkdir -p ../../dist/linux-amd64/ollama_libs && \- (cd /opt/rocm/lib && tar cf - rocblas/library) | (cd ../../dist/linux-amd64/ollama_libs && tar xf - )+RUN mkdir -p ../../dist/linux-amd64/lib/ollama && \+ (cd /opt/rocm/lib && tar cf - rocblas/library) | (cd ../../dist/linux-amd64/lib/ollama && tar xf - )FROM --platform=linux/amd64 centos:7 AS cpu-builder-amd64ARG CMAKE_VERSION@@ -160,7 +160,7 @@ COPY --from=rocm-build-amd64 /go/src/github.com/ollama/ollama/llm/build/linux/ lARG GOFLAGSARG CGO_CFLAGSRUN --mount=type=cache,target=/root/.ccache \- go build -trimpath -o dist/linux-amd64/ollama .+ go build -trimpath -o dist/linux-amd64/bin/ollama .# Intermediate stage used for ./scripts/build_linux.shFROM --platform=linux/arm64 cpu-build-arm64 AS build-arm64@@ -176,20 +176,29 @@ COPY --from=cuda-12-build-server-arm64 /go/src/github.com/ollama/ollama/llm/builARG GOFLAGSARG CGO_CFLAGSRUN --mount=type=cache,target=/root/.ccache \- go build -trimpath -o dist/linux-arm64/ollama .+ go build -trimpath -o dist/linux-arm64/bin/ollama .++# Strip out ROCm dependencies to keep the primary image lean+FROM --platform=linux/amd64 ubuntu:22.04 as amd64-libs-without-rocm+COPY --from=build-amd64 /go/src/github.com/ollama/ollama/dist/linux-amd64/lib/ /scratch/+RUN cd /scratch/ollama/ && rm -rf rocblas libamd* libdrm* libroc* libhip* libhsa*# Runtime stagesFROM --platform=linux/amd64 ubuntu:22.04 as runtime-amd64+COPY --from=amd64-libs-without-rocm /scratch/ /lib/RUN apt-get update && apt-get install -y ca-certificates-COPY --from=build-amd64 /go/src/github.com/ollama/ollama/dist/linux-amd64/ollama /bin/ollama+COPY --from=build-amd64 /go/src/github.com/ollama/ollama/dist/linux-amd64/bin/ /bin/+FROM --platform=linux/arm64 ubuntu:22.04 as runtime-arm64+COPY --from=build-arm64 /go/src/github.com/ollama/ollama/dist/linux-arm64/lib/ /lib/RUN apt-get update && apt-get install -y ca-certificates-COPY --from=build-arm64 /go/src/github.com/ollama/ollama/dist/linux-arm64/ollama /bin/ollama+COPY --from=build-arm64 /go/src/github.com/ollama/ollama/dist/linux-arm64/bin/ /bin/# Radeon images are much larger so we keep it distinct from the CPU/CUDA imageFROM --platform=linux/amd64 rocm/dev-centos-7:${ROCM_VERSION}-complete as runtime-rocmRUN update-pciids-COPY --from=build-amd64 /go/src/github.com/ollama/ollama/dist/linux-amd64/ollama /bin/ollama+COPY --from=build-amd64 /go/src/github.com/ollama/ollama/dist/linux-amd64/bin/ /bin/+RUN ln -s /opt/rocm/lib /lib/ollamaEXPOSE 11434ENV OLLAMA_HOST 0.0.0.0diff --git a/app/ollama.iss b/app/ollama.issindex e9cf48ec6..bce0a337e 100644--- a/app/ollama.iss+++ b/app/ollama.iss@@ -87,11 +87,11 @@ DialogFontSize=12[Files]Source: ".\app.exe"; DestDir: "{app}"; DestName: "{#MyAppExeName}" ; Flags: ignoreversion 64bit-Source: "..\ollama.exe"; DestDir: "{app}"; Flags: ignoreversion 64bit-Source: "..\dist\windows-{#ARCH}\ollama_runners\*"; DestDir: "{app}\ollama_runners"; Flags: ignoreversion 64bit recursesubdirs+Source: "..\ollama.exe"; DestDir: "{app}\bin"; Flags: ignoreversion 64bit+Source: "..\dist\windows-{#ARCH}\lib\ollama\runners\*"; DestDir: "{app}\lib\ollama\runners"; Flags: ignoreversion 64bit recursesubdirsSource: "..\dist\ollama_welcome.ps1"; DestDir: "{app}"; Flags: ignoreversionSource: ".\assets\app.ico"; DestDir: "{app}"; Flags: ignoreversion-Source: "..\dist\windows-amd64\ollama_libs\*"; DestDir: "{app}\ollama_libs\"; Flags: ignoreversion recursesubdirs+Source: "..\dist\windows-amd64\lib\ollama\*"; DestDir: "{app}\lib\ollama\"; Flags: ignoreversion recursesubdirs[Icons]Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\app.ico"@@ -99,7 +99,7 @@ Name: "{userstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilenName: "{userprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\app.ico"[Run]-Filename: "{cmd}"; Parameters: "/C set PATH={app};%PATH% & ""{app}\{#MyAppExeName}"""; Flags: postinstall nowait runhidden+Filename: "{cmd}"; Parameters: "/C set PATH={app}\bin;%PATH% & ""{app}\{#MyAppExeName}"""; Flags: postinstall nowait runhidden[UninstallRun]; Filename: "{cmd}"; Parameters: "/C ""taskkill /im ''{#MyAppExeName}'' /f /t"; Flags: runhidden@@ -134,8 +134,8 @@ SetupAppRunningError=Another Ollama installer is running.%n%nPlease cancel or fi[Registry]Root: HKCU; Subkey: "Environment"; \- ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; \- Check: NeedsAddPath('{app}')+ ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; \+ Check: NeedsAddPath('{app}\bin')[Code]diff --git a/docs/linux.md b/docs/linux.mdindex ec7306560..3ed2bed07 100644--- a/docs/linux.md+++ b/docs/linux.md@@ -20,13 +20,12 @@ GPU.## Manual install-### Download the `ollama` binary+### Download the `ollama` tar file-Ollama is distributed as a self-contained binary. Download it to a directory in your PATH:+Ollama is distributed as a tar file including GPU library dependencies.```bash-sudo curl -L https://ollama.com/download/ollama-linux-amd64 -o /usr/bin/ollama-sudo chmod +x /usr/bin/ollama+curl -fsSL https://ollama.com/download/ollama-linux-amd64.tgz | sudo tar -C /usr -zxf -```### Adding Ollama as a startup service (recommended)@@ -96,8 +95,7 @@ curl -fsSL https://ollama.com/install.sh | shOr by downloading the ollama binary:```bash-sudo curl -L https://ollama.com/download/ollama-linux-amd64 -o /usr/bin/ollama-sudo chmod +x /usr/bin/ollama+curl -fsSL https://ollama.com/download/ollama-linux-amd64.tgz | sudo tar -C /usr -zxf -```## Installing specific versionsdiff --git a/envconfig/config.go b/envconfig/config.goindex 7f0976c07..7e45a4f51 100644--- a/envconfig/config.go+++ b/envconfig/config.go@@ -174,7 +174,7 @@ func RunnersDir() (p string) {defer func() {if p == "" {- slog.Error("unable to locate llm runner directory. Set OLLAMA_RUNNERS_DIR to the location of 'ollama_runners'")+ slog.Error("unable to locate llm runner directory. Set OLLAMA_RUNNERS_DIR to the location of 'ollama/runners'")}}()@@ -190,7 +190,7 @@ func RunnersDir() (p string) {}var paths []string- for _, root := range []string{filepath.Dir(exe), cwd} {+ for _, root := range []string{filepath.Dir(exe), filepath.Join(filepath.Dir(exe), ".."), cwd} {paths = append(paths,root,filepath.Join(root, runtime.GOOS+"-"+runtime.GOARCH),@@ -200,7 +200,7 @@ func RunnersDir() (p string) {// Try a few variations to improve developer experience when building from source in the local treefor _, path := range paths {- candidate := filepath.Join(path, "ollama_runners")+ candidate := filepath.Join(path, "lib", "ollama", "runners")if _, err := os.Stat(candidate); err == nil {p = candidatebreakdiff --git a/gpu/amd_common.go b/gpu/amd_common.goindex 05747208f..72d204f77 100644--- a/gpu/amd_common.go+++ b/gpu/amd_common.go@@ -54,7 +54,7 @@ func commonAMDValidateLibDir() (string, error) {// Installer payload location if we're running the installed binaryexe, err := os.Executable()if err == nil {- rocmTargetDir := filepath.Join(filepath.Dir(exe), "ollama_libs")+ rocmTargetDir := filepath.Join(filepath.Dir(exe), "..", "lib", "ollama")if rocmLibUsable(rocmTargetDir) {slog.Debug("detected ROCM next to ollama executable " + rocmTargetDir)return rocmTargetDir, nildiff --git a/gpu/amd_windows.go b/gpu/amd_windows.goindex 5d25a966f..a0ae7c960 100644--- a/gpu/amd_windows.go+++ b/gpu/amd_windows.go@@ -153,7 +153,7 @@ func AMDValidateLibDir() (string, error) {// Installer payload (if we're running from some other location)localAppData := os.Getenv("LOCALAPPDATA")appDir := filepath.Join(localAppData, "Programs", "Ollama")- rocmTargetDir := filepath.Join(appDir, "ollama_libs")+ rocmTargetDir := filepath.Join(appDir, "..", "lib", "ollama")if rocmLibUsable(rocmTargetDir) {slog.Debug("detected ollama installed ROCm at " + rocmTargetDir)return rocmTargetDir, nildiff --git a/gpu/gpu.go b/gpu/gpu.goindex eb87807a7..391c98a86 100644--- a/gpu/gpu.go+++ b/gpu/gpu.go@@ -653,8 +653,8 @@ func GetDepDir() string {slog.Warn("failed to lookup working directory", "error", err)}// Scan for any of our dependeices, and pick first match- for _, root := range []string{filepath.Dir(appExe), cwd} {- libDep := "ollama_libs"+ for _, root := range []string{filepath.Dir(appExe), filepath.Join(filepath.Dir(appExe), ".."), cwd} {+ libDep := filepath.Join("lib", "ollama")if _, err := os.Stat(filepath.Join(root, libDep)); err == nil {return filepath.Join(root, libDep)}diff --git a/llm/generate/gen_linux.sh b/llm/generate/gen_linux.shindex dc9dda5a3..aef03f9a5 100755--- a/llm/generate/gen_linux.sh+++ b/llm/generate/gen_linux.sh@@ -189,7 +189,7 @@ if [ -z "${OLLAMA_SKIP_CUDA_GENERATE}" -a -d "${CUDA_LIB_DIR}" ]; thenCMAKE_DEFS="${COMMON_CMAKE_DEFS} ${CMAKE_DEFS} ${ARM64_DEFS} ${CMAKE_CUDA_DEFS} -DGGML_STATIC=off"BUILD_DIR="../build/linux/${ARCH}/cuda${CUDA_VARIANT}"export LLAMA_SERVER_LDFLAGS="-L${CUDA_LIB_DIR} -lcudart -lcublas -lcublasLt -lcuda"- CUDA_DIST_DIR="${CUDA_DIST_DIR:-${DIST_BASE}/ollama_libs}"+ CUDA_DIST_DIR="${CUDA_DIST_DIR:-${DIST_BASE}/lib/ollama}"buildinstallecho "Installing CUDA dependencies in ${CUDA_DIST_DIR}"@@ -213,7 +213,7 @@ if [ -z "${OLLAMA_SKIP_ONEAPI_GENERATE}" -a -d "${ONEAPI_ROOT}" ]; thenCC=icxCMAKE_DEFS="${COMMON_CMAKE_DEFS} ${CMAKE_DEFS} -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DGGML_SYCL=ON -DGGML_SYCL_F16=OFF"BUILD_DIR="../build/linux/${ARCH}/oneapi"- ONEAPI_DIST_DIR="${DIST_BASE}/ollama_libs"+ ONEAPI_DIST_DIR="${DIST_BASE}/lib/ollama"export LLAMA_SERVER_LDFLAGS="-fsycl -lOpenCL -lmkl_core -lmkl_sycl_blas -lmkl_intel_ilp64 -lmkl_tbb_thread -ltbb"DEBUG_FLAGS="" # icx compiles with -O0 if we pass -g, so we must remove itbuild@@ -260,7 +260,7 @@ if [ -z "${OLLAMA_SKIP_ROCM_GENERATE}" -a -d "${ROCM_PATH}" ]; thenecho "Building custom ROCM GPU"fiBUILD_DIR="../build/linux/${ARCH}/rocm${ROCM_VARIANT}"- ROCM_DIST_DIR="${DIST_BASE}/ollama_libs"+ ROCM_DIST_DIR="${DIST_BASE}/lib/ollama"# TODO figure out how to disable runpath (rpath)# export CMAKE_HIP_FLAGS="-fno-rtlib-add-rpath" # doesn't workexport LLAMA_SERVER_LDFLAGS="-L${ROCM_PATH}/lib -L/opt/amdgpu/lib/x86_64-linux-gnu/ -lhipblas -lrocblas -lamdhip64 -lrocsolver -lamd_comgr -lhsa-runtime64 -lrocsparse -ldrm -ldrm_amdgpu"diff --git a/llm/generate/gen_windows.ps1 b/llm/generate/gen_windows.ps1index 42708d3e0..4d43c9e27 100644--- a/llm/generate/gen_windows.ps1+++ b/llm/generate/gen_windows.ps1@@ -35,7 +35,7 @@ function init_vars {)$script:commonCpuDefs = @("-DCMAKE_POSITION_INDEPENDENT_CODE=on")$script:ARCH = $Env:PROCESSOR_ARCHITECTURE.ToLower()- $script:DIST_BASE = "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_runners"+ $script:DIST_BASE = "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\runners"md "$script:DIST_BASE" -ea 0 > $nullif ($env:CGO_CFLAGS -contains "-g") {$script:cmakeDefs += @("-DCMAKE_VERBOSE_MAKEFILE=on", "-DLLAMA_SERVER_VERBOSE=on", "-DCMAKE_BUILD_TYPE=RelWithDebInfo")@@ -286,11 +286,11 @@ function build_cuda() {signinstall- md "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\" -ea 0 > $null- write-host "copying CUDA dependencies to ${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${script:CUDA_LIB_DIR}\cudart64_*.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${script:CUDA_LIB_DIR}\cublas64_*.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${script:CUDA_LIB_DIR}\cublasLt64_*.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"+ md "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\" -ea 0 > $null+ write-host "copying CUDA dependencies to ${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${script:CUDA_LIB_DIR}\cudart64_*.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${script:CUDA_LIB_DIR}\cublas64_*.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${script:CUDA_LIB_DIR}\cublasLt64_*.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"} else {write-host "Skipping CUDA generation step"}@@ -324,17 +324,17 @@ function build_oneapi() {signinstall- md "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\" -ea 0 > $null- cp "${env:ONEAPI_ROOT}\compiler\latest\bin\libirngmd.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\compiler\latest\bin\libmmd.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\compiler\latest\bin\pi_level_zero.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\compiler\latest\bin\pi_unified_runtime.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\compiler\latest\bin\pi_win_proxy_loader.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\compiler\latest\bin\svml_dispmd.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\compiler\latest\bin\sycl7.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\mkl\latest\bin\mkl_core.2.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\mkl\latest\bin\mkl_sycl_blas.4.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:ONEAPI_ROOT}\mkl\latest\bin\mkl_tbb_thread.2.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"+ md "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\" -ea 0 > $null+ cp "${env:ONEAPI_ROOT}\compiler\latest\bin\libirngmd.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\compiler\latest\bin\libmmd.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\compiler\latest\bin\pi_level_zero.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\compiler\latest\bin\pi_unified_runtime.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\compiler\latest\bin\pi_win_proxy_loader.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\compiler\latest\bin\svml_dispmd.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\compiler\latest\bin\sycl7.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\mkl\latest\bin\mkl_core.2.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\mkl\latest\bin\mkl_sycl_blas.4.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:ONEAPI_ROOT}\mkl\latest\bin\mkl_tbb_thread.2.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"} else {Write-Host "Skipping oneAPI generation step"}@@ -384,11 +384,11 @@ function build_rocm() {signinstall- md "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\rocblas\library\" -ea 0 > $null- cp "${env:HIP_PATH}\bin\hipblas.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"- cp "${env:HIP_PATH}\bin\rocblas.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\"+ md "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\rocblas\library\" -ea 0 > $null+ cp "${env:HIP_PATH}\bin\hipblas.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"+ cp "${env:HIP_PATH}\bin\rocblas.dll" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\"# amdhip64.dll dependency comes from the driver and must be installed on the host to use AMD GPUs- cp "${env:HIP_PATH}\bin\rocblas\library\*" "${script:SRC_DIR}\dist\windows-${script:ARCH}\ollama_libs\rocblas\library\"+ cp "${env:HIP_PATH}\bin\rocblas\library\*" "${script:SRC_DIR}\dist\windows-${script:ARCH}\lib\ollama\rocblas\library\"} else {write-host "Skipping ROCm generation step"}diff --git a/scripts/build_windows.ps1 b/scripts/build_windows.ps1index 50b602305..9cebf1f40 100644--- a/scripts/build_windows.ps1+++ b/scripts/build_windows.ps1@@ -122,8 +122,8 @@ function buildOllama() {/csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} ollama.exeif ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)}}- New-Item -ItemType Directory -Path .\dist\windows-${script:TARGET_ARCH}\ -Force- cp .\ollama.exe .\dist\windows-${script:TARGET_ARCH}\+ New-Item -ItemType Directory -Path .\dist\windows-${script:TARGET_ARCH}\bin\ -Force+ cp .\ollama.exe .\dist\windows-${script:TARGET_ARCH}\bin\}function buildApp() {@@ -142,22 +142,22 @@ function buildApp() {function gatherDependencies() {write-host "Gathering runtime dependencies"cd "${script:SRC_DIR}"- md "${script:DEPS_DIR}\ollama_libs" -ea 0 > $null+ md "${script:DEPS_DIR}\lib\ollama" -ea 0 > $null# TODO - this varies based on host build system and MSVC version - drive from dumpbin output# currently works for Win11 + MSVC 2019 + Cuda V11- cp "${env:VCToolsRedistDir}\x64\Microsoft.VC*.CRT\msvcp140*.dll" "${script:DEPS_DIR}\ollama_libs\"- cp "${env:VCToolsRedistDir}\x64\Microsoft.VC*.CRT\vcruntime140.dll" "${script:DEPS_DIR}\ollama_libs\"- cp "${env:VCToolsRedistDir}\x64\Microsoft.VC*.CRT\vcruntime140_1.dll" "${script:DEPS_DIR}\ollama_libs\"+ cp "${env:VCToolsRedistDir}\x64\Microsoft.VC*.CRT\msvcp140*.dll" "${script:DEPS_DIR}\lib\ollama\"+ cp "${env:VCToolsRedistDir}\x64\Microsoft.VC*.CRT\vcruntime140.dll" "${script:DEPS_DIR}\lib\ollama\"+ cp "${env:VCToolsRedistDir}\x64\Microsoft.VC*.CRT\vcruntime140_1.dll" "${script:DEPS_DIR}\lib\ollama\"foreach ($part in $("runtime", "stdio", "filesystem", "math", "convert", "heap", "string", "time", "locale", "environment")) {- cp "$env:VCToolsRedistDir\..\..\..\Tools\Llvm\x64\bin\api-ms-win-crt-${part}*.dll" "${script:DEPS_DIR}\ollama_libs\"+ cp "$env:VCToolsRedistDir\..\..\..\Tools\Llvm\x64\bin\api-ms-win-crt-${part}*.dll" "${script:DEPS_DIR}\lib\ollama\"}cp "${script:SRC_DIR}\app\ollama_welcome.ps1" "${script:SRC_DIR}\dist\"if ("${env:KEY_CONTAINER}") {write-host "about to sign"- foreach ($file in (get-childitem "${script:DEPS_DIR}\ollama_libs\cu*.dll") + @("${script:SRC_DIR}\dist\ollama_welcome.ps1")){+ foreach ($file in (get-childitem "${script:DEPS_DIR}\lib\ollama\cu*.dll") + @("${script:SRC_DIR}\dist\ollama_welcome.ps1")){write-host "signing $file"& "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${script:OLLAMA_CERT}" `/csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} $filediff --git a/scripts/install.sh b/scripts/install.shindex f0439b003..a02a0675d 100644--- a/scripts/install.sh+++ b/scripts/install.sh@@ -66,7 +66,7 @@ fifor BINDIR in /usr/local/bin /usr/bin /bin; doecho $PATH | grep -q $BINDIR && break || continuedone-OLLAMA_INSTALL_DIR=${OLLAMA_INSTALL_DIR:-${BINDIR}}+OLLAMA_INSTALL_DIR=$(dirname ${BINDIR})status "Installing ollama to $OLLAMA_INSTALL_DIR"$SUDO install -o0 -g0 -m755 -d $BINDIR@@ -77,18 +77,22 @@ if curl -I --silent --fail --location "https://ollama.com/download/ollama-linux-"https://ollama.com/download/ollama-linux-${ARCH}.tgz${VER_PARAM}" | \$SUDO tar -xzf - -C "$OLLAMA_INSTALL_DIR"BUNDLE=1+ if [ "$OLLAMA_INSTALL_DIR/bin/ollama" != "$BINDIR/ollama" ] ; then+ status "Making ollama accessible in the PATH in $BINDIR"+ $SUDO ln -sf "$OLLAMA_INSTALL_DIR/ollama" "$BINDIR/ollama"+ fielsestatus "Downloading Linux ${ARCH} CLI"curl --fail --show-error --location --progress-bar -o "$TEMP_DIR/ollama"\"https://ollama.com/download/ollama-linux-${ARCH}${VER_PARAM}"$SUDO install -o0 -g0 -m755 $TEMP_DIR/ollama $OLLAMA_INSTALL_DIR/ollamaBUNDLE=0+ if [ "$OLLAMA_INSTALL_DIR/ollama" != "$BINDIR/ollama" ] ; then+ status "Making ollama accessible in the PATH in $BINDIR"+ $SUDO ln -sf "$OLLAMA_INSTALL_DIR/ollama" "$BINDIR/ollama"+ fifi-if [ "$OLLAMA_INSTALL_DIR/ollama" != "$BINDIR/ollama" ] ; then- status "Making ollama accessible in the PATH in $BINDIR"- $SUDO ln -sf "$OLLAMA_INSTALL_DIR/ollama" "$BINDIR/ollama"-fiinstall_success() {status 'The Ollama API is now available at 127.0.0.1:11434.'