From bed00c52fa6fbd9bda76f0f4d2fa2e7c0ff08922 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 8 Feb 2018 19:48:54 +0100 Subject: [PATCH] Update to Python 3 syntax. --- utils/prefetch_queue_shuffle.py | 4 ++-- voxel_flow_train.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/prefetch_queue_shuffle.py b/utils/prefetch_queue_shuffle.py index 5d391a9..b488649 100755 --- a/utils/prefetch_queue_shuffle.py +++ b/utils/prefetch_queue_shuffle.py @@ -3,7 +3,7 @@ from __future__ import print_function import glob import numpy as np import os -import Queue +import queue import random import scipy from scipy import misc @@ -55,7 +55,7 @@ class PrefetchQueue(object): # Start prefetching thread # self.prefetch_queue = Queue.Queue(maxsize=prefetch_size) - self.prefetch_queue = Queue.PriorityQueue(maxsize=prefetch_size) + self.prefetch_queue = queue.PriorityQueue(maxsize=prefetch_size) for k in range(num_workers): t = threading.Thread(target=prefetch_job, args=(self.load_fn, self.prefetch_queue, self.data_list, diff --git a/voxel_flow_train.py b/voxel_flow_train.py index f6d3abb..4440e79 100755 --- a/voxel_flow_train.py +++ b/voxel_flow_train.py @@ -118,7 +118,7 @@ def train(dataset_frame1, dataset_frame2, dataset_frame3): # load_fn_frame3 = partial(dataset_frame3.process_func) # p_queue_frame3 = PrefetchQueue(load_fn_frame3, data_list_frame3, FLAGS.batch_size, shuffle=False, num_workers=num_workers) - for step in xrange(0, FLAGS.max_steps): + for step in range(0, FLAGS.max_steps): batch_idx = step % epoch_num batch_data_list_frame1 = data_list_frame1[int(batch_idx * FLAGS.batch_size) : int((batch_idx + 1) * FLAGS.batch_size)] -- 2.39.2