Fix squeeze bug for length 1 array, and inconsistency on requirements and setup.py (#1540)

Author: brahmaneya

requirements.txt

@@ -19,7 +19,7 @@ tqdm>=4.33.0,<5.0.0
 # Internal models
 scikit-learn>=0.20.2,<0.22.0
 torch>=1.1.0,<1.2.0
-munkres==1.1.2
+munkres>=1.0.6
 
 # LF dependency learning
 networkx>=2.2,<2.4

setup.py

@@ -35,7 +35,7 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        "munkres==1.1.2",
+        "munkres>=1.0.6",
         "numpy>=1.16.0,<2.0.0",
         "scipy>=1.2.0,<2.0.0",
         "pandas>=0.25.0,<0.26.0",

snorkel/utils/core.py

@@ -121,6 +121,8 @@ def to_int_label_array(X: np.ndarray, flatten_vector: bool = True) -> np.ndarray
     # Correct shape
     if flatten_vector:
         X = X.squeeze()
+        if X.ndim == 0:
+            X = np.expand_dims(X, 0)
         if X.ndim != 1:
             raise ValueError("Input could not be converted to 1d np.array")
     return X

test/utils/test_core.py

@@ -21,6 +21,10 @@ def test_to_int_label_array(self):
         Y = to_int_label_array(X, flatten_vector=True)
         np.testing.assert_array_equal(Y, Y_expected)
 
+        Y = to_int_label_array(np.array([[1]]), flatten_vector=True)
+        Y_expected = np.array([1])
+        np.testing.assert_array_equal(Y, Y_expected)
+
         Y = to_int_label_array(X, flatten_vector=False)
         Y_expected = np.array([[1], [0], [2]])
         np.testing.assert_array_equal(Y, Y_expected)