Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing callbacks #57

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ public void testTf2()
// https://github.com/wala/ML/issues/24 is fixed.
testTf2("tf2_test_model_call3.py", "SequentialModel.call", 1, 4, 2);
testTf2("tf2_test_model_call4.py", "SequentialModel.__call__", 1, 4, 2);
testTf2("tf2_test_callbacks.py", "get_dataset", 0, 0);
khatchad marked this conversation as resolved.
Show resolved Hide resolved
testTf2("tf2_test_callbacks2.py", "replica_fn", 0, 2);
khatchad marked this conversation as resolved.
Show resolved Hide resolved
khatchad marked this conversation as resolved.
Show resolved Hide resolved
}

private void testTf2(
Expand Down
41 changes: 41 additions & 0 deletions com.ibm.wala.cast.python.ml/data/tensorflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
<new def="estimator" class="Lobject" />
<putfield class="LRoot" field="estimator" fieldType="LRoot" ref="x" value="estimator" />

<new def="distribute" class="Lobject" />
<putfield class="LRoot" field="distribute" fieldType="LRoot" ref="x" value="distribute" />

<new def="nn" class="Lobject" />
<putfield class="LRoot" field="nn" fieldType="LRoot" ref="x" value="nn" />
<new def="random" class="Lobject" />
Expand All @@ -58,6 +61,9 @@
<new def="Estimator" class="Ltensorflow/estimator/Estimator" />
<putfield class="LRoot" field="Estimator" fieldType="LRoot" ref="estimator" value="Estimator" />

<new def="MirroredStrategy" class="Ltensorflow/distribute/MirroredStrategy" />
<putfield class="LRoot" field="MirroredStrategy" fieldType="LRoot" ref="distribute" value="MirroredStrategy" />

<new def="inputs" class="Lobject" />
<putfield class="LRoot" field="inputs" fieldType="LRoot" ref="estimator" value="inputs" />

Expand Down Expand Up @@ -786,6 +792,41 @@
</class>
</package>

<package name="tensorflow/distribute">
<class name="MirroredStrategy" allocatable="true">
khatchad marked this conversation as resolved.
Show resolved Hide resolved
<method name="do" descriptor="()LRoot;" numArgs="2" paramNames="self model">
<new def="x" class="Ltensorflow/distribute/distribute_datasets_from_function/distribute_datasets_from_function" />
<putfield class="LRoot" field="distribute_datasets_from_function" fieldType="LRoot" ref="self" value="x" />
<return value="arg0" />
<new def="y" class="Ltensorflow/distribute/run/run" />
<putfield class="LRoot" field="run" fieldType="LRoot" ref="self" value="y" />
<return value="arg1" />
</method>
</class>
</package>

<package name="tensorflow/distribute/distribute_datasets_from_function">
<class name="distribute_datasets_from_function" allocatable="true">
<method name="do" descriptor="()LRoot;" numArgs="3">
<getfield class="LRoot" field="$callback" fieldType="LRoot" ref="arg0" def="xx" />
<getfield class="LRoot" field="data" fieldType="LRoot" ref="arg1" def="data" />
<call class="LRoot" name="do" descriptor="()LRoot;" type="virtual" arg0="xx" arg1="data" arg2="3" numArgs="3" def="v" />
<return value="v" />
</method>
</class>
</package>

<package name="tensorflow/distribute/run">
<class name="run" allocatable="true">
<method name="do" descriptor="()LRoot;" numArgs="3">
<getfield class="LRoot" field="$callback" fieldType="LRoot" ref="arg0" def="xx" />
<getfield class="LRoot" field="data" fieldType="LRoot" ref="arg1" def="data" />
<call class="LRoot" name="do" descriptor="()LRoot;" type="virtual" arg0="xx" arg1="data" arg2="3" numArgs="3" def="v" />
<return value="v" />
</method>
</class>
</package>

<package name="tensorflow/app">
<class name="run" allocatable="true">
<method name="do" descriptor="()LRoot;" numArgs="3" paramNames="self main argv">
Expand Down
12 changes: 12 additions & 0 deletions com.ibm.wala.cast.python.test/data/tf2_test_callbacks.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import tensorflow as tf
khatchad marked this conversation as resolved.
Show resolved Hide resolved

def get_dataset(input_context):
khatchad marked this conversation as resolved.
Show resolved Hide resolved
batch_size = input_context.get_per_replica_batch_size(2)
return tf.data.Dataset.range(4).batch(batch_size)

global_batch_size = 2

strategy = tf.distribute.MirroredStrategy(devices=["GPU:0", "GPU:1"])

input_context = tf.distribute.InputContext()
dist_dataset = strategy.distribute_datasets_from_function(get_dataset)
11 changes: 11 additions & 0 deletions com.ibm.wala.cast.python.test/data/tf2_test_callbacks2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import tensorflow as tf

# Code from https://www.tensorflow.org/api_docs/python/tf/distribute/Strategy#example_usage_2
khatchad marked this conversation as resolved.
Show resolved Hide resolved
strategy = tf.distribute.MirroredStrategy(["GPU:0", "GPU:1"])
tensor_input = tf.constant(3.0)

@tf.function
def replica_fn(input):
khatchad marked this conversation as resolved.
Show resolved Hide resolved
return input*2.0

result = strategy.run(replica_fn, args=(tensor_input,))
khatchad marked this conversation as resolved.
Show resolved Hide resolved