From 09c7284d1f45f1cd2aa3d85083045acba5fcef61 Mon Sep 17 00:00:00 2001 From: Karthik Date: Fri, 15 Mar 2024 09:31:10 -0700 Subject: [PATCH 1/4] Remove submodules - dependencies are managed by CMAKE fetchcontent --- .gitmodules | 6 ------ vendor/gemma.cpp | 1 - vendor/pybind11 | 1 - 3 files changed, 8 deletions(-) delete mode 160000 vendor/gemma.cpp delete mode 160000 vendor/pybind11 diff --git a/.gitmodules b/.gitmodules index 8470285..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +0,0 @@ -[submodule "vendor/gemma.cpp"] - path = vendor/gemma.cpp - url = https://github.com/google/gemma.cpp -[submodule "vendor/pybind11"] - path = vendor/pybind11 - url = https://github.com/pybind/pybind11.git diff --git a/vendor/gemma.cpp b/vendor/gemma.cpp deleted file mode 160000 index fb6f266..0000000 --- a/vendor/gemma.cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb6f266db1bfd7391e70b945dcf8b745c1ebbe09 diff --git a/vendor/pybind11 b/vendor/pybind11 deleted file mode 160000 index 8b48ff8..0000000 --- a/vendor/pybind11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8b48ff878c168b51fe5ef7b8c728815b9e1a9857 From 7799653bc432e9c61afa1bb394f516ad560bfaa6 Mon Sep 17 00:00:00 2001 From: Karthik Date: Fri, 15 Mar 2024 09:36:06 -0700 Subject: [PATCH 2/4] Set the working git-tag for Gemma.cpp - gemma.cpp origin/main has been updated and the changes were not backcompatible with the current bindings - this is a short term fix that sets the git-tag to the first gemma.cpp commit resulting in a version that compiles without errors - TODO: update bindings to support the new interface and spec for libgemma --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1494591..8414cbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) FetchContent_Declare(sentencepiece GIT_REPOSITORY https://github.com/google/sentencepiece GIT_TAG 53de76561cfc149d3c01037f0595669ad32a5e7c) FetchContent_MakeAvailable(sentencepiece) -FetchContent_Declare(gemma GIT_REPOSITORY https://github.com/google/gemma.cpp GIT_TAG origin/main) +FetchContent_Declare(gemma GIT_REPOSITORY https://github.com/google/gemma.cpp GIT_TAG e29cd566cf3367671e8f59419a04e308796a7c57) FetchContent_MakeAvailable(gemma) FetchContent_Declare(highway GIT_REPOSITORY https://github.com/google/highway.git GIT_TAG da250571a45826b21eebbddc1e50d0c1137dee5f) From 531db4c0aa78de28b37cc92371afa2924d304aaf Mon Sep 17 00:00:00 2001 From: Karthik Date: Fri, 15 Mar 2024 09:39:57 -0700 Subject: [PATCH 3/4] Ignore Vscode --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 68bc17f..b5d1648 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,6 @@ cython_debug/ # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ + +# Vscode +.vscode/ \ No newline at end of file From 8e116c13fdd652c044840f1d8c2eb7a5cb528de7 Mon Sep 17 00:00:00 2001 From: Karthik Date: Fri, 15 Mar 2024 09:45:12 -0700 Subject: [PATCH 4/4] Remove empty gitmodules --- .gitmodules | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000