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.

Sign up for GitHub

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

Jump to bottom

adapt to numpy20.0+ and Python3.10+ versions #200

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

adapt to numpy20.0+ and Python3.10+ versions #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/data/EvalDataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def __len__(self):

def get_n_person(self, index):
rect_path = self.img_files[index].replace('.%s' % (self.img_files[index].split('.')[-1]), '_rect.txt')
rects = np.loadtxt(rect_path, dtype=np.int32)
rects = np.loadtxt(rect_path, dtype=int32)

return rects.shape[0] if len(rects.shape) == 2 else 1

Expand All @@ -84,7 +84,7 @@ def get_item(self, index):

trans_mat = np.identity(4)

rects = np.loadtxt(rect_path, dtype=np.int32)
rects = np.loadtxt(rect_path, dtype=int32)
if len(rects.shape) == 1:
rects = rects[None]
pid = min(rects.shape[0]-1, self.person_id)
Expand Down
8 changes: 4 additions & 4 deletions lib/data/EvalWPoseDataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def face_crop(pts):

# radius = np.max(np.sqrt(((center[None] - np.stack([]))**2).sum(0))
# radius = int(1.0*abs(center[1] - mshoulder[1]))
center = center.astype(np.int)
center = center.astype(int)

x1 = center[0] - radius
x2 = center[0] + radius
Expand Down Expand Up @@ -97,7 +97,7 @@ def upperbody_crop(pts):
ps = np.stack(ps, 0)
radius = int(0.8*np.max(np.sqrt(((ps - center[None,:])**2).reshape(-1,2).sum(1)) / np.array(ratio)))

center = center.astype(np.int)
center = center.astype(int)

x1 = center[0] - radius
x2 = center[0] + radius
Expand All @@ -113,7 +113,7 @@ def fullbody_crop(pts):
cnt = sum(flags[check_id])

if cnt == 0:
center = pts[8,:2].astype(np.int)
center = pts[8,:2].astype(int)
pts = pts[pts[:,2] > 0.5][:,:2]
radius = int(1.45*np.sqrt(((center[None,:] - pts)**2).sum(1)).max(0))
center[1] += int(0.05*radius)
Expand All @@ -122,7 +122,7 @@ def fullbody_crop(pts):
pmax = pts.max(0)
pmin = pts.min(0)

center = (0.5 * (pmax[:2] + pmin[:2])).astype(np.int)
center = (0.5 * (pmax[:2] + pmin[:2])).astype(int)
radius = int(0.65 * max(pmax[0]-pmin[0], pmax[1]-pmin[1]))

x1 = center[0] - radius
Expand Down
4 changes: 2 additions & 2 deletions lib/sdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ def eval_grid_octree(coords, eval_func,

sdf = np.zeros(resolution)

notprocessed = np.zeros(resolution, dtype=np.bool)
notprocessed = np.zeros(resolution, dtype=bool)
notprocessed[:-1,:-1,:-1] = True
grid_mask = np.zeros(resolution, dtype=np.bool)
grid_mask = np.zeros(resolution, dtype=bool)

reso = resolution[0] // init_resolution

Expand Down