Skip to content

Commit

Permalink
(Release v0.0.10) Update Auto Cuda + Torch WHL Installation Based On OS
Browse files Browse the repository at this point in the history
  • Loading branch information
ziqinyeow committed Nov 8, 2023
1 parent b10b372 commit 03c2b16
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"

[tool.poetry]
name = "juxtapose"
version = "0.0.9"
version = "0.0.10"
description = ""
authors = ["Zi Qin <ziqinyeow@gmail.com>"]
license = "MIT"
Expand Down Expand Up @@ -55,7 +55,7 @@ torch = [
# {platform = "darwin", url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp310-none-macosx_11_0_arm64.whl"},
{platform = 'win32', source = "torch+cu118", version = "2.0.1"},
{platform = "linux", version = "2.0.1"},
{platform = "darwin", source="torch+cu118", version = "2.0.1"},
{platform = "darwin", version = "2.0.1"},
]
onnx = "^1.14.0"
onnxruntime = {version = "^1.15.1", platform = "darwin"}
Expand All @@ -66,8 +66,8 @@ onnxruntime-gpu = [

[[tool.poetry.source]]
name = "torch+cu118"
url = "https://download.pytorch.org/whl/cpu"
# url = "https://download.pytorch.org/whl/cu118"
# url = "https://download.pytorch.org/whl/cpu"
url = "https://download.pytorch.org/whl/cu118"
priority = "explicit"

[tool.poetry.urls]
Expand Down
2 changes: 1 addition & 1 deletion src/juxtapose/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.0.9"
__version__ = "0.0.10"

from .rtm import RTM
from .detectors import GroundingDino, RTMDet, YOLOv8
Expand Down
4 changes: 3 additions & 1 deletion src/juxtapose/rtm.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

from typing import List, Union, Generator, Literal

import torch

from juxtapose.data import load_inference_source
from juxtapose.detectors import get_detector
from juxtapose.rtmpose import RTMPose
Expand Down Expand Up @@ -56,7 +58,7 @@ def __init__(
det: DETECTOR_TYPES = "rtmdet-m",
pose: POSE_ESTIMATOR_TYPES = "rtmpose-m",
tracker: TRACKER_TYPES = "bytetrack",
device: DEVICE_TYPES = "cpu",
device: DEVICE_TYPES = torch.device("cuda" if torch.cuda.is_available() else "cpu"),
annotator=Annotator(),
) -> None:
self.det = self.setup_detector(det, device)
Expand Down

0 comments on commit 03c2b16

Please sign in to comment.