From 49dd380947e57b7a29e0a5d06e10ef59e8d819c4 Mon Sep 17 00:00:00 2001 From: Ambrosiussen Date: Sun, 10 Sep 2023 14:42:19 +0200 Subject: [PATCH 1/6] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 372f325..048415f 100644 --- a/setup.py +++ b/setup.py @@ -123,7 +123,7 @@ def get_version(): tests_require=['pytest'], install_requires=[ 'numpy', 'six', 'terminaltables', 'scipy', - 'cython', 'opencv-python==4.1.2.30', 'matplotlib', + 'cython', 'opencv-python>=4.1.2.30', 'matplotlib', 'pycocotools', 'tqdm', 'easydict', 'chumpy', 'pyyaml', 'tb-nightly', 'future', 'ffmpeg-python', 'joblib' From 583877143ee934ca0d01ddee46de0d35be115b73 Mon Sep 17 00:00:00 2001 From: Paul Ambrosiussen Date: Sun, 10 Sep 2023 15:12:56 +0200 Subject: [PATCH 2/6] Create __init__.py --- hybrik/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hybrik/__init__.py diff --git a/hybrik/__init__.py b/hybrik/__init__.py new file mode 100644 index 0000000..e69de29 From aa195d7cde9874b0504740b10cd35375c6825e97 Mon Sep 17 00:00:00 2001 From: Paul Ambrosiussen Date: Sun, 10 Sep 2023 16:01:31 +0200 Subject: [PATCH 3/6] missing inits --- hybrik/models/layers/__init__.py | 0 hybrik/models/layers/hrnet/__init__.py | 0 hybrik/models/layers/smpl/__init__.py | 0 hybrik/models/layers/smplx/__init__.py | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 hybrik/models/layers/__init__.py create mode 100644 hybrik/models/layers/hrnet/__init__.py create mode 100644 hybrik/models/layers/smpl/__init__.py create mode 100644 hybrik/models/layers/smplx/__init__.py diff --git a/hybrik/models/layers/__init__.py b/hybrik/models/layers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hybrik/models/layers/hrnet/__init__.py b/hybrik/models/layers/hrnet/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hybrik/models/layers/smpl/__init__.py b/hybrik/models/layers/smpl/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hybrik/models/layers/smplx/__init__.py b/hybrik/models/layers/smplx/__init__.py new file mode 100644 index 0000000..e69de29 From b7949b30168cd1b299a20c08322aefe9f56df4ba Mon Sep 17 00:00:00 2001 From: Paul Ambrosiussen Date: Sat, 16 Sep 2023 21:02:33 +0200 Subject: [PATCH 4/6] update setup --- hybrik/version.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hybrik/version.py b/hybrik/version.py index c9759d0..062f1d5 100644 --- a/hybrik/version.py +++ b/hybrik/version.py @@ -1,5 +1,5 @@ # GENERATED VERSION FILE -# TIME: Wed May 31 16:40:54 2023 +# TIME: Wed Sep 13 09:58:05 2023 -__version__ = '0.2.0+aa1ef5e' +__version__ = '0.2.0+aa195d7' short_version = '0.2.0' diff --git a/setup.py b/setup.py index 048415f..1cae5fc 100644 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ def get_version(): long_description=readme(), keywords='computer vision, human pose and shape estimation', packages=find_packages(exclude=('data', 'exp',)), - package_data={'': ['*.json', '*.txt']}, + package_data={'': ['*.json', '*.txt', "*.yaml"]}, classifiers=[ 'Development Status :: 4 - Beta', 'License :: OSI Approved :: Apache Software License', From 4c329bf55dcd375233fc0fdd51c6da948ab58503 Mon Sep 17 00:00:00 2001 From: Ambrosiussen Date: Fri, 9 Feb 2024 21:45:16 +0100 Subject: [PATCH 5/6] Update version.py --- hybrik/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hybrik/version.py b/hybrik/version.py index 062f1d5..f232f7a 100644 --- a/hybrik/version.py +++ b/hybrik/version.py @@ -1,5 +1,5 @@ # GENERATED VERSION FILE -# TIME: Wed Sep 13 09:58:05 2023 +# TIME: Fri Feb 9 21:44:32 2024 -__version__ = '0.2.0+aa195d7' +__version__ = '0.2.0+b7949b3' short_version = '0.2.0' From e2341959d3d2c44244044125673864f24cd625f4 Mon Sep 17 00:00:00 2001 From: Ambrosiussen Date: Sat, 10 Feb 2024 01:31:06 +0100 Subject: [PATCH 6/6] Fix pathing --- hybrik/models/HRNetWithCam.py | 2 +- hybrik/models/layers/hrnet/hrnet.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hybrik/models/HRNetWithCam.py b/hybrik/models/HRNetWithCam.py index 721a275..85ff9fc 100644 --- a/hybrik/models/HRNetWithCam.py +++ b/hybrik/models/HRNetWithCam.py @@ -65,7 +65,7 @@ def __init__(self, norm_layer=nn.BatchNorm2d, **kwargs): self.preact = get_hrnet(kwargs['HRNET_TYPE'], num_joints=self.num_joints, depth_dim=self.depth_dim, - is_train=True, generate_feat=True, generate_hm=True) + is_train=True, generate_feat=True, generate_hm=True, ROOT=kwargs["ROOT"]) # # Load pretrain model # model_state = self.preact.state_dict() diff --git a/hybrik/models/layers/hrnet/hrnet.py b/hybrik/models/layers/hrnet/hrnet.py index 11e2972..7649a15 100644 --- a/hybrik/models/layers/hrnet/hrnet.py +++ b/hybrik/models/layers/hrnet/hrnet.py @@ -610,7 +610,8 @@ def load_hrnet_cfg(file_name): def get_hrnet(type_name, num_joints, depth_dim, **kwargs): - cfg = load_hrnet_cfg(f'./hybrik/models/layers/hrnet/w{type_name}.yaml') + ROOT = kwargs['ROOT'] + cfg = load_hrnet_cfg(f'{ROOT}/models/layers/hrnet/w{type_name}.yaml') cfg['MODEL']['NUM_JOINTS'] = num_joints cfg['MODEL']['DEPTH_DIM'] = depth_dim