fix h5py warning

lidq92 · Nov 7, 2019 · c26faaf · c26faaf
1 parent 9c65827
commit c26faaf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/main.py b/main.py
@@ -132,7 +132,7 @@ def __init__(self, args, status='train', loader=default_loader):
         self.n_patches = args.n_patches
         self.loader = loader
 
-        Info = h5py.File(args.data_info)
+        Info = h5py.File(args.data_info, 'r')
         index = Info['index']
         index = index[:, args.exp_id % index.shape[1]]
         ref_ids = Info['ref_ids'][0, :]  #
@@ -165,8 +165,8 @@ def __init__(self, args, status='train', loader=default_loader):
         self.scale = Info['subjective_scores'][0, :].max()
         self.mos = Info['subjective_scores'][0, self.index] / self.scale #
         self.mos_std = Info['subjective_scoresSTD'][0, self.index] / self.scale #
-        im_names = [Info[Info['im_names'][0, :][i]].value.tobytes()[::2].decode() for i in self.index]
-        ref_names = [Info[Info['ref_names'][0, :][i]].value.tobytes()[::2].decode()
+        im_names = [Info[Info['im_names'][0, :][i]][()].tobytes()[::2].decode() for i in self.index]
+        ref_names = [Info[Info['ref_names'][0, :][i]][()].tobytes()[::2].decode()
                      for i in (ref_ids[self.index]-1).astype(int)]
 
         self.patches = ()
@@ -215,7 +215,7 @@ def __init__(self, args, status='train', loader=default_loader):
         self.patch_size = args.patch_size
         self.n_patches = args.n_patches
 
-        Info = h5py.File(args.data_info)
+        Info = h5py.File(args.data_info, 'r')
         index = Info['index']
         index = index[:, args.exp_id % index.shape[1]]
         ref_ids = Info['ref_ids'][0, :]  #
@@ -248,8 +248,8 @@ def __init__(self, args, status='train', loader=default_loader):
         self.scale = Info['subjective_scores'][0, :].max()
         self.mos = Info['subjective_scores'][0, self.index] / self.scale #
         self.mos_std = Info['subjective_scoresSTD'][0, self.index] / self.scale #
-        im_names = [Info[Info['im_names'][0, :][i]].value.tobytes()[::2].decode() for i in self.index]
-        ref_names = [Info[Info['ref_names'][0, :][i]].value.tobytes()[::2].decode()
+        im_names = [Info[Info['im_names'][0, :][i]][()].tobytes()[::2].decode() for i in self.index]
+        ref_names = [Info[Info['ref_names'][0, :][i]][()].tobytes()[::2].decode()
                      for i in (ref_ids[self.index]-1).astype(int)]
 
         self.patches = ()

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-h5py==2.7.1
+h5py==2.10.0
 numpy==1.14.2
 scipy==1.0.1
 tensorflow-gpu==1.0.0

diff --git a/test_cross_dataset.py b/test_cross_dataset.py
@@ -38,10 +38,10 @@
 
     model.load_state_dict(torch.load(args.model_file))
 
-    Info = h5py.File(args.names_info)
-    im_names = [Info[Info['im_names'][0, :][i]].value.tobytes()\
+    Info = h5py.File(args.names_info, 'r')
+    im_names = [Info[Info['im_names'][0, :][i]][()].tobytes()\
                         [::2].decode() for i in range(len(Info['im_names'][0, :]))]
-    ref_names = [Info[Info['ref_names'][0, :][i]].value.tobytes()\
+    ref_names = [Info[Info['ref_names'][0, :][i]][()].tobytes()\
                         [::2].decode() for i in (Info['ref_ids'][0, :]-1).astype(int)]
 
     model.eval()