-
-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rebased and resolved merge conflicts
- Loading branch information
Sanket Kale
committed
Nov 14, 2024
1 parent
b8ab3bc
commit 3d46d2e
Showing
3 changed files
with
12 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,7 @@ | ||
# Common dependencies | ||
-r requirements-common.txt | ||
|
||
<<<<<<< HEAD | ||
# Dependencies for x86_64 CPUs | ||
torch == 2.5.1+cpu; platform_machine != "ppc64le" | ||
torchvision; platform_machine != "ppc64le" # required for the image processor of phi3v, this must be updated alongside torch | ||
======= | ||
# Dependencies for CPUs | ||
torch==2.4.0+cpu; platform_machine != "ppc64le" and platform_machine != "aarch64" | ||
torch==2.4.0; platform_machine == "aarch64" | ||
torchvision; platform_machine != "ppc64le" # required for the image processor of phi3v, this must be updated alongside torch | ||
>>>>>>> ad80d348 (Enabled path for ARM machines) | ||
torch==2.5.1+cpu; platform_machine != "ppc64le" and platform_machine != "aarch64" | ||
torch==2.5.0; platform_machine == "aarch64" | ||
torchvision; platform_machine != "ppc64le" # required for the image processor of phi3v, this must be updated alongside torch |