Merge pull request #177 from MollySophia/rebase-ggml

Use latest ggml from upstream

.github/workflows/build.yml

@@ -23,7 +23,8 @@ jobs:
 
  strategy:
  matrix:
- sanitizer: [ADDRESS, THREAD, UNDEFINED]
+ # THREAD sanitizer is broken here and in llama.cpp
+ sanitizer: [ADDRESS, UNDEFINED]
  build_type: [Debug, Release]
 
  steps:
@@ -51,7 +52,7 @@ jobs:
  id: cmake_test
  run: |
  cd build
- ctest --verbose
+ ASAN_OPTIONS=detect_odr_violation=0 ctest --verbose
 
  ubuntu-latest-cmake:
  runs-on: ubuntu-latest
@@ -134,7 +135,7 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DRWKV_AVX2=OFF -DRWKV_FMA=OFF -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ..
+ cmake -DRWKV_AVX2=OFF -DRWKV_FMA=OFF -DRWKV_METAL=ON -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ..
  cmake --build . --config Release
 
  - name: Test
@@ -170,7 +171,7 @@ jobs:
  rwkv-${{ env.BRANCH_NAME }}-${{ steps.commit.outputs.short }}-bin-${{ steps.system-info.outputs.OS_TYPE }}-${{ steps.system-info.outputs.OS_NAME }}-${{ steps.system-info.outputs.OS_VERSION }}-${{ steps.system-info.outputs.CPU_ARCH }}.zip
 
  windows-latest-cmake:
- runs-on: windows-latest
+ runs-on: windows-2019
 
  continue-on-error: true
 
@@ -186,7 +187,7 @@ jobs:
  - build: 'cuda12'
  defines: '-DRWKV_CUBLAS=ON'
  - build: 'rocm5.5'
- defines: '-G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DRWKV_HIPBLAS=ON -DCMAKE_BUILD_TYPE=Release -DAMDGPU_TARGETS="gfx1100;gfx1102;gfx1030"'
+ defines: '-G "Unix Makefiles" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DRWKV_HIPBLAS=ON -DCMAKE_BUILD_TYPE=Release -DAMDGPU_TARGETS="gfx1100;gfx1102;gfx1030"'
 
  steps:
  - name: Clone

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "ggml"]
  path = ggml
- url = https://github.com/saharNooby/ggml
- branch = increased-node-limit-2023-09-19
+ url = https://github.com/ggerganov/ggml
+ branch = master