gguf-hash: remove clib sha256 attempt

ggerganov · Jun 22, 2024 · a410d23 · a410d23
1 parent f01de1a
commit a410d23
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 331 deletions.
diff --git a/examples/gguf-hash/CMakeLists.txt b/examples/gguf-hash/CMakeLists.txt
@@ -5,9 +5,9 @@ install(TARGETS ${TARGET} RUNTIME)
 # clibs dependencies
 include_directories(deps/)
 add_library(xxhash OBJECT deps/xxhash/xxhash.c deps/xxhash/xxhash.h)
+target_link_libraries(${TARGET} PRIVATE xxhash)
 add_library(sha1 OBJECT deps/sha1/sha1.c deps/sha1/sha1.h)
-add_library(sha256 OBJECT deps/sha256/sha256.c deps/sha256/sha256.h)
-target_link_libraries(${TARGET} PRIVATE sha1 sha256 xxhash)
+target_link_libraries(${TARGET} PRIVATE sha1)
 
 target_link_libraries(${TARGET} PRIVATE ggml ${CMAKE_THREAD_LIBS_INIT})
 target_compile_features(${TARGET} PRIVATE cxx_std_11)
diff --git a/examples/gguf-hash/README.md b/examples/gguf-hash/README.md
@@ -6,23 +6,21 @@ CLI to hash GGUF files.
 
 - `--xxhash`: use xhash (default)
 - `--sha1`: use sha1
-- `--sha256`: use sha256
 
 ### Compile Example
 
 ```
-cmake -B build
-make -C build llama-gguf-hash
+cmake -B build -DCMAKE_BUILD_TYPE=Debug -DLLAMA_FATAL_WARNINGS=ON
+make -C build clean
+make -C build llama-gguf-hash VERBOSE=1
 ./build/bin/llama-gguf-hash test.gguf
 ./build/bin/llama-gguf-hash --xxhash test.gguf
 ./build/bin/llama-gguf-hash --sha1 test.gguf
-./build/bin/llama-gguf-hash --sha256 test.gguf
 ```
 
-### Crypto/Hash Libaries Used
+### Crypto/Hash Libraries Used
 
-These small clibs was installed via the [clib c package manager](https://github.com/clibs)
+These micro c libraries dependencies was installed via the [clib c package manager](https://github.com/clibs)
 
-- https://github.com/clibs/sha1/
-- https://github.com/Cyan4973/xxHash
 - https://github.com/mofosyne/xxHash
+- https://github.com/clibs/sha1/
diff --git a/examples/gguf-hash/deps/rotate-bits/package.json b/examples/gguf-hash/deps/rotate-bits/package.json
diff --git a/examples/gguf-hash/deps/rotate-bits/rotate-bits.h b/examples/gguf-hash/deps/rotate-bits/rotate-bits.h
diff --git a/examples/gguf-hash/deps/sha256/package.json b/examples/gguf-hash/deps/sha256/package.json
diff --git a/examples/gguf-hash/deps/sha256/sha256.c b/examples/gguf-hash/deps/sha256/sha256.c
diff --git a/examples/gguf-hash/deps/sha256/sha256.h b/examples/gguf-hash/deps/sha256/sha256.h
diff --git a/examples/gguf-hash/gguf-hash.cpp b/examples/gguf-hash/gguf-hash.cpp
@@ -11,9 +11,10 @@
 
 #include "xxhash/xxhash.h"
 #include "sha1/sha1.h"
-#include "sha256/sha256.h"
 
-//#define SHA256
+#ifdef SHA256 // TODO: https://github.com/jb55/sha256.c
+#include "sha256/sha256.h"
+#endif
 
 struct hash_params {
  std::string input;