Skip to content

Commit

Permalink
Merge pull request #100 from probcomp/windows-build-fixes
Browse files Browse the repository at this point in the history
Minor changes to support Windows install.
  • Loading branch information
benlebrun authored Nov 20, 2024
2 parents e445f60 + 3336f5c commit f9cbb78
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,16 @@ $(NAME).egg-info/ : setup.py
@( \
trap 'status=$$?; if [ -f pyproject.toml.bak ]; then mv pyproject.toml.bak pyproject.toml; fi; exit $$status' EXIT; \
set -e; \
if [ "$$(uname -s)" = "Darwin" ]; then \
echo "Skipping vllm installation on macOS. GPU-accelerated inference with vllm will not be available."; \
if [ "$(OS)" = "Windows_NT" ]; then \
echo "Skipping vllm installation on Windows. GPU-accelerated inference with vllm will not be available."; \
$(INSTALL) -e ".[test]" && pre-commit install; \
else \
$(INSTALL) -e ".[test,vllm]" && pre-commit install; \
if [ "$$(uname -s)" = "Darwin" ]; then \
echo "Skipping vllm installation on macOS. GPU-accelerated inference with vllm will not be available."; \
$(INSTALL) -e ".[test]" && pre-commit install; \
else \
$(INSTALL) -e ".[test,vllm]" && pre-commit install; \
fi \
fi \
)
# build rust parser (only for 'env' target)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
'Ben LeBrun',
'Ben Lipkin',
],
readme=open('README.md').read(),
readme=open('README.md', encoding='utf-8').read(),
scripts=[],
packages=['genparse'],
)

0 comments on commit f9cbb78

Please sign in to comment.