From 95fac09facfbd431f260fec4ca729b386d1e33cf Mon Sep 17 00:00:00 2001 From: biswaroop1547 Date: Fri, 3 Nov 2023 13:57:27 +0530 Subject: [PATCH 1/7] add: binary script --- ebd-all-minilm/build-aarch64-apple-darwin.sh | 18 ++++++++++++++++++ ebd-all-minilm/main.py | 1 + 2 files changed, 19 insertions(+) create mode 100755 ebd-all-minilm/build-aarch64-apple-darwin.sh diff --git a/ebd-all-minilm/build-aarch64-apple-darwin.sh b/ebd-all-minilm/build-aarch64-apple-darwin.sh new file mode 100755 index 0000000..6cf8314 --- /dev/null +++ b/ebd-all-minilm/build-aarch64-apple-darwin.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -e + +export VERSION=1.0.5 + +test -f venv/bin/activate || python -m venv venv +source venv/bin/activate + + +pip install -r requirements.txt pyinstaller +NAME=ebd-all-minilm-${VERSION}-aarch64-apple-darwin +pyinstaller --onefile \ + --target-arch arm64 \ + --name=$NAME \ + main.py +cp dist/$NAME dist/ebd-all-minilm-${VERSION%%.*}-aarch64-apple-darwin + +deactivate diff --git a/ebd-all-minilm/main.py b/ebd-all-minilm/main.py index a624f51..61f2f3e 100644 --- a/ebd-all-minilm/main.py +++ b/ebd-all-minilm/main.py @@ -1,5 +1,6 @@ import logging +import tqdm # noqa import uvicorn from dotenv import load_dotenv from fastapi import FastAPI From 817c0ffd18f89ed5f84ca435cf60853c8315ebca Mon Sep 17 00:00:00 2001 From: nsosio Date: Fri, 3 Nov 2023 12:01:29 +0100 Subject: [PATCH 2/7] added binary script --- ebd-all-minilm/build-apple-darwin.sh | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 ebd-all-minilm/build-apple-darwin.sh diff --git a/ebd-all-minilm/build-apple-darwin.sh b/ebd-all-minilm/build-apple-darwin.sh new file mode 100755 index 0000000..56d2e48 --- /dev/null +++ b/ebd-all-minilm/build-apple-darwin.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Usage: ./build-apple-darwin.sh +# +# Parameters: +# arch: The architecture to use. +# arch_name: The architecture name to use. + +set -e + +ARCH=${1:-arm64} +ARCH_NAME=${2:-aarch64} + +export VERSION=1.0.5 + +test -f venv/bin/activate || python -m venv venv +source venv/bin/activate + + +pip install -r requirements.txt pyinstaller +NAME=ebd-all-minilm-${VERSION}-x86_64-apple-darwin +pyinstaller --onefile \ + --copy-metadata tqdm \ + --copy-metadata regex \ + --copy-metadata requests \ + --copy-metadata packaging \ + --copy-metadata filelock \ + --copy-metadata numpy \ + --copy-metadata huggingface-hub \ + --copy-metadata safetensors \ + --copy-metadata pyyaml \ + --hidden-import=pytorch \ + --collect-data torch \ + --copy-metadata torch \ + --add-data 'main.py:.' \ + --copy-metadata tokenizers \ + --hidden-import=tiktoken_ext.openai_public \ + --hidden-import=tiktoken_ext \ + --target-arch $ARCH \ + --name=$NAME \ + main.py +cp dist/$NAME dist/ebd-all-minilm-${VERSION%%.*}-$ARCH_NAME-apple-darwin + +deactivate From a8a4904356cf439fe020088cc2f9989d352384e8 Mon Sep 17 00:00:00 2001 From: nsosio Date: Fri, 3 Nov 2023 12:05:03 +0100 Subject: [PATCH 3/7] removed arch dependent script --- ebd-all-minilm/build-aarch64-apple-darwin.sh | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100755 ebd-all-minilm/build-aarch64-apple-darwin.sh diff --git a/ebd-all-minilm/build-aarch64-apple-darwin.sh b/ebd-all-minilm/build-aarch64-apple-darwin.sh deleted file mode 100755 index 6cf8314..0000000 --- a/ebd-all-minilm/build-aarch64-apple-darwin.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -e - -export VERSION=1.0.5 - -test -f venv/bin/activate || python -m venv venv -source venv/bin/activate - - -pip install -r requirements.txt pyinstaller -NAME=ebd-all-minilm-${VERSION}-aarch64-apple-darwin -pyinstaller --onefile \ - --target-arch arm64 \ - --name=$NAME \ - main.py -cp dist/$NAME dist/ebd-all-minilm-${VERSION%%.*}-aarch64-apple-darwin - -deactivate From a8c61deafc703336ba85f50a95c2b36e403c2e85 Mon Sep 17 00:00:00 2001 From: nsosio Date: Fri, 3 Nov 2023 12:28:06 +0100 Subject: [PATCH 4/7] added support only for arm --- ...apple-darwin.sh => build-aarch64-apple-darwin.sh} | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) rename ebd-all-minilm/{build-apple-darwin.sh => build-aarch64-apple-darwin.sh} (74%) diff --git a/ebd-all-minilm/build-apple-darwin.sh b/ebd-all-minilm/build-aarch64-apple-darwin.sh similarity index 74% rename from ebd-all-minilm/build-apple-darwin.sh rename to ebd-all-minilm/build-aarch64-apple-darwin.sh index 56d2e48..cac0c8c 100755 --- a/ebd-all-minilm/build-apple-darwin.sh +++ b/ebd-all-minilm/build-aarch64-apple-darwin.sh @@ -1,10 +1,4 @@ -#!/usr/bin/env bash - -# Usage: ./build-apple-darwin.sh -# -# Parameters: -# arch: The architecture to use. -# arch_name: The architecture name to use. +#!/bin/bash set -e @@ -36,9 +30,9 @@ pyinstaller --onefile \ --copy-metadata tokenizers \ --hidden-import=tiktoken_ext.openai_public \ --hidden-import=tiktoken_ext \ - --target-arch $ARCH \ + --target-arch arm64 \ --name=$NAME \ main.py -cp dist/$NAME dist/ebd-all-minilm-${VERSION%%.*}-$ARCH_NAME-apple-darwin +cp dist/$NAME dist/ebd-all-minilm-${VERSION%%.*}-aarch64-apple-darwin deactivate From 39609480db2ee1a0b7aa0d5f4d678c74b94a48a3 Mon Sep 17 00:00:00 2001 From: nsosio Date: Fri, 3 Nov 2023 12:31:41 +0100 Subject: [PATCH 5/7] removed tqdm and unused variables --- ebd-all-minilm/build-aarch64-apple-darwin.sh | 3 --- ebd-all-minilm/main.py | 1 - 2 files changed, 4 deletions(-) diff --git a/ebd-all-minilm/build-aarch64-apple-darwin.sh b/ebd-all-minilm/build-aarch64-apple-darwin.sh index cac0c8c..cdef0c7 100755 --- a/ebd-all-minilm/build-aarch64-apple-darwin.sh +++ b/ebd-all-minilm/build-aarch64-apple-darwin.sh @@ -2,9 +2,6 @@ set -e -ARCH=${1:-arm64} -ARCH_NAME=${2:-aarch64} - export VERSION=1.0.5 test -f venv/bin/activate || python -m venv venv diff --git a/ebd-all-minilm/main.py b/ebd-all-minilm/main.py index 61f2f3e..a624f51 100644 --- a/ebd-all-minilm/main.py +++ b/ebd-all-minilm/main.py @@ -1,6 +1,5 @@ import logging -import tqdm # noqa import uvicorn from dotenv import load_dotenv from fastapi import FastAPI From 2528808157e704aca3a03e96779153e6f1722f6b Mon Sep 17 00:00:00 2001 From: nsosio Date: Fri, 3 Nov 2023 12:33:55 +0100 Subject: [PATCH 6/7] bugfix --- ebd-all-minilm/build-aarch64-apple-darwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebd-all-minilm/build-aarch64-apple-darwin.sh b/ebd-all-minilm/build-aarch64-apple-darwin.sh index cdef0c7..beb2524 100755 --- a/ebd-all-minilm/build-aarch64-apple-darwin.sh +++ b/ebd-all-minilm/build-aarch64-apple-darwin.sh @@ -9,7 +9,7 @@ source venv/bin/activate pip install -r requirements.txt pyinstaller -NAME=ebd-all-minilm-${VERSION}-x86_64-apple-darwin +NAME=ebd-all-minilm-${VERSION}-aarch64-apple-darwin pyinstaller --onefile \ --copy-metadata tqdm \ --copy-metadata regex \ From e8ba0c3b5888214ce74b63b2fbda42b982e7f042 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 3 Nov 2023 12:41:03 +0000 Subject: [PATCH 7/7] slight tidy --- cht-llama-cpp/build-aarch64-apple-darwin.sh | 5 +---- ebd-all-minilm/build-aarch64-apple-darwin.sh | 23 ++++++++------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/cht-llama-cpp/build-aarch64-apple-darwin.sh b/cht-llama-cpp/build-aarch64-apple-darwin.sh index 2fc0111..121c777 100755 --- a/cht-llama-cpp/build-aarch64-apple-darwin.sh +++ b/cht-llama-cpp/build-aarch64-apple-darwin.sh @@ -1,15 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash set -e - export VERSION=1.1.2 test -f venv/bin/activate || python -m venv venv source venv/bin/activate - pip install -r requirements.txt pyinstaller LLAMA_CPP_PATH=$(python -c 'import llama_cpp; print(llama_cpp.__path__[0])') -# macOS (dylib) package NAME=cht-llama-cpp-mistral-${VERSION}-aarch64-apple-darwin pyinstaller --onefile \ --target-arch arm64 \ diff --git a/ebd-all-minilm/build-aarch64-apple-darwin.sh b/ebd-all-minilm/build-aarch64-apple-darwin.sh index beb2524..f54829e 100755 --- a/ebd-all-minilm/build-aarch64-apple-darwin.sh +++ b/ebd-all-minilm/build-aarch64-apple-darwin.sh @@ -1,33 +1,28 @@ -#!/bin/bash - +#!/usr/bin/env bash set -e - -export VERSION=1.0.5 +export VERSION=1.0.4 test -f venv/bin/activate || python -m venv venv source venv/bin/activate - pip install -r requirements.txt pyinstaller NAME=ebd-all-minilm-${VERSION}-aarch64-apple-darwin pyinstaller --onefile \ - --copy-metadata tqdm \ - --copy-metadata regex \ - --copy-metadata requests \ - --copy-metadata packaging \ --copy-metadata filelock \ - --copy-metadata numpy \ --copy-metadata huggingface-hub \ - --copy-metadata safetensors \ + --copy-metadata numpy \ + --copy-metadata packaging \ --copy-metadata pyyaml \ + --copy-metadata regex \ + --copy-metadata requests \ + --copy-metadata safetensors \ + --copy-metadata tokenizers \ + --copy-metadata tqdm \ --hidden-import=pytorch \ --collect-data torch \ --copy-metadata torch \ - --add-data 'main.py:.' \ - --copy-metadata tokenizers \ --hidden-import=tiktoken_ext.openai_public \ --hidden-import=tiktoken_ext \ - --target-arch arm64 \ --name=$NAME \ main.py cp dist/$NAME dist/ebd-all-minilm-${VERSION%%.*}-aarch64-apple-darwin