Skip to content

Commit

Permalink
Fix #271.
Browse files Browse the repository at this point in the history
  • Loading branch information
khatchad committed Nov 30, 2023
1 parent 6b7717c commit d70f0d6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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.9.0",
com.ibm.wala.cast.python.ipa.callgraph;version="0.12.0",
com.ibm.wala.cast.python.loader;version="0.1.0",
com.ibm.wala.cast.python.ml.analysis;version="0.1.0",
com.ibm.wala.cast.python.ml.client;version="0.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4425,10 +4425,7 @@ public void testModel() throws Exception {
checkOptimizationNotAvailableStatus(f);
break;
case "__call__":
// NOTE: Change to assertTrue when https://github.com/wala/ML/issues/24 is fixed.
assertFalse("Expecting " + simpleName + " to not have a tensor param.", f.getLikelyHasTensorParameter());
// NOTE: Should be error-free once https://github.com/ponder-lab/Hybridize-Functions-Refactoring/issues/271 is fixed.
checkSideEffectStatus(f);
assertTrue("Expecting " + simpleName + " to have a tensor param.", f.getLikelyHasTensorParameter());
break;
default:
throw new IllegalStateException("Not expecting function: " + simpleName + ".");
Expand All @@ -4437,8 +4434,8 @@ public void testModel() throws Exception {
}

/**
* Test a model. No tf.function in this one. Use call instead of __call__. Ariadne doesn't support __call__. See
* https://github.com/wala/ML/issues/24.
* Test a model. No tf.function in this one. Use call instead of __call__. Ariadne doesn't support call. See
* https://github.com/ponder-lab/Hybridize-Functions-Refactoring/issues/291.
*/
@Test
public void testModel2() throws Exception {
Expand All @@ -4462,9 +4459,9 @@ public void testModel2() throws Exception {
checkOptimizationNotAvailableStatus(f);
break;
case "call":
// NOTE: Change to assertTrue when https://github.com/wala/ML/issues/24 is fixed.
// NOTE: Change to assertTrue when https://github.com/ponder-lab/Hybridize-Functions-Refactoring/issues/291 is fixed.
assertFalse("Expecting " + simpleName + " to not have a tensor param.", f.getLikelyHasTensorParameter());
// NOTE: Remove once https://github.com/ponder-lab/Hybridize-Functions-Refactoring/issues/271 is fixed.
// NOTE: Remove once https://github.com/ponder-lab/Hybridize-Functions-Refactoring/issues/291 is fixed.
checkSideEffectStatus(f);
break;
default:
Expand Down Expand Up @@ -5141,8 +5138,7 @@ public void testPythonSideEffects38() throws Exception {

assertTrue(function.getIsHybrid());
assertFalse(function.getLikelyHasTensorParameter());
// Change to assertTrue() once https://github.com/ponder-lab/Hybridize-Functions-Refactoring/issues/271 is fixed:
assertNull(function.getHasPythonSideEffects());
assertTrue(function.getHasPythonSideEffects());
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions hybridize.target
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.cast.python.ml</artifactId>
<version>0.12.0-SNAPSHOT</version>
<version>0.13.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
Expand All @@ -53,4 +53,4 @@
<launcherArgs>
<vmArgs>-Declipse.p2.max.threads=10 -Doomph.update.url=https://download.eclipse.org/oomph/updates/milestone/latest -Doomph.redirection.index.redirection=index:/-&gt;http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/ -Dosgi.requiredJavaVersion=17 [email protected]/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true -Dsun.java.command=Eclipse -XX:+UseG1GC -XX:+UseStringDeduplication --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true -Xms256m -Xmx2048m --add-modules=ALL-SYSTEM</vmArgs>
</launcherArgs>
</target>
</target>

0 comments on commit d70f0d6

Please sign in to comment.