240214.075545.HKT correct profile_*.yml regarding SOLNAME

opt2ai · Feb 13, 2024 · eed37e9 · eed37e9
1 parent c31b9de
commit eed37e9
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 21 deletions.
diff --git a/.github/workflows/profile_all.yml b/.github/workflows/profile_all.yml
@@ -183,8 +183,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_prima/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_all_sq.yml b/.github/workflows/profile_all_sq.yml
@@ -177,8 +177,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_prima/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_cobyla_small.yml b/.github/workflows/profile_cobyla_small.yml
@@ -141,7 +141,7 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
+          solver=${{ env.SOLNAME }}
           cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end

diff --git a/.github/workflows/profile_cobyla_small_sq.yml b/.github/workflows/profile_cobyla_small_sq.yml
@@ -147,7 +147,7 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
+          solver=${{ env.SOLNAME }}
           cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end

diff --git a/.github/workflows/profile_compiler_options.yml b/.github/workflows/profile_compiler_options.yml
@@ -156,8 +156,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_prima/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_infnan.yml b/.github/workflows/profile_infnan.yml
@@ -160,8 +160,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_prima/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_int16.yml b/.github/workflows/profile_int16.yml
@@ -159,8 +159,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_prima/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_prima_small.yml b/.github/workflows/profile_prima_small.yml
@@ -129,7 +129,7 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
+          solver=${{ env.SOLNAME }}
           cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end

diff --git a/.github/workflows/profile_quadruple.yml b/.github/workflows/profile_quadruple.yml
@@ -129,8 +129,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_prima/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_rescue_idz_classical.yml b/.github/workflows/profile_rescue_idz_classical.yml
@@ -160,8 +160,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_${{ env.BENCHMARK }}/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_${{ env.BENCHMARK }}/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_rescue_idz_modernized.yml b/.github/workflows/profile_rescue_idz_modernized.yml
@@ -160,8 +160,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_${{ env.BENCHMARK }}/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_${{ env.BENCHMARK }}/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/.github/workflows/profile_single.yml b/.github/workflows/profile_single.yml
@@ -130,8 +130,8 @@ jobs:
         if: always()
         shell: bash
         run: |
-          solver=${{ matrix.solver }}
-          cd /tmp/${{ env.SOLNAME }}_profile_prima/
+          solver=${{ env.SOLNAME }}
+          cd /tmp/${solver}_profile_prima/
           ls *${solver}*_start -1 > ${solver}_prob_start
           ls *${solver}*_end -1 > ${solver}_prob_end
           diff ${solver}_prob_start ${solver}_prob_end > ${solver}_stuck || :

diff --git a/matlab/tests/private/isequiv.m b/matlab/tests/private/isequiv.m
@@ -683,6 +683,7 @@ function isequiv(solvers, options)
         'CHNROSNB', ...
         'CHNRSNBM', ...
         'ERRINROS', ...
+        'ERRINRSM', ...
         'HYDCAR6LS', ...
         'METHANB8LS', ...
         'METHANL8LS', ...
@@ -695,6 +696,7 @@ function isequiv(solvers, options)
         'CHNROSNB', ...
         'CHNRSNBM', ...
         'ERRINROS', ...
+        'ERRINRSM', ...
         'HYDCAR6LS', ...
         'METHANL8LS', ...
         'TOINTGOR', ...
@@ -710,6 +712,7 @@ function isequiv(solvers, options)
         'CHNRSNBM', ...
         'CHWIRUT2LS', ...
         'DALLASS', ...
+        'ERRINROS', ...
         'ERRINRSM', ...
         'GOULDQP1', ...
         'HYDCAR6LS', ...