Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
sritchie committed Feb 3, 2025
1 parent 29fe454 commit 4a572c2
Show file tree
Hide file tree
Showing 212 changed files with 19,981 additions and 19,649 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/performance-monitoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ jobs:
# from main
run: |
BUCKET_PATH=gs://gen-website-private/gen.dev/genparse-performance-monitoring
# The benchmarking action should tolerate a nonexistent data file,
# The benchmarking action should tolerate a nonexistent data file,
# but fetch historical data if available.
([[ "${{ steps.extract_branch.outputs.branch }}" != main ]] &&
(gcloud storage cp "${BUCKET_PATH:?}"/"${{ steps.extract_branch.outputs.branch }}"/data.js data.js ||
([[ "${{ steps.extract_branch.outputs.branch }}" != main ]] &&
(gcloud storage cp "${BUCKET_PATH:?}"/"${{ steps.extract_branch.outputs.branch }}"/data.js data.js ||
echo "No historical data found for ${{ steps.extract_branch.outputs.branch }}, attempting to get main branch data.")
) ||
gcloud storage cp "${BUCKET_PATH:?}"/main/data.js data.js ||
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
# genparse-performance-monitoring.gen.dev/BRANCH
ROOT_WEBSITE_DIR=website
mkdir -p "$ROOT_WEBSITE_DIR"
gcloud storage rsync --recursive "${BUCKET_PATH:?}" "${ROOT_WEBSITE_DIR:?}" ||
echo "No preexisting website data, skipping..."
Expand All @@ -108,7 +108,7 @@ jobs:
WEBSITE_DIR="${WEBSITE_DIR:?}"/"${{ steps.extract_branch.outputs.branch }}"
fi
echo "website_dir=${WEBSITE_DIR:?}" >> "$GITHUB_OUTPUT"
echo "Generating website directory ${WEBSITE_DIR:?}"
mkdir -p "${WEBSITE_DIR:?}"
# Do `|| true` because otherwise this glob will list some directories.
Expand Down
8 changes: 0 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: check-yaml
args: [--unsafe]
- id: end-of-file-fixer
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.3
hooks:
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ refresh_env :
refresh_env-no-rust :
@rm -rf $(NAME).egg-info/
@$(MAKE) env-no-rust

## format : format code style.
.PHONY : format
format : env
Expand Down Expand Up @@ -113,3 +113,4 @@ benchmark : env benchmark.json
benchmark-no-vllm: env-no-vllm benchmark.json
benchmark.json : $(SRC_FILES) $(PERF_TEST_FILES)
@pytest $(PERF_TEST_FILES) --benchmark-json output.json

2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ This project includes dependencies with the following licenses:
17. Maturin - Apache 2.0 License OR MIT License
18. Psutil - BSD 3-Clause "New" or "Revised" License
19. MkDocs - BSD 2-Clause "Simplified" License
20. MKDocs Material - MIT License
20. MKDocs Material - MIT License
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GenParse is a Python library for constrained generation with language models, sp

> **⚠️ Warning:** This library is currently in active development. We recommend frequently pulling the latest version to stay updated with improvements and bug fixes. Please report any bugs in [the issue tracker](https://github.com/probcomp/genparse/issues).
First time here? Go to our [Full Documentation](https://genparse.gen.dev/).
First time here? Go to our [Full Documentation](https://genparse.gen.dev/).


## Installation
Expand All @@ -32,7 +32,7 @@ This library supports an automated build using [GNU Make](https://www.gnu.org/so
git clone [email protected]:probcomp/genparse.git
cd genparse
```

#### 2. Create and activate a virtual environment. Using Conda (recommended):

```bash
Expand All @@ -44,14 +44,14 @@ Using Python's `venv` module:

```bash
python -m venv genparse
source genparse/bin/activate
source genparse/bin/activate
```
> **💡Tip**: On Windows, use `genparse\Scripts\activate`
#### 3. Install package in editable mode with pre-commit hooks

```bash
make env
make env
```

GenParse optionally depends on Rust for faster parsing. If you do not have Rust installed, you will prompted to do so. However, if you do not want to install Rust, you can also install the library without the Rust dependency via:
Expand Down Expand Up @@ -82,7 +82,7 @@ python examples/genparse_tiny_example.py

## Supported language models

Genparse currently supports the following HuggingFace language models. If you would like support for an additional model, please create an issue.
Genparse currently supports the following HuggingFace language models. If you would like support for an additional model, please create an issue.

| Name | HuggingFace Identifier |
|-------------------|--------------------------------------|
Expand Down
4 changes: 2 additions & 2 deletions amp/amp/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Redistribution and use in source and binary forms, with or without modification,

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Redistribution of the data is allowed only in a compressed format. Redistribution of the data in text formats is prohibited.
3. Redistribution of the data is allowed only in a compressed format. Redistribution of the data in text formats is prohibited.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit 4a572c2

Please sign in to comment.