Start switching np.load(...,allow_pickle=True) as needed

Even though these 2x calls load .npz files, they contain NumPy object
arrays of ShotList class objects that are implicitly serialized by
Pickle via np.savez() calls.

Also, fix bug with sorted(ShotList) being converted to a List instead of
a ShotList.

Author: felker

plasma/preprocessor/preprocess.py

@@ -138,7 +138,7 @@ def get_shot_list_path(self):
 
     def load_shotlists(self):
         path = self.get_shot_list_path()
-        data = np.load(path, encoding="latin1", allow_pickle=False)
+        data = np.load(path, encoding="latin1", allow_pickle=True)
         shot_list_train = data['shot_list_train'][()]
         shot_list_validate = data['shot_list_validate'][()]
         shot_list_test = data['shot_list_test'][()]
@@ -239,7 +239,8 @@ def guarantee_preprocessed(conf):
     else:
         print("preprocessing all shots", end='')
         pp.clean_shot_lists()
-        shot_list = sorted(pp.preprocess_all())
+        shot_list = pp.preprocess_all()
+        shot_list.sort()
         shot_list_train, shot_list_test = shot_list.split_train_test(conf)
         # num_shots = len(shot_list_train) + len(shot_list_test)
         validation_frac = conf['training']['validation_frac']

plasma/primitives/shots.py

@@ -498,7 +498,7 @@ def get_save_path(self, prepath):
     def restore(self, prepath, light=False):
         assert self.previously_saved(prepath), 'shot was never saved'
         save_path = self.get_save_path(prepath)
-        dat = np.load(save_path, encoding="latin1", allow_pickle=False)
+        dat = np.load(save_path, encoding="latin1", allow_pickle=True)
 
         self.valid = dat['valid'][()]
         self.is_disruptive = dat['is_disruptive'][()]