From aa26e0ff1c6206735de26e8592d2782a0803ce00 Mon Sep 17 00:00:00 2001 From: caggursoy-VM Date: Thu, 1 Aug 2024 12:25:02 +0200 Subject: [PATCH] Deprecated instances of np.int were replaced with np.int32 --- utime/models/utime.py | 2 +- utime/sequences/base_sequence.py | 2 +- utime/sequences/multi_sequence.py | 2 +- utime/utils/conv_arithmetics.py | 6 +++--- utime/utils/system.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utime/models/utime.py b/utime/models/utime.py index addaa53..76a174e 100755 --- a/utime/models/utime.py +++ b/utime/models/utime.py @@ -364,7 +364,7 @@ def crop_nodes_to_match(self, node1, node2): if np.any(s1 != s2): self.n_crops += 1 - c = (s1 - s2).astype(np.int) + c = (s1 - s2).astype(np.int32) cr = np.array([c // 2, c // 2]).flatten() cr[self.n_crops % 2] += c % 2 cropped_node1 = Cropping2D([list(cr), [0, 0]])(node1) diff --git a/utime/sequences/base_sequence.py b/utime/sequences/base_sequence.py index fcb0864..928815b 100755 --- a/utime/sequences/base_sequence.py +++ b/utime/sequences/base_sequence.py @@ -201,7 +201,7 @@ def get_class_counts(self): An ndarray of class counts across all stored SleepStudy objects Shape [self.n_classes], dtype np.int """ - counts = np.zeros(shape=[self.n_classes], dtype=np.int) + counts = np.zeros(shape=[self.n_classes], dtype=np.int32) for im in self.dataset_queue: count_dict = im.get_class_counts(as_dict=True) for cls, count in count_dict.items(): diff --git a/utime/sequences/multi_sequence.py b/utime/sequences/multi_sequence.py index 3206975..588ef9f 100644 --- a/utime/sequences/multi_sequence.py +++ b/utime/sequences/multi_sequence.py @@ -115,7 +115,7 @@ def total_periods(self): def get_class_counts(self): """ Returns the sum of class counts over all sequences """ - counts = np.zeros(shape=[self.sequences[0].n_classes], dtype=np.int) + counts = np.zeros(shape=[self.sequences[0].n_classes], dtype=np.int32) for seq in self.sequences: counts += seq.get_class_counts() return counts diff --git a/utime/utils/conv_arithmetics.py b/utime/utils/conv_arithmetics.py index 0f46583..e0f10fe 100644 --- a/utime/utils/conv_arithmetics.py +++ b/utime/utils/conv_arithmetics.py @@ -24,7 +24,7 @@ def output_features(in_filter_size, padding, kernel_size, stride=1, dim=2): stride], dim=dim) - return np.floor((in_filter_size + (2*padding) - kernel_size)/stride).astype(np.int) + 1 + return np.floor((in_filter_size + (2*padding) - kernel_size)/stride).astype(np.int32) + 1 def output_feature_distance(input_feature_distance, stride, dim=2): @@ -82,9 +82,9 @@ def compute_receptive_fields(layers, verbose=False): # Get potential dilation rates try: - dilation = np.array(layer.dilation_rate).astype(np.int) + dilation = np.array(layer.dilation_rate).astype(np.int32) except AttributeError: - dilation = np.ones(shape=[dim], dtype=np.int) + dilation = np.ones(shape=[dim], dtype=np.int32) if hasattr(layer, "dilations"): assert (dilation == 1).all() dilation = np.array(layer.dilations) diff --git a/utime/utils/system.py b/utime/utils/system.py index 0684417..e109552 100644 --- a/utime/utils/system.py +++ b/utime/utils/system.py @@ -34,7 +34,7 @@ def get_free_gpus(max_allowed_mem_usage=400): try: # Get list of GPUs gpu_list = check_output(["nvidia-smi", "-L"], universal_newlines=True) - gpu_ids = np.array(re.findall(r"GPU[ ]+(\d+)", gpu_list), dtype=np.int) + gpu_ids = np.array(re.findall(r"GPU[ ]+(\d+)", gpu_list), dtype=np.int32) # Query memory usage stats from nvidia-smi output = check_output(["nvidia-smi", "-q", "-d", "MEMORY"], universal_newlines=True)