Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove leftover merge conflict line from setup script. #2141

Merged
merged 1 commit into from
May 28, 2024

Conversation

monorimet
Copy link
Collaborator

No description provided.

@monorimet monorimet requested a review from gpetters94 May 28, 2024 17:28
@monorimet monorimet enabled auto-merge (squash) May 28, 2024 17:29
@monorimet monorimet requested a review from IanNod May 28, 2024 17:29
@monorimet monorimet merged commit 8146f0b into main May 28, 2024
2 checks passed
monorimet added a commit that referenced this pull request May 28, 2024
* Update requirements.txt for iree-turbine (#2130)

* Fix Llama2 on CPU (#2133)

* Filesystem cleanup and custom model fixes (#2127)

* Initial filesystem cleanup

* More filesystem cleanup

* Fix some formatting issues

* Address comments

* Remove IREE pin (fixes exe issue) (#2126)

* Diagnose a build issue

* Remove IREE pin

* Revert the build on pull request change

* Update find links for IREE packages (#2136)

* (Studio2) Refactors SD pipeline to rely on turbine-models pipeline, fixes to LLM, gitignore (#2129)

* Shark Studio SDXL support, HIP driver support, simpler device info, small fixes

* Fixups to llm API/UI and ignore user config files.

* Small fixes for unifying pipelines.

* Update requirements.txt for iree-turbine (#2130)

* Fix Llama2 on CPU (#2133)

* Filesystem cleanup and custom model fixes (#2127)

* Fix some formatting issues

* Remove IREE pin (fixes exe issue) (#2126)

* Update find links for IREE packages (#2136)

* Shark Studio SDXL support, HIP driver support, simpler device info, small fixes

* Abstract out SD pipelines from Studio Webui (WIP)

* Switch from pin to minimum torch version and fix index url

* Fix device parsing.

* Fix linux setup

* Fix custom weights.

---------

Co-authored-by: saienduri <[email protected]>
Co-authored-by: gpetters-amd <[email protected]>
Co-authored-by: gpetters94 <[email protected]>

* Remove leftover merge conflict line from setup script. (#2141)

* Add a few requirements for ensured parity with turbine-models requirements. (#2142)

* Add scipy to requirements.

Adds diffusers req and a note for torchsde.

* Update linux setup script.

* Move brevitas install

---------

Co-authored-by: saienduri <[email protected]>
Co-authored-by: gpetters-amd <[email protected]>
Co-authored-by: gpetters94 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants