Merge pull request #316 from ponder-lab/ml_0_21_0_SNAPSHOT

Upgrade to Ariadne 0.21.0-SNAPSHOT.
ponder-lab · Jan 19, 2024 · 3961441 · 3961441
2 parents ca86971 + b3e22b7
commit 3961441
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF b/edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF
@@ -24,10 +24,10 @@ Import-Package: com.google.common.collect,
  com.ibm.wala.cast.ir.ssa,
  com.ibm.wala.cast.loader,
  com.ibm.wala.cast.python.client;version="0.1.0",
- com.ibm.wala.cast.python.ipa.callgraph;version="0.16.0",
+ com.ibm.wala.cast.python.ipa.callgraph;version="0.20.0",
  com.ibm.wala.cast.python.loader;version="0.1.0",
  com.ibm.wala.cast.python.ml.analysis;version="0.16.0",
- com.ibm.wala.cast.python.ml.client;version="0.19.0",
+ com.ibm.wala.cast.python.ml.client;version="0.20.0",
  com.ibm.wala.cast.python.modref;version="0.11.0",
  com.ibm.wala.cast.python.ssa,
  com.ibm.wala.cast.python.types,

diff --git a/edu.cuny.hunter.hybridize.core/tensorflow.xml b/edu.cuny.hunter.hybridize.core/tensorflow.xml
@@ -90,6 +90,9 @@
         <new def="conv3d" class="Ltensorflow/functions/conv3d" />
         <putfield class="LRoot" field="conv3d" fieldType="LRoot" ref="nn" value="conv3d" />
 
+        <new def="softmax" class="Ltensorflow/functions/softmax" />
+        <putfield class="LRoot" field="softmax" fieldType="LRoot" ref="nn" value="softmax" />
+
         <new def="placeholder" class="Ltensorflow/functions/placeholder" />
         <putfield class="LRoot" field="placeholder" fieldType="LRoot" ref="x" value="placeholder" />
 
@@ -768,6 +771,17 @@
           <return value="x" />
         </method>
       </class>
+
+      <class name="softmax" allocatable="true">
+        <method name="read_data" descriptor="()LRoot;">
+          <new def="x" class="Ltensorflow/functions/softmax" />
+          <return value="x" />
+        </method>
+        <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" />
+        </method>
+      </class>
     </package>
 
     <package name="tensorflow/estimator">
@@ -798,6 +812,12 @@
           <putfield class="LRoot" field="shuffle" fieldType="LRoot" ref="arg0" value="shuffle" />
           <new def="batch" class="Ltensorflow/data/batch" />
           <putfield class="LRoot" field="batch" fieldType="LRoot" ref="arg0" value="batch" />
+          <new def="repeat" class="Ltensorflow/data/repeat" />
+          <putfield class="LRoot" field="repeat" fieldType="LRoot" ref="arg0" value="repeat" />
+          <new def="prefetch" class="Ltensorflow/data/prefetch" />
+          <putfield class="LRoot" field="prefetch" fieldType="LRoot" ref="arg0" value="prefetch" />
+          <new def="take" class="Ltensorflow/data/take" />
+          <putfield class="LRoot" field="take" fieldType="LRoot" ref="arg0" value="take" />
           <return value="arg0" />
         </method>
         <method name="do" descriptor="()LRoot;" numArgs="2" paramNames="self variant_tensor">
@@ -825,6 +845,36 @@
           <return value="xx" />
         </method>
       </class>
+
+      <class name="repeat" allocatable="true">
+        <!-- https://www.tensorflow.org/versions/r2.9/api_docs/python/tf/data/Dataset#repeat -->
+        <method name="do" descriptor="()LRoot;" numArgs="6" paramNames="self count name">
+          <!-- FIXME: Workaround for https://github.com/wala/ML/issues/127. -->
+          <new def="x" class="Ltensorflow/data/Dataset" />
+          <call class="Ltensorflow/data/Dataset" name="read_dataset" descriptor="()LRoot;" type="virtual" arg0="x" def="xx" />
+          <return value="xx" />
+        </method>
+      </class>
+
+      <class name="prefetch" allocatable="true">
+        <!-- https://www.tensorflow.org/versions/r2.9/api_docs/python/tf/data/Dataset#prefetch -->
+        <method name="do" descriptor="()LRoot;" numArgs="3" paramNames="self buffer_size name">
+          <!-- FIXME: Workaround for https://github.com/wala/ML/issues/127. -->
+          <new def="x" class="Ltensorflow/data/Dataset" />
+          <call class="Ltensorflow/data/Dataset" name="read_dataset" descriptor="()LRoot;" type="virtual" arg0="x" def="xx" />
+          <return value="xx" />
+        </method>
+      </class>
+
+      <class name="take" allocatable="true">
+        <!-- https://www.tensorflow.org/versions/r2.9/api_docs/python/tf/data/Dataset#take -->
+        <method name="do" descriptor="()LRoot;" numArgs="3" paramNames="self count name">
+          <!-- FIXME: Workaround for https://github.com/wala/ML/issues/127. -->
+          <new def="x" class="Ltensorflow/data/Dataset" />
+          <call class="Ltensorflow/data/Dataset" name="read_dataset" descriptor="()LRoot;" type="virtual" arg0="x" def="xx" />
+          <return value="xx" />
+        </method>
+      </class>
     </package>
 
     <package name="tensorflow/data/Dataset">

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.20.0-SNAPSHOT</version>
+					<version>0.21.0-SNAPSHOT</version>
 					<type>jar</type>
 				</dependency>
 			</dependencies>