summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Walter <stephan@walter.name>2023-04-24 15:38:26 +0000
committerGitHub <noreply@github.com>2023-04-24 15:38:26 +0000
commit2ec83428de7a876ecbbe484e1de42b73b5a40e25 (patch)
tree3d61cc1577d09c2de126b521bb1e6b707800dd8c
parente4cf982e0d4fcfbb4b977a52dbeacd115da10c3b (diff)
Fix build for gcc 8 and test in CI (#1154)
-rw-r--r--.github/workflows/build.yml10
-rw-r--r--ggml.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c40b0c1..17908057 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,8 +19,8 @@ env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
jobs:
- ubuntu-latest-make:
- runs-on: ubuntu-latest
+ ubuntu-focal-make:
+ runs-on: ubuntu-20.04
steps:
- name: Clone
@@ -31,12 +31,12 @@ jobs:
id: depends
run: |
sudo apt-get update
- sudo apt-get install build-essential
+ sudo apt-get install build-essential gcc-8
- name: Build
id: make_build
run: |
- make
+ CC=gcc-8 make
ubuntu-latest-cmake:
runs-on: ubuntu-latest
@@ -216,7 +216,7 @@ jobs:
runs-on: ubuntu-latest
needs:
- - ubuntu-latest-make
+ - ubuntu-focal-make
- ubuntu-latest-cmake
- macOS-latest-make
- macOS-latest-cmake
diff --git a/ggml.c b/ggml.c
index f8f73af3..6e46c0e5 100644
--- a/ggml.c
+++ b/ggml.c
@@ -436,7 +436,7 @@ static const size_t CACHE_LINE_SIZE_F32 = CACHE_LINE_SIZE/sizeof(float);
static inline __m128i bytes_from_nibbles_16(const uint8_t * rsi)
{
// Load 8 bytes from memory
- __m128i tmp = _mm_loadu_si64( ( const __m128i* )rsi );
+ __m128i tmp = _mm_loadl_epi64( ( const __m128i* )rsi );
// Expand bytes into uint16_t values
__m128i bytes = _mm_cvtepu8_epi16( tmp );