diff options
| author | JohnnyB <jboero@users.noreply.github.com> | 2024-05-30 21:32:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-30 22:32:38 +0200 |
| commit | 9022c33646fbf78da35f40c3f98576cc08c40ddf (patch) | |
| tree | 89c5becb2dbed393f35e6db0c4611ac059e58d40 | |
| parent | 5921b8f089d3b7bda86aac5a66825df6a6c10603 (diff) | |
Fixed painfully slow single process builds. (#7326)
* Fixed painfully slow single process builds.
* Added nproc for systems that don't default to nproc
| -rw-r--r-- | .devops/full-cuda.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/full-rocm.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/full.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/main-cuda.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/main-rocm.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/main.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/server-cuda.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/server-rocm.Dockerfile | 2 | ||||
| -rw-r--r-- | .devops/server.Dockerfile | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/.devops/full-cuda.Dockerfile b/.devops/full-cuda.Dockerfile index 059fd269..c01006ef 100644 --- a/.devops/full-cuda.Dockerfile +++ b/.devops/full-cuda.Dockerfile @@ -31,6 +31,6 @@ ENV LLAMA_CUDA=1 # Enable cURL ENV LLAMA_CURL=1 -RUN make +RUN make -j$(nproc) ENTRYPOINT ["/app/.devops/tools.sh"] diff --git a/.devops/full-rocm.Dockerfile b/.devops/full-rocm.Dockerfile index 6ecf3bcc..0314d469 100644 --- a/.devops/full-rocm.Dockerfile +++ b/.devops/full-rocm.Dockerfile @@ -45,6 +45,6 @@ ENV LLAMA_CURL=1 RUN apt-get update && \ apt-get install -y libcurl4-openssl-dev -RUN make +RUN make -j$(nproc) ENTRYPOINT ["/app/.devops/tools.sh"] diff --git a/.devops/full.Dockerfile b/.devops/full.Dockerfile index 432fb5da..6d5943a2 100644 --- a/.devops/full.Dockerfile +++ b/.devops/full.Dockerfile @@ -18,7 +18,7 @@ COPY . . ENV LLAMA_CURL=1 -RUN make +RUN make -j$(nproc) ENV LC_ALL=C.utf8 diff --git a/.devops/main-cuda.Dockerfile b/.devops/main-cuda.Dockerfile index b937a482..23f42894 100644 --- a/.devops/main-cuda.Dockerfile +++ b/.devops/main-cuda.Dockerfile @@ -23,7 +23,7 @@ ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH} # Enable CUDA ENV LLAMA_CUDA=1 -RUN make +RUN make -j$(nproc) FROM ${BASE_CUDA_RUN_CONTAINER} as runtime diff --git a/.devops/main-rocm.Dockerfile b/.devops/main-rocm.Dockerfile index 0a706dc7..37576d68 100644 --- a/.devops/main-rocm.Dockerfile +++ b/.devops/main-rocm.Dockerfile @@ -40,6 +40,6 @@ ENV LLAMA_HIPBLAS=1 ENV CC=/opt/rocm/llvm/bin/clang ENV CXX=/opt/rocm/llvm/bin/clang++ -RUN make +RUN make -j$(nproc) ENTRYPOINT [ "/app/main" ] diff --git a/.devops/main.Dockerfile b/.devops/main.Dockerfile index 3ab1decd..763d75fc 100644 --- a/.devops/main.Dockerfile +++ b/.devops/main.Dockerfile @@ -9,7 +9,7 @@ WORKDIR /app COPY . . -RUN make +RUN make -j$(nproc) FROM ubuntu:$UBUNTU_VERSION as runtime diff --git a/.devops/server-cuda.Dockerfile b/.devops/server-cuda.Dockerfile index 59a52ba2..7f522818 100644 --- a/.devops/server-cuda.Dockerfile +++ b/.devops/server-cuda.Dockerfile @@ -25,7 +25,7 @@ ENV LLAMA_CUDA=1 # Enable cURL ENV LLAMA_CURL=1 -RUN make +RUN make -j$(nproc) FROM ${BASE_CUDA_RUN_CONTAINER} as runtime diff --git a/.devops/server-rocm.Dockerfile b/.devops/server-rocm.Dockerfile index c02a31dd..a6b76dee 100644 --- a/.devops/server-rocm.Dockerfile +++ b/.devops/server-rocm.Dockerfile @@ -45,6 +45,6 @@ ENV LLAMA_CURL=1 RUN apt-get update && \ apt-get install -y libcurl4-openssl-dev -RUN make +RUN make -j$(nproc) ENTRYPOINT [ "/app/server" ] diff --git a/.devops/server.Dockerfile b/.devops/server.Dockerfile index be964e0e..0d09d362 100644 --- a/.devops/server.Dockerfile +++ b/.devops/server.Dockerfile @@ -11,7 +11,7 @@ COPY . . ENV LLAMA_CURL=1 -RUN make +RUN make -j$(nproc) FROM ubuntu:$UBUNTU_VERSION as runtime |