diff --git a/.gitignore b/.gitignore index 08a4762b3..5b93763d6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,8 @@ vendor/* hack/tools/bin/* .DS_Store /coverage.txt + +# presets + +pkg/presets/llama-2/weights +pkg/presets/llama-2-chat/weights diff --git a/Makefile b/Makefile index 5ce3c8071..70686843a 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla .PHONY: docker-build-kdm docker-build-kdm: docker-buildx docker buildx build \ - --file ./Dockerfile \ + --file ./docker/kdm/Dockerfile \ --output=$(OUTPUT_TYPE) \ --platform="linux/$(ARCH)" \ --pull \ diff --git a/Dockerfile b/docker/kdm/Dockerfile similarity index 100% rename from Dockerfile rename to docker/kdm/Dockerfile diff --git a/presets/falcon/Dockerfile b/docker/presets/falcon/Dockerfile similarity index 72% rename from presets/falcon/Dockerfile rename to docker/presets/falcon/Dockerfile index 12aaa76a9..d251a4e0e 100644 --- a/presets/falcon/Dockerfile +++ b/docker/presets/falcon/Dockerfile @@ -7,8 +7,8 @@ WORKDIR /workspace/huggingface # First, copy just the requirements.txt file and install dependencies # This is done before copying the code to utilize Docker's layer caching and # avoid reinstalling dependencies unless the requirements file changes. -COPY code/requirements.txt ./requirements.txt +COPY pkg/presets/falcon/requirements.txt ./requirements.txt RUN pip install --no-cache-dir -r requirements.txt -# Copy the entire 'code' folder to the working directory -COPY code . +# Copy the entire 'presets/falcon' folder to the working directory +COPY pkg/presets/falcon . diff --git a/presets/llama-2/Dockerfile b/docker/presets/llama-2-chat/Dockerfile similarity index 79% rename from presets/llama-2/Dockerfile rename to docker/presets/llama-2-chat/Dockerfile index 354cb5921..e91966a16 100644 --- a/presets/llama-2/Dockerfile +++ b/docker/presets/llama-2-chat/Dockerfile @@ -9,4 +9,4 @@ RUN pip install -e . RUN pip install fastapi pydantic RUN pip install 'uvicorn[standard]' -ADD code /workspace/llama/llama-2 +ADD pkg/presets/llama-2-chat /workspace/llama/llama-2-chat diff --git a/presets/llama-2-chat/Dockerfile b/docker/presets/llama-2/Dockerfile similarity index 82% rename from presets/llama-2-chat/Dockerfile rename to docker/presets/llama-2/Dockerfile index f172e210e..a68f56df9 100644 --- a/presets/llama-2-chat/Dockerfile +++ b/docker/presets/llama-2/Dockerfile @@ -9,4 +9,4 @@ RUN pip install -e . RUN pip install fastapi pydantic RUN pip install 'uvicorn[standard]' -ADD code /workspace/llama/llama-2-chat +ADD pkg/presets/llama-2 /workspace/llama/llama-2 diff --git a/presets/Most-Googled-questions-global-Jan-to-Jun-2023.csv b/pkg/presets/Most-Googled-questions-global-Jan-to-Jun-2023.csv similarity index 100% rename from presets/Most-Googled-questions-global-Jan-to-Jun-2023.csv rename to pkg/presets/Most-Googled-questions-global-Jan-to-Jun-2023.csv diff --git a/presets/README.md b/pkg/presets/README.md similarity index 100% rename from presets/README.md rename to pkg/presets/README.md diff --git a/presets/benchmark_inference.py b/pkg/presets/benchmark_inference.py similarity index 100% rename from presets/benchmark_inference.py rename to pkg/presets/benchmark_inference.py diff --git a/presets/common-gpt-questions.csv b/pkg/presets/common-gpt-questions.csv similarity index 100% rename from presets/common-gpt-questions.csv rename to pkg/presets/common-gpt-questions.csv diff --git a/presets/k8s/convert_fill.sh b/pkg/presets/convert/convert_fill.sh similarity index 100% rename from presets/k8s/convert_fill.sh rename to pkg/presets/convert/convert_fill.sh diff --git a/presets/k8s/convert_template.yaml b/pkg/presets/convert/convert_template.yaml similarity index 99% rename from presets/k8s/convert_template.yaml rename to pkg/presets/convert/convert_template.yaml index 4f24558c6..ed3c444a2 100644 --- a/presets/k8s/convert_template.yaml +++ b/pkg/presets/convert/convert_template.yaml @@ -22,4 +22,3 @@ spec: limits: cpu: "1" ephemeral-storage: "500Gi" - diff --git a/presets/k8s/llama-2-13b-chat.yaml b/pkg/presets/convert/llama-2-13b-chat.yaml similarity index 100% rename from presets/k8s/llama-2-13b-chat.yaml rename to pkg/presets/convert/llama-2-13b-chat.yaml diff --git a/presets/k8s/llama-2-7b-chat.yaml b/pkg/presets/convert/llama-2-7b-chat.yaml similarity index 100% rename from presets/k8s/llama-2-7b-chat.yaml rename to pkg/presets/convert/llama-2-7b-chat.yaml diff --git a/presets/k8s/llama-2-7b.yaml b/pkg/presets/convert/llama-2-7b.yaml similarity index 100% rename from presets/k8s/llama-2-7b.yaml rename to pkg/presets/convert/llama-2-7b.yaml diff --git a/presets/k8s/pod-2GPU.yaml b/pkg/presets/convert/pod-2GPU.yaml similarity index 100% rename from presets/k8s/pod-2GPU.yaml rename to pkg/presets/convert/pod-2GPU.yaml diff --git a/presets/k8s/pod.yaml b/pkg/presets/convert/pod.yaml similarity index 100% rename from presets/k8s/pod.yaml rename to pkg/presets/convert/pod.yaml diff --git a/presets/falcon/code/config.yaml b/pkg/presets/falcon/config.yaml similarity index 100% rename from presets/falcon/code/config.yaml rename to pkg/presets/falcon/config.yaml diff --git a/presets/falcon/code/inference-api.py b/pkg/presets/falcon/inference-api.py similarity index 100% rename from presets/falcon/code/inference-api.py rename to pkg/presets/falcon/inference-api.py diff --git a/presets/falcon/code/requirements.txt b/pkg/presets/falcon/requirements.txt similarity index 100% rename from presets/falcon/code/requirements.txt rename to pkg/presets/falcon/requirements.txt diff --git a/presets/llama-2-chat/code/example_chat_completion.py b/pkg/presets/llama-2-chat/example_chat_completion.py similarity index 100% rename from presets/llama-2-chat/code/example_chat_completion.py rename to pkg/presets/llama-2-chat/example_chat_completion.py diff --git a/presets/llama-2-chat/code/tokenizer.model b/pkg/presets/llama-2-chat/tokenizer.model similarity index 100% rename from presets/llama-2-chat/code/tokenizer.model rename to pkg/presets/llama-2-chat/tokenizer.model diff --git a/presets/llama-2-chat/code/web_example_chat_completion.py b/pkg/presets/llama-2-chat/web_example_chat_completion.py similarity index 100% rename from presets/llama-2-chat/code/web_example_chat_completion.py rename to pkg/presets/llama-2-chat/web_example_chat_completion.py diff --git a/presets/llama-2/code/example_text_completion.py b/pkg/presets/llama-2/example_text_completion.py similarity index 100% rename from presets/llama-2/code/example_text_completion.py rename to pkg/presets/llama-2/example_text_completion.py diff --git a/presets/llama-2/params.md b/pkg/presets/llama-2/params.md similarity index 100% rename from presets/llama-2/params.md rename to pkg/presets/llama-2/params.md diff --git a/presets/llama-2/code/tokenizer.model b/pkg/presets/llama-2/tokenizer.model similarity index 100% rename from presets/llama-2/code/tokenizer.model rename to pkg/presets/llama-2/tokenizer.model diff --git a/presets/llama-2/code/web_example_text_completion.py b/pkg/presets/llama-2/web_example_text_completion.py similarity index 100% rename from presets/llama-2/code/web_example_text_completion.py rename to pkg/presets/llama-2/web_example_text_completion.py diff --git a/presets/llama.md b/pkg/presets/llama.md similarity index 100% rename from presets/llama.md rename to pkg/presets/llama.md diff --git a/presets/.github/dependabot.yml b/presets/.github/dependabot.yml deleted file mode 100644 index 6a08857c8..000000000 --- a/presets/.github/dependabot.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - commit-message: - prefix: "chore" \ No newline at end of file diff --git a/presets/.github/markdown-links-config.json b/presets/.github/markdown-links-config.json deleted file mode 100644 index 4abcb6668..000000000 --- a/presets/.github/markdown-links-config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "aliveStatusCodes": [ - 200, - 203, - 429, - 0 - ], - "timeout": "5s", - "retryCount": 5, - "fallbackRetryDelay": "30s" - } \ No newline at end of file diff --git a/presets/.github/pr-title-config.json b/presets/.github/pr-title-config.json deleted file mode 100644 index 1c917b74c..000000000 --- a/presets/.github/pr-title-config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "LABEL": { - "name": "title-needs-formatting", - "color": "EEEEEE" - }, - "CHECKS": { - "prefixes": [ "[WIP] ", "feat: ", "test: ", "fix: ", "docs: ", "style: ", "interface: ", "util: ", "chore: ", "ci: ", "perf: ", "refactor: ", "revert: ", "security: ", "release: " ] - } -} \ No newline at end of file diff --git a/presets/.github/workflows/codeql.yml b/presets/.github/workflows/codeql.yml deleted file mode 100644 index b918270bc..000000000 --- a/presets/.github/workflows/codeql.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: - - main - schedule: - - cron: "0 7 * * 1" # Mondays at 7:00 AM - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - security-events: write - contents: read - actions: read - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: true - fetch-depth: 0 - - - name: Initialize CodeQL - uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a - with: - languages: go - - - name: Autobuild - uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a - diff --git a/presets/.github/workflows/markdown-link-check.yml b/presets/.github/workflows/markdown-link-check.yml deleted file mode 100644 index bd9ec8b4b..000000000 --- a/presets/.github/workflows/markdown-link-check.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: markdown link - -on: - pull_request: - paths: - - '**.md' - - 'docs/**' - -jobs: - markdown-link-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - # this will only show errors in the output - use-quiet-mode: 'yes' - # this will show detailed HTTP status for checked links - use-verbose-mode: 'yes' - config-file: '.github/markdown.links.config.json' \ No newline at end of file diff --git a/presets/.github/workflows/pr-title-lint.yml b/presets/.github/workflows/pr-title-lint.yml deleted file mode 100644 index 626145f0b..000000000 --- a/presets/.github/workflows/pr-title-lint.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: pr Title Checker -on: - pull_request: - types: - - opened - - edited - - synchronize - - labeled - - unlabeled - -jobs: - check: - runs-on: ubuntu-latest - steps: - - uses: thehanimo/pr-title-checker@v1.4.0 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - pass_on_octokit_error: true - configuration_path: ".github/pr-title-config.json" diff --git a/presets/.gitignore b/presets/.gitignore deleted file mode 100644 index 41e3b1e73..000000000 --- a/presets/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/llama-2/code/weights -/llama-2-chat/code/weights \ No newline at end of file diff --git a/presets/CODEOWNERS b/presets/CODEOWNERS deleted file mode 100644 index 5569d3e1c..000000000 --- a/presets/CODEOWNERS +++ /dev/null @@ -1,3 +0,0 @@ -# Ref: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners - -* @Fei-Guo @helayoty @ishaansehgal99 diff --git a/presets/LICENSE b/presets/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/presets/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License.