Upgrade to Ariadne 0.22.0-SNAPSHOT.

ponder-lab · Jan 19, 2024 · 7a031ff · 7a031ff
1 parent 3961441
commit 7a031ff
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/edu.cuny.hunter.hybridize.core/tensorflow.xml b/edu.cuny.hunter.hybridize.core/tensorflow.xml
@@ -171,6 +171,9 @@
         <putfield class="LRoot" field="Input" fieldType="LRoot" ref="keras" value="Input" />
         <putfield class="LRoot" field="Input" fieldType="LRoot" ref="layers" value="Input" />
 
+        <new def="Dense" class="Ltensorflow/keras/layers/Dense" />
+        <putfield class="LRoot" field="Dense" fieldType="LRoot" ref="layers" value="Dense" />
+
         <new def="Variable" class="Ltensorflow/functions/Variable" />
         <putfield class="LRoot" field="Variable" fieldType="LRoot" ref="x" value="Variable" />
         <putfield class="LRoot" field="Variable" fieldType="LRoot" ref="variables" value="Variable" />
@@ -773,13 +776,9 @@
       </class>
 
       <class name="softmax" allocatable="true">
-        <method name="read_data" descriptor="()LRoot;">
-          <new def="x" class="Ltensorflow/functions/softmax" />
-          <return value="x" />
-        </method>
+        <!-- https://www.tensorflow.org/versions/r2.9/api_docs/python/tf/nn/softmax -->
         <method name="do" descriptor="()LRoot;" numArgs="4" paramNames="self logits axis name">
-          <call class="LRoot" name="read_data" descriptor="()LRoot;" type="virtual" arg0="arg0" def="x" />
-          <return value="x" />
+          <return value="logits" />
         </method>
       </class>
     </package>
@@ -804,6 +803,33 @@
       </class>
     </package>
 
+    <package name="tensorflow/keras/layers">
+      <class name="Dense" allocatable="true">
+        <!-- https://www.tensorflow.org/versions/r2.9/api_docs/python/tf/keras/layers/Dense -->
+        <method name="do" descriptor="()LRoot;" numArgs="11" paramNames="self units activation use_bias kernel_initializer bias_initializer kernel_regularizer bias_regularizer activity_regularizer kernel_constraint bias_constraint">
+          <new def="__call__" class="Ltensorflow/keras/layers/__call__" />
+          <putfield class="LRoot" field="__call__" fieldType="LRoot" ref="arg0" value="__call__" />
+          <new def="call" class="Ltensorflow/keras/layers/call" />
+          <putfield class="LRoot" field="call" fieldType="LRoot" ref="arg0" value="call" />
+          <return value="arg0" />
+        </method>
+      </class>
+      <!-- FIXME: These methods must be called explicitly. The implicit cases blocked on https://github.com/wala/ML/issues/127. -->
+      <class name="__call__" allocatable="true">
+        <!-- https://github.com/keras-team/keras/blob/07e13740fd181fc3ddec7d9a594d8a08666645f6/keras/layers/core/dense.py#L166-L240 -->
+        <method name="do" descriptor="()LRoot;" numArgs="2" paramNames="self inputs">
+          <return value="inputs" />
+        </method>
+      </class>
+      <!-- FIXME: Workaround for https://github.com/wala/ML/issues/106. -->
+      <class name="call" allocatable="true">
+        <!-- https://github.com/keras-team/keras/blob/07e13740fd181fc3ddec7d9a594d8a08666645f6/keras/layers/core/dense.py#L166-L240 -->
+        <method name="do" descriptor="()LRoot;" numArgs="2" paramNames="self inputs">
+          <return value="inputs" />
+        </method>
+      </class>
+    </package>
+
     <package name="tensorflow/data">
       <class name="Dataset" allocatable="true">
         <!-- "read_dataset" means that this function reads a tensor iterable. -->

diff --git a/hybridize.target b/hybridize.target
@@ -29,7 +29,7 @@
 				<dependency>
 					<groupId>com.ibm.wala</groupId>
 					<artifactId>com.ibm.wala.cast.python.ml</artifactId>
-					<version>0.21.0-SNAPSHOT</version>
+					<version>0.22.0-SNAPSHOT</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>