Merge branch 'master' into 267-initial-tensor-dimensions-arent-always-accurate

Author: khatchad

com.ibm.wala.cast.python.ml/source/com/ibm/wala/cast/python/ml/client/PythonTensorAnalysisEngine.java

@@ -63,6 +63,7 @@
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
 import com.ibm.wala.util.intset.OrdinalSet;
 import java.io.File;
+import java.io.IOException;
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
@@ -653,16 +654,19 @@ private Map<PointsToSetVariable, TensorType> getShapeSourceCalls(
         op,
         builder,
         (CGNode src, SSAAbstractInvokeInstruction call) -> {
-          if (call.getNumberOfUses() > param) {
-            targets.put(
-                builder
-                    .getPropagationSystem()
-                    .findOrCreatePointsToSet(
-                        builder
-                            .getPointerAnalysis()
-                            .getHeapModel()
-                            .getPointerKeyForLocal(src, call.getDef())),
-                TensorType.shapeArg(src, call.getUse(param)));
+          try {
+            if (call.getNumberOfUses() > param)
+              targets.put(
+                  builder
+                      .getPropagationSystem()
+                      .findOrCreatePointsToSet(
+                          builder
+                              .getPointerAnalysis()
+                              .getHeapModel()
+                              .getPointerKeyForLocal(src, call.getDef())),
+                  TensorType.shapeArg(src, call.getUse(param)));
+          } catch (IOException e) {
+            throw new RuntimeException("Error while processing shape source call: " + call, e);
           }
         });
     return targets;
@@ -701,9 +705,13 @@ public TensorTypeAnalysis performAnalysis(PropagationCallGraphBuilder builder)
 
     for (PointsToSetVariable v : sources) init.put(v, getTensorType(v, builder));
 
-    Map<PointsToSetVariable, TensorType> placeholders =
-        handleShapeSourceOp(builder, dataflow, placeholder, 2);
-    logger.fine(() -> "Placeholders: " + placeholders);
+    Map<PointsToSetVariable, TensorType> placeholders = null;
+    try {
+      placeholders = handleShapeSourceOp(builder, dataflow, placeholder, 2);
+    } catch (IOException e) {
+      throw new RuntimeException("Error while processing placeholder calls.", e);
+    }
+    logger.fine("Placeholders: " + placeholders);
 
     for (Map.Entry<PointsToSetVariable, TensorType> e : placeholders.entrySet())
       init.put(e.getKey(), Set.of(e.getValue()));
@@ -728,7 +736,12 @@ public TensorTypeAnalysis performAnalysis(PropagationCallGraphBuilder builder)
     }
 
     Map<PointsToSetVariable, TensorType> shapeOps = HashMapFactory.make();
-    shapeOps.putAll(handleShapeSourceOp(builder, dataflow, reshape, 2));
+
+    try {
+      shapeOps.putAll(handleShapeSourceOp(builder, dataflow, reshape, 2));
+    } catch (IOException e) {
+      throw new RuntimeException("Error while processing reshape calls.", e);
+    }
 
     Set<PointsToSetVariable> conv2ds = getKeysDefinedByCall(conv2d, builder);
 
@@ -983,7 +996,8 @@ private Map<PointsToSetVariable, TensorType> handleShapeSourceOp(
       PropagationCallGraphBuilder builder,
       Graph<PointsToSetVariable> dataflow,
       MethodReference op,
-      int shapeSrcOperand) {
+      int shapeSrcOperand)
+      throws IOException {
     Map<PointsToSetVariable, TensorType> reshapeTypes =
         getShapeSourceCalls(op, builder, shapeSrcOperand);
     for (PointsToSetVariable to : reshapeTypes.keySet()) {

com.ibm.wala.cast.python.ml/source/com/ibm/wala/cast/python/ml/types/TensorType.java

@@ -329,7 +329,7 @@ public static TensorType mnistInput() {
     return new TensorType("pixel", Arrays.asList(batch, vec));
   }
 
-  public static TensorType shapeArg(CGNode node, int literalVn) {
+  public static TensorType shapeArg(CGNode node, int literalVn) throws IOException {
     logger.fine(() -> node.getIR().toString());
     ArrayList<Dimension<?>> r = new ArrayList<>();
     DefUse du = node.getDU();
@@ -360,18 +360,13 @@ public static TensorType shapeArg(CGNode node, int literalVn) {
                   .debugInfo()
                   .getInstructionPosition(du.getDef(val).iIndex());
           System.err.println(p);
-          try {
-            SourceBuffer b = new SourceBuffer(p);
-            String expr = b.toString();
-            System.err.println(expr);
-            Integer ival = PythonInterpreter.interpretAsInt(expr);
-            if (ival != null) {
-              r.add(new NumericDim(ival));
-              continue;
-            }
-          } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+          SourceBuffer b = new SourceBuffer(p);
+          String expr = b.toString();
+          System.err.println(expr);
+          Integer ival = PythonInterpreter.interpretAsInt(expr);
+          if (ival != null) {
+            r.add(new NumericDim(ival));
+            continue;
           }
         }
         r.add(new SymbolicDim("?"));