fix for numpy2, add numpy2 to test workflow

OpenMDAO · Oct 2, 2024 · f1e53eb · f1e53eb
1 parent 37b96dd
commit f1e53eb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/dymos_tests_workflow.yml b/.github/workflows/dymos_tests_workflow.yml
@@ -36,6 +36,12 @@ on:
         required: false
         default: false
 
+      numpy2_no_pyoptsparse:
+        type: boolean
+        description: "Include 'numpy2_no_pyoptsparse' in test matrix"
+        required: false
+        default: false
+
       no_snopt:
         type: boolean
         description: "Include 'no_snopt' in test matrix"
@@ -97,6 +103,15 @@ jobs:
             OPTIONAL: '[test]'
             EXCLUDE: ${{ github.event_name == 'workflow_dispatch'  && ! inputs.no_pyoptsparse }}
 
+          # numpy 2.x but no PETSc, pyoptsparse or SNOPT
+          - NAME: numpy2_no_pyoptsparse
+            PY: '3.12'
+            NUMPY: 2
+            SCIPY: 1.14
+            OPENMDAO: 'latest'
+            OPTIONAL: '[all]'
+            EXCLUDE: ${{ github.event_name == 'workflow_dispatch'  && ! inputs.numpy2_no_pyoptsparse }}
+
           # baseline versions except with pyoptsparse but no SNOPT
           - NAME: no_snopt
             PY: '3.12'

diff --git a/dymos/phase/phase.py b/dymos/phase/phase.py
@@ -2962,9 +2962,10 @@ def _indices_in_constraints(self, name, loc):
             duplicate_idxs = all_flat_idxs.intersection(flat_idxs)
             if duplicate_idxs:
                 s = {'initial': 'initial boundary', 'final': 'final boundary', 'path': 'path'}
-                raise ValueError(f'Duplicate constraint in phase {self.pathname}. '
-                                 f'The following indices of `{name}` are used in '
-                                 f'multiple {s[loc]} constraints:\n{duplicate_idxs}')
+                with np.printoptions(legacy='1.13'):
+                    raise ValueError(f'Duplicate constraint in phase {self.pathname}. '
+                                     f'The following indices of `{name}` are used in '
+                                     f'multiple {s[loc]} constraints:\n{duplicate_idxs}')
 
             all_flat_idxs.update(flat_idxs)