From bfd53ddd2b6723dd6ef6dea7a3beed5323870d5d Mon Sep 17 00:00:00 2001 From: Roberto Tyley Date: Sun, 22 Oct 2023 23:08:41 +0100 Subject: [PATCH] Fix inconsistent pip package name This project is released as `segment-anything-hq` in pip: https://pypi.org/project/segment-anything-hq/ ...but the setup here just said `segment_anything`, which seems to be the cause of this error message: ``` WARNING: Generating metadata for package segment-anything-hq produced metadata for project name segment-anything ``` ...while trying to pip install a requirements file that had a line like this: ``` segment-anything-hq @ git+https://github.com/SysCV/sam-hq@5fd027ec559806dec9f876b56938175a63dfc625 ``` Full error logs: ``` Collecting segment-anything-hq@ git+https://github.com/SysCV/sam-hq@5fd027ec559806dec9f876b56938175a63dfc625 (from -r requirements.txt (line 9)) Cloning https://github.com/SysCV/sam-hq (to revision 5fd027ec559806dec9f876b56938175a63dfc625) to /private/var/folders/28/pjfz24p92bxcj5j7gsnnk9xm0000gp/T/pip-install-cmpqwucv/segment-anything-hq_bd753024d0a540f5bcb3225886933667 Running command git clone --filter=blob:none --quiet https://github.com/SysCV/sam-hq /private/var/folders/28/pjfz24p92bxcj5j7gsnnk9xm0000gp/T/pip-install-cmpqwucv/segment-anything-hq_bd753024d0a540f5bcb3225886933667 Running command git rev-parse -q --verify 'sha^5fd027ec559806dec9f876b56938175a63dfc625' Running command git fetch -q https://github.com/SysCV/sam-hq 5fd027ec559806dec9f876b56938175a63dfc625 Resolved https://github.com/SysCV/sam-hq to commit 5fd027ec559806dec9f876b56938175a63dfc625 Installing build dependencies ... done Getting requirements to build wheel ... done Preparing metadata (pyproject.toml) ... done WARNING: Generating metadata for package segment-anything-hq produced metadata for project name segment-anything. Fix your #egg=segment-anything-hq fragments. Discarding git+https://github.com/SysCV/sam-hq@5fd027ec559806dec9f876b56938175a63dfc625: Requested segment-anything from git+https://github.com/SysCV/sam-hq@5fd027ec559806dec9f876b56938175a63dfc625 (from -r requirements.txt (line 9)) has inconsistent name: expected 'segment-anything-hq', but metadata has 'segment-anything' ``` See also: https://github.com/pypa/pipenv/issues/5445#issuecomment-1297014393 --- demo/demo_hqsam.py | 2 +- demo/demo_hqsam_light.py | 2 +- {segment_anything => segment_anything_hq}/__init__.py | 0 .../automatic_mask_generator.py | 0 {segment_anything => segment_anything_hq}/build_sam.py | 0 {segment_anything => segment_anything_hq}/build_sam_baseline.py | 0 {segment_anything => segment_anything_hq}/modeling/__init__.py | 0 {segment_anything => segment_anything_hq}/modeling/common.py | 0 .../modeling/image_encoder.py | 0 .../modeling/mask_decoder.py | 0 .../modeling/mask_decoder_hq.py | 0 .../modeling/prompt_encoder.py | 0 {segment_anything => segment_anything_hq}/modeling/sam.py | 0 .../modeling/tiny_vit_sam.py | 0 .../modeling/transformer.py | 0 {segment_anything => segment_anything_hq}/predictor.py | 0 {segment_anything => segment_anything_hq}/utils/__init__.py | 0 {segment_anything => segment_anything_hq}/utils/amg.py | 0 {segment_anything => segment_anything_hq}/utils/onnx.py | 0 {segment_anything => segment_anything_hq}/utils/transforms.py | 0 setup.cfg | 2 +- setup.py | 2 +- 22 files changed, 4 insertions(+), 4 deletions(-) rename {segment_anything => segment_anything_hq}/__init__.py (100%) rename {segment_anything => segment_anything_hq}/automatic_mask_generator.py (100%) rename {segment_anything => segment_anything_hq}/build_sam.py (100%) rename {segment_anything => segment_anything_hq}/build_sam_baseline.py (100%) rename {segment_anything => segment_anything_hq}/modeling/__init__.py (100%) rename {segment_anything => segment_anything_hq}/modeling/common.py (100%) rename {segment_anything => segment_anything_hq}/modeling/image_encoder.py (100%) rename {segment_anything => segment_anything_hq}/modeling/mask_decoder.py (100%) rename {segment_anything => segment_anything_hq}/modeling/mask_decoder_hq.py (100%) rename {segment_anything => segment_anything_hq}/modeling/prompt_encoder.py (100%) rename {segment_anything => segment_anything_hq}/modeling/sam.py (100%) rename {segment_anything => segment_anything_hq}/modeling/tiny_vit_sam.py (100%) rename {segment_anything => segment_anything_hq}/modeling/transformer.py (100%) rename {segment_anything => segment_anything_hq}/predictor.py (100%) rename {segment_anything => segment_anything_hq}/utils/__init__.py (100%) rename {segment_anything => segment_anything_hq}/utils/amg.py (100%) rename {segment_anything => segment_anything_hq}/utils/onnx.py (100%) rename {segment_anything => segment_anything_hq}/utils/transforms.py (100%) diff --git a/demo/demo_hqsam.py b/demo/demo_hqsam.py index 363f520..0009403 100644 --- a/demo/demo_hqsam.py +++ b/demo/demo_hqsam.py @@ -2,7 +2,7 @@ import torch import matplotlib.pyplot as plt import cv2 -from segment_anything import sam_model_registry, SamPredictor +from segment_anything_hq import sam_model_registry, SamPredictor import os def show_mask(mask, ax, random_color=False): diff --git a/demo/demo_hqsam_light.py b/demo/demo_hqsam_light.py index 26a9fee..8723c26 100644 --- a/demo/demo_hqsam_light.py +++ b/demo/demo_hqsam_light.py @@ -2,7 +2,7 @@ import torch import matplotlib.pyplot as plt import cv2 -from segment_anything import sam_model_registry, SamPredictor +from segment_anything_hq import sam_model_registry, SamPredictor import os def show_mask(mask, ax, random_color=False): diff --git a/segment_anything/__init__.py b/segment_anything_hq/__init__.py similarity index 100% rename from segment_anything/__init__.py rename to segment_anything_hq/__init__.py diff --git a/segment_anything/automatic_mask_generator.py b/segment_anything_hq/automatic_mask_generator.py similarity index 100% rename from segment_anything/automatic_mask_generator.py rename to segment_anything_hq/automatic_mask_generator.py diff --git a/segment_anything/build_sam.py b/segment_anything_hq/build_sam.py similarity index 100% rename from segment_anything/build_sam.py rename to segment_anything_hq/build_sam.py diff --git a/segment_anything/build_sam_baseline.py b/segment_anything_hq/build_sam_baseline.py similarity index 100% rename from segment_anything/build_sam_baseline.py rename to segment_anything_hq/build_sam_baseline.py diff --git a/segment_anything/modeling/__init__.py b/segment_anything_hq/modeling/__init__.py similarity index 100% rename from segment_anything/modeling/__init__.py rename to segment_anything_hq/modeling/__init__.py diff --git a/segment_anything/modeling/common.py b/segment_anything_hq/modeling/common.py similarity index 100% rename from segment_anything/modeling/common.py rename to segment_anything_hq/modeling/common.py diff --git a/segment_anything/modeling/image_encoder.py b/segment_anything_hq/modeling/image_encoder.py similarity index 100% rename from segment_anything/modeling/image_encoder.py rename to segment_anything_hq/modeling/image_encoder.py diff --git a/segment_anything/modeling/mask_decoder.py b/segment_anything_hq/modeling/mask_decoder.py similarity index 100% rename from segment_anything/modeling/mask_decoder.py rename to segment_anything_hq/modeling/mask_decoder.py diff --git a/segment_anything/modeling/mask_decoder_hq.py b/segment_anything_hq/modeling/mask_decoder_hq.py similarity index 100% rename from segment_anything/modeling/mask_decoder_hq.py rename to segment_anything_hq/modeling/mask_decoder_hq.py diff --git a/segment_anything/modeling/prompt_encoder.py b/segment_anything_hq/modeling/prompt_encoder.py similarity index 100% rename from segment_anything/modeling/prompt_encoder.py rename to segment_anything_hq/modeling/prompt_encoder.py diff --git a/segment_anything/modeling/sam.py b/segment_anything_hq/modeling/sam.py similarity index 100% rename from segment_anything/modeling/sam.py rename to segment_anything_hq/modeling/sam.py diff --git a/segment_anything/modeling/tiny_vit_sam.py b/segment_anything_hq/modeling/tiny_vit_sam.py similarity index 100% rename from segment_anything/modeling/tiny_vit_sam.py rename to segment_anything_hq/modeling/tiny_vit_sam.py diff --git a/segment_anything/modeling/transformer.py b/segment_anything_hq/modeling/transformer.py similarity index 100% rename from segment_anything/modeling/transformer.py rename to segment_anything_hq/modeling/transformer.py diff --git a/segment_anything/predictor.py b/segment_anything_hq/predictor.py similarity index 100% rename from segment_anything/predictor.py rename to segment_anything_hq/predictor.py diff --git a/segment_anything/utils/__init__.py b/segment_anything_hq/utils/__init__.py similarity index 100% rename from segment_anything/utils/__init__.py rename to segment_anything_hq/utils/__init__.py diff --git a/segment_anything/utils/amg.py b/segment_anything_hq/utils/amg.py similarity index 100% rename from segment_anything/utils/amg.py rename to segment_anything_hq/utils/amg.py diff --git a/segment_anything/utils/onnx.py b/segment_anything_hq/utils/onnx.py similarity index 100% rename from segment_anything/utils/onnx.py rename to segment_anything_hq/utils/onnx.py diff --git a/segment_anything/utils/transforms.py b/segment_anything_hq/utils/transforms.py similarity index 100% rename from segment_anything/utils/transforms.py rename to segment_anything_hq/utils/transforms.py diff --git a/setup.cfg b/setup.cfg index 0eee130..d8ce16a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ multi_line_output=3 include_trailing_comma=True known_standard_library=numpy,setuptools skip_glob=*/__init__.py -known_myself=segment_anything +known_myself=segment_anything_hq known_third_party=matplotlib,cv2,torch,torchvision,pycocotools,onnx,black,isort no_lines_before=STDLIB,THIRDPARTY sections=FUTURE,STDLIB,THIRDPARTY,MYSELF,FIRSTPARTY,LOCALFOLDER diff --git a/setup.py b/setup.py index 60e0c6c..3402c0a 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ from setuptools import find_packages, setup setup( - name="segment_anything", + name="segment_anything_hq", version="1.0", install_requires=[], packages=find_packages(exclude="notebooks"),