From 82be234706dc043aa624055084c8628687f0635f Mon Sep 17 00:00:00 2001 From: lty12b9b0a1 Date: Tue, 21 Mar 2023 09:31:19 -0400 Subject: [PATCH 1/2] fix bug that failure to add Resize to transforms --- MLclf/MLclf.py | 9 ++++++++- MLclf/__pycache__/MLclf.cpython-38.pyc | Bin 0 -> 14780 bytes MLclf/__pycache__/__init__.cpython-38.pyc | Bin 0 -> 171 bytes 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 MLclf/__pycache__/MLclf.cpython-38.pyc create mode 100644 MLclf/__pycache__/__init__.cpython-38.pyc diff --git a/MLclf/MLclf.py b/MLclf/MLclf.py index 7f908b8..39c6a51 100644 --- a/MLclf/MLclf.py +++ b/MLclf/MLclf.py @@ -290,7 +290,14 @@ def _feature_norm(feature, transform=None): else: transform = transform feature_shape = np.shape(feature) - feature_output = torch.empty((feature_shape[0], feature_shape[3], feature_shape[1], feature_shape[2])) + for trans in transform.transforms: + if isinstance(trans, transforms.Resize): + transform_has_resize = True + resize_size = trans.size + if transform_has_resize: + feature_output = torch.empty((feature_shape[0], feature_shape[3], resize_size[0], resize_size[1])) + else: + feature_output = torch.empty((feature_shape[0], feature_shape[3], feature_shape[1], feature_shape[2])) for i, feature_i in enumerate(feature): feature_output[i] = transform(feature_i) # feature is a tensor here. diff --git a/MLclf/__pycache__/MLclf.cpython-38.pyc b/MLclf/__pycache__/MLclf.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e3922b958a97e3578dd817a882f641e9500aaaa1 GIT binary patch literal 14780 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 Q(^1Z)gD4HST}|u%4_ZmuQvd(} literal 0 HcmV?d00001 diff --git a/MLclf/__pycache__/__init__.cpython-38.pyc b/MLclf/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e23a093f37185c9088daf97f45ac381498567bd3 GIT binary patch literal 171 zcmWIL<>g`k0=vbMDUv|?F^Gc(44TX@fg%i=jJFuI z{4^P(xP5(+bJFy{=UzwPnm6@ksQk0lioR(UoucxOE jRu3iP<1_OzOXB183My}L*yQG?l;)(`F#-+x46+FTH$*1R literal 0 HcmV?d00001 From 743f0d919023174bf8c0fdc58264584482a5dee3 Mon Sep 17 00:00:00 2001 From: lty12b9b0a1 Date: Tue, 21 Mar 2023 09:58:25 -0400 Subject: [PATCH 2/2] test --- MLclf/MLclf.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/MLclf/MLclf.py b/MLclf/MLclf.py index 39c6a51..8a6877a 100644 --- a/MLclf/MLclf.py +++ b/MLclf/MLclf.py @@ -643,8 +643,6 @@ def tinyimagenet_data_raw(data_dir=None): print('train_dataset: ', train_dataset, np.shape(train_dataset)) - - """ Note for updating to PyPi website: python3 setup.py sdist bdist_wheel @@ -666,9 +664,4 @@ def tinyimagenet_data_raw(data_dir=None): shuffle=True, num_workers=0) """ - - - - - - + \ No newline at end of file