From 82d28d464547d192151e97792af4ffedf335a737 Mon Sep 17 00:00:00 2001 From: Raffi Khatchadourian Date: Wed, 6 Dec 2023 11:14:44 -0500 Subject: [PATCH] Workaround https://github.com/ponder-lab/Hybridize-Functions-Refactoring/issues/291. --- edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF | 2 +- .../hybridize/tests/HybridizeFunctionRefactoringTest.java | 5 +---- hybridize.target | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF b/edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF index cfdfad8ac..6f59148c7 100644 --- a/edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF +++ b/edu.cuny.hunter.hybridize.core/META-INF/MANIFEST.MF @@ -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.12.0", + com.ibm.wala.cast.python.ipa.callgraph;version="0.14.0", com.ibm.wala.cast.python.loader;version="0.1.0", com.ibm.wala.cast.python.ml.analysis;version="0.13.0", com.ibm.wala.cast.python.ml.client;version="0.13.0", diff --git a/edu.cuny.hunter.hybridize.tests/test cases/edu/cuny/hunter/hybridize/tests/HybridizeFunctionRefactoringTest.java b/edu.cuny.hunter.hybridize.tests/test cases/edu/cuny/hunter/hybridize/tests/HybridizeFunctionRefactoringTest.java index dbe8f844c..fd69fa58c 100644 --- a/edu.cuny.hunter.hybridize.tests/test cases/edu/cuny/hunter/hybridize/tests/HybridizeFunctionRefactoringTest.java +++ b/edu.cuny.hunter.hybridize.tests/test cases/edu/cuny/hunter/hybridize/tests/HybridizeFunctionRefactoringTest.java @@ -4459,10 +4459,7 @@ public void testModel2() throws Exception { checkOptimizationNotAvailableStatus(f); break; case "call": - // 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/291 is fixed. - checkSideEffectStatus(f); + assertTrue("Expecting " + simpleName + " to have a tensor param.", f.getLikelyHasTensorParameter()); break; default: throw new IllegalStateException("Not expecting function: " + simpleName + "."); diff --git a/hybridize.target b/hybridize.target index 3f7f14faf..6fbf08cd2 100644 --- a/hybridize.target +++ b/hybridize.target @@ -29,7 +29,7 @@ com.ibm.wala com.ibm.wala.cast.python.ml - 0.14.0-SNAPSHOT + 0.15.0-SNAPSHOT jar @@ -53,4 +53,4 @@ -Declipse.p2.max.threads=10 -Doomph.update.url=https://download.eclipse.org/oomph/updates/milestone/latest -Doomph.redirection.index.redirection=index:/->http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/ -Dosgi.requiredJavaVersion=17 -Dosgi.instance.area.default=@user.home/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 - + \ No newline at end of file