gcc / g++ 10 and go back to ubuntu 18.04

OpenAccess-AI-Collective · May 13, 2023 · df03922 · df03922
1 parent fc2a07a
commit df03922
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/build-llama-cpp-wheel.yml b/.github/workflows/build-llama-cpp-wheel.yml
@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - v*
+    branches:
+      - "main"
 
 jobs:
   build:

diff --git a/Dockerfile-llama-cpp-wheel b/Dockerfile-llama-cpp-wheel
@@ -1,4 +1,4 @@
-FROM nvidia/cuda:11.3.1-cudnn8-devel-ubuntu20.04
+FROM nvidia/cuda:11.3.1-cudnn8-devel-ubuntu18.04
 
 ARG CMAKE_VERSION=3.26
 ARG CMAKE_VERSION_PATCH=3.26.3
@@ -8,9 +8,13 @@ ENV TZ=UTC
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
-      curl git vim build-essential python3 python3-pip python3-dev python3-venv \
+      curl git vim build-essential software-properties-common python3 python3-pip python3-dev python3-venv \
       libffi-dev libncurses5-dev zlib1g zlib1g-dev libreadline-dev libbz2-dev libsqlite3-dev libssl-dev \
       libblas-dev liblapack-dev libopenblas-dev cmake && \
+    add-apt-repository ppa:ubuntu-toolchain-r/test && \
+    apt-get update && \
+    apt install gcc-10 g++-10 && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 && \
     rm -rf /var/lib/apt/lists/* && \
     pip3 install scikit-build
 RUN curl -L https://cmake.org/files/v$CMAKE_VERSION/cmake-$CMAKE_VERSION_PATCH-$CMAKE_OS-x86_64.sh -o /tmp/cmake-$CMAKE_VERSION_PATCH-$CMAKE_OS-x86_64.sh && \
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ on: @@
       push:
         tags:
           - v*
+        branches:
+          - "main"
     jobs:
       build:
@@ Expand Down @@