Myosotis-Researches 0.0.11__tar.gz → 0.0.13__tar.gz

{myosotis_researches-0.0.11 → myosotis_researches-0.0.13/Myosotis_Researches.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Myosotis-Researches
-Version: 0.0.11
+Version: 0.0.13
 Summary: A repository for storing my progress of researches.
 Home-page: https://github.com/Zeyu-Xie/Myosotis-Researches
 Author: Zeyu Xie

{myosotis_researches-0.0.11/Myosotis_Researches.egg-info → myosotis_researches-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Myosotis-Researches
-Version: 0.0.11
+Version: 0.0.13
 Summary: A repository for storing my progress of researches.
 Home-page: https://github.com/Zeyu-Xie/Myosotis-Researches
 Author: Zeyu Xie

{myosotis_researches-0.0.11 → myosotis_researches-0.0.13}/myosotis_researches/CcGAN/utils/make_h5.py

@@ -5,10 +5,20 @@ from PIL import Image
 from print_hdf5_structure import print_hdf5_structure
 
 # Make all images to a HDF5 file
-def make_h5(image_dir: str, h5_path: str, image_names: list[str], image_labels, image_types):
+def make_h5(image_dir, h5_path, image_names = [], indx_train = None, indx_valid = None, image_labels = None, image_types = None):
 
     N = len(image_names)
 
+    # Process none
+    if indx_train == None:
+        indx_train = np.array(range(1, N, 2), dtype=np.int32)
+    if indx_valid == None:
+        indx_valid = np.array(range(0, N, 2), dtype=np.int32)
+    if image_labels == None:
+        image_labels = np.zeros(N)
+    if image_types == None:
+        image_types = np.zeros(N)
+
     # Get image data
     image_datas = []
     for i in range(N):
@@ -17,19 +27,13 @@ def make_h5(image_dir: str, h5_path: str, image_names: list[str], image_labels,
         image = Image.open(image_path).convert("RGB")
         rgb_array = np.array(image).transpose((2, 0, 1))
         image_datas.append(rgb_array)
-    img_datas = np.array(img_datas, dtype=np.uint8)
-
-    # Set train_idx = 1, 3, 5, ...
-    train_idx = np.array(range(1, N, 2), dtype=np.int32)
-
-    # Set val_idx = 0, 2, 4, ...
-    val_idx = np.array(range(0, N, 2), dtype=np.int32)
+    image_datas = np.array(image_datas, dtype=np.uint8)
 
     # Create a new HDF5 file
     with h5py.File(h5_path, "w") as f:
         f.create_dataset("images", data=image_datas)
-        f.create_dataset("indx_train", data=train_idx)
-        f.create_dataset("indx_valid", data=val_idx)
+        f.create_dataset("indx_train", data=indx_train)
+        f.create_dataset("indx_valid", data=indx_valid)
         f.create_dataset("labels", data=image_labels)
         f.create_dataset("types", data=image_types)
 

{myosotis_researches-0.0.11 → myosotis_researches-0.0.13}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="Myosotis-Researches",
-    version="0.0.11",
+    version="0.0.13",
     description="A repository for storing my progress of researches.",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",