Merge pull request #281 from ModECI/pytorch_pin

Pytorch pinning to v1.11.0 & update to v0.4.1.1
ModECI · Jul 4, 2022 · 55006fb · 55006fb
2 parents a264aab + a4d37b8
commit 55006fb
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 28 deletions.
diff --git a/examples/ACT-R/addition.json b/examples/ACT-R/addition.json
@@ -1,7 +1,7 @@
 {
     "addition": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "addition_graph": {
                 "nodes": {

diff --git a/examples/ACT-R/addition.yaml b/examples/ACT-R/addition.yaml
@@ -1,6 +1,6 @@
 addition:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         addition_graph:
             nodes:

diff --git a/examples/ACT-R/count.json b/examples/ACT-R/count.json
@@ -1,7 +1,7 @@
 {
     "count": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "count_graph": {
                 "nodes": {

diff --git a/examples/ACT-R/count.yaml b/examples/ACT-R/count.yaml
@@ -1,6 +1,6 @@
 count:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         count_graph:
             nodes:

diff --git a/examples/MDF/ABCD.json b/examples/MDF/ABCD.json
@@ -1,7 +1,7 @@
 {
     "ABCD": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "abcd_example": {
                 "nodes": {

diff --git a/examples/MDF/ABCD.yaml b/examples/MDF/ABCD.yaml
@@ -1,6 +1,6 @@
 ABCD:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         abcd_example:
             nodes:

diff --git a/examples/MDF/Arrays.json b/examples/MDF/Arrays.json
@@ -1,7 +1,7 @@
 {
     "Arrays": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "array_example": {
                 "nodes": {

diff --git a/examples/MDF/Arrays.yaml b/examples/MDF/Arrays.yaml
@@ -1,6 +1,6 @@
 Arrays:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         array_example:
             nodes:

diff --git a/examples/MDF/ParametersFunctions.json b/examples/MDF/ParametersFunctions.json
@@ -1,7 +1,7 @@
 {
     "ParametersFunctions": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "params_funcs_example": {
                 "nodes": {

diff --git a/examples/MDF/ParametersFunctions.yaml b/examples/MDF/ParametersFunctions.yaml
@@ -1,6 +1,6 @@
 ParametersFunctions:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         params_funcs_example:
             nodes:

diff --git a/examples/MDF/RNN/IAFs.json b/examples/MDF/RNN/IAFs.json
@@ -1,7 +1,7 @@
 {
     "IAFs": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "iaf_example": {
                 "nodes": {

diff --git a/examples/MDF/RNN/IAFs.yaml b/examples/MDF/RNN/IAFs.yaml
@@ -1,6 +1,6 @@
 IAFs:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         iaf_example:
             nodes:

diff --git a/examples/MDF/RNN/RNNs.json b/examples/MDF/RNN/RNNs.json
@@ -1,7 +1,7 @@
 {
     "RNNs": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "rnn_example": {
                 "nodes": {

diff --git a/examples/MDF/RNN/RNNs.yaml b/examples/MDF/RNN/RNNs.yaml
@@ -1,6 +1,6 @@
 RNNs:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         rnn_example:
             nodes:

diff --git a/examples/MDF/Simple.json b/examples/MDF/Simple.json
@@ -1,7 +1,7 @@
 {
     "Simple": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "simple_example": {
                 "nodes": {

diff --git a/examples/MDF/Simple.yaml b/examples/MDF/Simple.yaml
@@ -1,6 +1,6 @@
 Simple:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         simple_example:
             nodes:

diff --git a/examples/MDF/States.json b/examples/MDF/States.json
@@ -1,7 +1,7 @@
 {
     "States": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "state_example": {
                 "nodes": {

diff --git a/examples/MDF/States.yaml b/examples/MDF/States.yaml
@@ -1,6 +1,6 @@
 States:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         state_example:
             nodes:

diff --git a/examples/MDF/abc_conditions.json b/examples/MDF/abc_conditions.json
@@ -1,7 +1,7 @@
 {
     "abc_conditions": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "abc_conditions_example": {
                 "nodes": {

diff --git a/examples/MDF/abc_conditions.yaml b/examples/MDF/abc_conditions.yaml
@@ -1,6 +1,6 @@
 abc_conditions:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         abc_conditions_example:
             nodes:

diff --git a/examples/ONNX/ab.json b/examples/ONNX/ab.json
@@ -1,7 +1,7 @@
 {
     "ONNX Model": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "torch-jit-export": {
                 "nodes": {

diff --git a/examples/ONNX/ab.yaml b/examples/ONNX/ab.yaml
@@ -1,6 +1,6 @@
 ONNX Model:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         torch-jit-export:
             nodes:

diff --git a/examples/ONNX/abc.json b/examples/ONNX/abc.json
@@ -1,7 +1,7 @@
 {
     "ONNX Model": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "torch-jit-export": {
                 "nodes": {

diff --git a/examples/ONNX/abc.yaml b/examples/ONNX/abc.yaml
@@ -1,6 +1,6 @@
 ONNX Model:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         torch-jit-export:
             nodes:

diff --git a/examples/ONNX/abcd.json b/examples/ONNX/abcd.json
@@ -1,7 +1,7 @@
 {
     "ONNX Model": {
         "format": "ModECI MDF v0.4",
-        "generating_application": "Python modeci-mdf v0.4.1",
+        "generating_application": "Python modeci-mdf v0.4.1.1",
         "graphs": {
             "torch-jit-export": {
                 "nodes": {

diff --git a/examples/ONNX/abcd.yaml b/examples/ONNX/abcd.yaml
@@ -1,6 +1,6 @@
 ONNX Model:
     format: ModECI MDF v0.4
-    generating_application: Python modeci-mdf v0.4.1
+    generating_application: Python modeci-mdf v0.4.1.1
     graphs:
         torch-jit-export:
             nodes:

diff --git a/setup.cfg b/setup.cfg
@@ -39,7 +39,7 @@ install_requires =
     numpy
     matplotlib
     graphviz
-    torch
+    torch<=1.11.0
     sympy<=1.8
     onnx
     onnxruntime

diff --git a/src/modeci_mdf/__init__.py b/src/modeci_mdf/__init__.py
@@ -13,4 +13,4 @@
 MODECI_MDF_VERSION = "0.4"
 
 # Version of the Python module.
-__version__ = "0.4.1"
+__version__ = "0.4.1.1"
diff --git a/src/modeci_mdf/execution_engine.py b/src/modeci_mdf/execution_engine.py
@@ -1227,6 +1227,7 @@ def update_condition_arguments(args, condition_type):
                         args["custom_parameter_getter"] = get_custom_parameter_getter(
                             obj
                         )
+                        break
                 else:
                     raise ValueError(
                         f"No {parameter} evaluable object for {dependency}, options: {list(valid_parameters)}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -1227,6 +1227,7 @@ def update_condition_arguments(args, condition_type): @@
                             args["custom_parameter_getter"] = get_custom_parameter_getter(
                                 obj
                             )
+                            break
                     else:
                         raise ValueError(
                             f"No {parameter} evaluable object for {dependency}, options: {list(valid_parameters)}"
@@ Expand Down @@