Incorporate module import enhancement.

wala/ML#202.

edu.cuny.hunter.hybridize.tests/.pydevproject

@@ -10,5 +10,9 @@
         <path>/${PROJECT_DIR_NAME}/resources/HybridizeFunction/testModule5/in</path>
         <path>/${PROJECT_DIR_NAME}/resources/HybridizeFunction/testModule6/in</path>
         <path>/${PROJECT_DIR_NAME}/resources/HybridizeFunction/testModule7/in</path>
+        <path>/${PROJECT_DIR_NAME}/resources/HybridizeFunction/testModule17/in</path>
+        <path>/${PROJECT_DIR_NAME}/resources/HybridizeFunction/testModule18/in</path>
+        <path>/${PROJECT_DIR_NAME}/resources/HybridizeFunction/testModule19/in</path>
+        <path>/${PROJECT_DIR_NAME}/resources/HybridizeFunction/testModule20/in</path>
     </pydev_pathproperty>
 </pydev_project>

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule17/in/A.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import ones
+from src import f
+
+f(ones([1, 2]))

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule17/in/requirements.txt

@@ -0,0 +1 @@
+tensorflow==2.9.3

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule17/in/src/B.py

@@ -0,0 +1,7 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import Tensor
+
+
+def f(a):
+    assert isinstance(a, Tensor)

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule17/in/src/__init__.py

@@ -0,0 +1 @@
+from .B import f

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule18/in/A.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import ones
+from src import f
+
+f(ones([1, 2]))

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule18/in/requirements.txt

@@ -0,0 +1 @@
+tensorflow==2.9.3

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule18/in/src/B.py

@@ -0,0 +1,7 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import Tensor
+
+
+def f(a):
+    assert isinstance(a, Tensor)

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule18/in/src/__init__.py

@@ -0,0 +1 @@
+from .B import *

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule19/in/A.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import ones
+from src import C
+
+C().f(ones([1, 2]))

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule19/in/requirements.txt

@@ -0,0 +1 @@
+tensorflow==2.9.3

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule19/in/src/B.py

@@ -0,0 +1,9 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import Tensor
+
+
+class C:
+
+    def f(self, a):
+        assert isinstance(a, Tensor)

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule19/in/src/__init__.py

@@ -0,0 +1 @@
+from .B import C

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule20/in/A.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import ones
+from src import C
+
+C().f(ones([1, 2]))

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule20/in/requirements.txt

@@ -0,0 +1 @@
+tensorflow==2.9.3

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule20/in/src/B.py

@@ -0,0 +1,9 @@
+# Test https://github.com/wala/ML/issues/163.
+
+from tensorflow import Tensor
+
+
+class C:
+
+    def f(self, a):
+        assert isinstance(a, Tensor)

edu.cuny.hunter.hybridize.tests/resources/HybridizeFunction/testModule20/in/src/__init__.py

@@ -0,0 +1 @@
+from .B import *

edu.cuny.hunter.hybridize.tests/test cases/edu/cuny/hunter/hybridize/tests/HybridizeFunctionRefactoringTest.java

@@ -7525,6 +7525,54 @@ public void testModule16() throws Exception {
 		assertTrue(function.getHasTensorParameter());
 	}
 
+	@Test
+	public void testModule17() throws Exception {
+		Set<Function> functions = this.getFunctions("src/B");
+		assertEquals(1, functions.size());
+		Function function = functions.iterator().next();
+
+		assertEquals("f", function.getIdentifier());
+		assertEquals(1, function.getNumberOfParameters());
+		assertFalse(function.isMethod());
+		assertTrue(function.getHasTensorParameter());
+	}
+
+	@Test
+	public void testModule18() throws Exception {
+		Set<Function> functions = this.getFunctions("src/B");
+		assertEquals(1, functions.size());
+		Function function = functions.iterator().next();
+
+		assertEquals("f", function.getIdentifier());
+		assertEquals(1, function.getNumberOfParameters());
+		assertFalse(function.isMethod());
+		assertTrue(function.getHasTensorParameter());
+	}
+
+	@Test
+	public void testModule19() throws Exception {
+		Set<Function> functions = this.getFunctions("src/B");
+		assertEquals(1, functions.size());
+		Function function = functions.iterator().next();
+
+		assertEquals("C.f", function.getIdentifier());
+		assertEquals(2, function.getNumberOfParameters());
+		assertTrue(function.isMethod());
+		assertTrue(function.getHasTensorParameter());
+	}
+
+	@Test
+	public void testModule20() throws Exception {
+		Set<Function> functions = this.getFunctions("src/B");
+		assertEquals(1, functions.size());
+		Function function = functions.iterator().next();
+
+		assertEquals("C.f", function.getIdentifier());
+		assertEquals(2, function.getNumberOfParameters());
+		assertTrue(function.isMethod());
+		assertTrue(function.getHasTensorParameter());
+	}
+
 	@Test
 	public void testBooleanMask() throws Exception {
 		Set<Function> functions = this.getFunctions();

hybridize.target

@@ -29,7 +29,7 @@
 				<dependency>
 					<groupId>com.ibm.wala</groupId>
 					<artifactId>com.ibm.wala.cast.python.ml</artifactId>
-					<version>0.35.0-SNAPSHOT</version>
+					<version>0.36.0-SNAPSHOT</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>