231226.233143.HKT try uploading artifact

libprima · Dec 26, 2023 · 20d2c17 · 20d2c17
1 parent 8b08dca
commit 20d2c17
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 24 deletions.
diff --git a/.github/workflows/test_absoft.yml b/.github/workflows/test_absoft.yml
@@ -65,8 +65,26 @@ jobs:
         uses: actions/[email protected]
         if: always()  # Always run even if the workflow is canceled manually or due to overtime.
         with:
+          name: ${{ matrix.solver }}-${{ matrix.ikind }}
           path: ${{ env.TEST_DIR }}/prima/fortran/tests/test.${{ matrix.solver }}/log/*.log
 
       - name: Remove the test data
         if: always()  # Always run even if the workflow is canceled manually or due to overtime.
         run: rm -rf ${{ env.TEST_DIR }}
+
+  merge_artifacts:
+    runs-on: ubuntu-latest
+    if: always()
+    needs: test
+    steps:
+      - name: Download all workflow run artifacts
+        uses: actions/[email protected]
+      - name: Unzip all artifacts
+        run: ls -al && mv */* ./ && ls -al
+      - name: Upload all files
+        uses: actions/[email protected]
+        with:
+          name: all
+          path: ./*
+      - name: Remove all files
+        run: ls -al && rm -rf ./*
diff --git a/.github/workflows/test_aflang.yml b/.github/workflows/test_aflang.yml
@@ -70,6 +70,7 @@ jobs:
         uses: actions/[email protected]
         if: always()  # Always run even if the workflow is canceled manually or due to overtime.
         with:
+          name: ${{ matrix.solver }}-${{ matrix.ikind }}-${{ matrix.fflags }}-${{ matrix.testdim }}
           path: ${{ env.TEST_DIR }}/prima/fortran/tests/test.${{ matrix.solver }}/log/*.log
 
       - name: Remove the test data
@@ -92,3 +93,20 @@ jobs:
 
       - name: Check whether the tests were successful or cancelled due to timeout
         run: bash scripts/check_success_timeout_big_test ${{ secrets.GITHUB_TOKEN }} ${{ github.repository }} ${{ github.run_id }}
+
+  merge_artifacts:
+    runs-on: ubuntu-latest
+    if: always()
+    needs: test
+    steps:
+      - name: Download all workflow run artifacts
+        uses: actions/[email protected]
+      - name: Unzip all artifacts
+        run: ls -al && mv */* ./ && ls -al
+      - name: Upload all files
+        uses: actions/[email protected]
+        with:
+          name: all
+          path: ./*
+      - name: Remove all files
+        run: ls -al && rm -rf ./*
diff --git a/fortran/bobyqa/bobyqa.f90 b/fortran/bobyqa/bobyqa.f90
@@ -25,7 +25,7 @@ module bobyqa_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Wednesday, October 18, 2023 PM08:23:04
+! Last Modified: Friday, December 22, 2023 PM01:25:09
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -168,7 +168,7 @@ subroutine bobyqa(calfun, x, &
 !  if this requirement is not met. If HONOUR_X0 == TRUE, revise RHOBEG if needed; otherwise, revise
 !  X0 if needed. See the PREPROC subroutine for more information.
 !
-! CALLBACK
+! CALLBACK_FCN
 !   Input, function to report progress and optionally request termination.
 !
 ! INFO

diff --git a/fortran/bobyqa/bobyqb.f90 b/fortran/bobyqa/bobyqb.f90
@@ -32,7 +32,7 @@ module bobyqb_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Thursday, December 21, 2023 PM02:26:49
+! Last Modified: Friday, December 22, 2023 PM01:19:34
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -102,8 +102,8 @@ subroutine bobyqb(calfun, iprint, maxfun, npt, eta1, eta2, ftarget, gamma1, gamm
 implicit none
 
 ! Inputs
-procedure(CALLBACK), optional :: callback_fcn
 procedure(OBJ) :: calfun  ! N.B.: INTENT cannot be specified if a dummy procedure is not a POINTER
+procedure(CALLBACK), optional :: callback_fcn
 integer(IK), intent(in) :: iprint
 integer(IK), intent(in) :: maxfun
 integer(IK), intent(in) :: npt

diff --git a/fortran/cobyla/cobyla.f90 b/fortran/cobyla/cobyla.f90
@@ -42,7 +42,7 @@ module cobyla_mod
 !
 ! Started: July 2021
 !
-! Last Modified: Thursday, October 19, 2023 AM10:39:21
+! Last Modified: Friday, December 22, 2023 PM01:24:41
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -234,7 +234,7 @@ subroutine cobyla(calcfc, m_nlcon, x, &
 !   the returned solution; default: MAXFILT_DFT (a value lower than MIN_MAXFILT is not recommended);
 !   see common/consts.F90 for the definitions of MAXFILT_DFT and MIN_MAXFILT.
 !
-! CALLBACK
+! CALLBACK_FCN
 !   Input, function to report progress and optionally request termination.
 !
 ! INFO

diff --git a/fortran/cobyla/cobylb.f90 b/fortran/cobyla/cobylb.f90
@@ -17,7 +17,7 @@ module cobylb_mod
 !
 ! Started: July 2021
 !
-! Last Modified: Thursday, December 21, 2023 PM02:57:27
+! Last Modified: Friday, December 22, 2023 PM01:18:36
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -63,8 +63,8 @@ subroutine cobylb(calcfc, iprint, maxfilt, maxfun, amat, bvec, ctol, cweight, et
 implicit none
 
 ! Inputs
-procedure(CALLBACK), optional :: callback_fcn
 procedure(OBJCON) :: calcfc ! N.B.: INTENT cannot be specified if a dummy procedure is not a POINTER
+procedure(CALLBACK), optional :: callback_fcn
 integer(IK), intent(in) :: iprint
 integer(IK), intent(in) :: maxfilt
 integer(IK), intent(in) :: maxfun

diff --git a/fortran/common/pintrf.f90 b/fortran/common/pintrf.f90
@@ -1,14 +1,16 @@
 module pintrf_mod
 !--------------------------------------------------------------------------------------------------!
-! This is a module specifying the abstract interfaces OBJ and OBJCON. OBJ evaluates the objective
-! function for unconstrained, bound constrained, and linearly constrained problems; OBJCON evaluates
-! the objective and constraint functions for nonlinearly constrained problems.
+! This is a module specifying the abstract interfaces OBJ, OBJCON, and CALLBACK. OBJ evaluates the
+! objective function for unconstrained, bound constrained, and linearly constrained problems; OBJCON
+! evaluates the objective and constraint functions for nonlinearly constrained problems; CALLBACK
+! is a callback function that is called after each iteration of the solvers to report the progress
+! and optionally request termination.
 !
 ! Coded by Zaikun ZHANG (www.zhangzk.net).
 !
 ! Started: July 2020.
 !
-! Last Modified: Monday, February 07, 2022 AM12:28:54
+! Last Modified: Friday, December 22, 2023 PM01:23:44
 !--------------------------------------------------------------------------------------------------!
 
 !!!!!! Users must provide the implementation of OBJ or OBJCON. !!!!!!
@@ -36,6 +38,7 @@ subroutine OBJCON(x, f, constr)
     real(RP), intent(out) :: constr(:)
     end subroutine OBJCON
 
+
     subroutine CALLBACK(x, f, nf, tr, cstrv, nlconstr, terminate)
     use consts_mod, only : RP, IK
     implicit none

diff --git a/fortran/lincoa/lincoa.f90 b/fortran/lincoa/lincoa.f90
@@ -36,7 +36,7 @@ module lincoa_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Thursday, October 19, 2023 AM10:34:35
+! Last Modified: Friday, December 22, 2023 PM01:24:55
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -195,7 +195,7 @@ subroutine lincoa(calfun, x, &
 !   CONSTS_MOD (see consts.F90 under the directory named "common").
 !   Use *HIST with caution! (N.B.: the algorithm is NOT designed for large problems).
 !
-! CALLBACK
+! CALLBACK_FCN
 !   Input, function to report progress and optionally request termination.
 !
 ! INFO

diff --git a/fortran/lincoa/lincob.f90 b/fortran/lincoa/lincob.f90
@@ -15,7 +15,7 @@ module lincob_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Thursday, December 21, 2023 PM03:03:55
+! Last Modified: Friday, December 22, 2023 PM01:19:06
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -98,8 +98,8 @@ subroutine lincob(calfun, iprint, maxfilt, maxfun, npt, Aeq, Aineq, amat, beq, b
 implicit none
 
 ! Inputs
-procedure(CALLBACK), optional :: callback_fcn
 procedure(OBJ) :: calfun  ! N.B.: INTENT cannot be specified if a dummy procedure is not a POINTER
+procedure(CALLBACK), optional :: callback_fcn
 integer(IK), intent(in) :: iprint
 integer(IK), intent(in) :: maxfilt
 integer(IK), intent(in) :: maxfun

diff --git a/fortran/newuoa/newuoa.f90 b/fortran/newuoa/newuoa.f90
@@ -22,7 +22,7 @@ module newuoa_mod
 !
 ! Started: July 2020
 !
-! Last Modified: Wednesday, October 18, 2023 PM08:14:58
+! Last Modified: Friday, December 22, 2023 PM01:25:21
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -142,7 +142,7 @@ subroutine newuoa(calfun, x, &
 !   CONSTS_MOD (see consts.F90 under the directory named "common").
 !   Use *HIST with caution! (N.B.: the algorithm is NOT designed for large problems).
 !
-! CALLBACK
+! CALLBACK_FCN
 !   Input, function to report progress and optionally request termination.
 !
 ! INFO

diff --git a/fortran/newuoa/newuob.f90 b/fortran/newuoa/newuob.f90
@@ -8,7 +8,7 @@ module newuob_mod
 !
 ! Started: July 2020
 !
-! Last Modified: Thursday, December 21, 2023 PM03:05:39
+! Last Modified: Friday, December 22, 2023 PM01:19:46
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -75,8 +75,8 @@ subroutine newuob(calfun, iprint, maxfun, npt, eta1, eta2, ftarget, gamma1, gamm
 implicit none
 
 ! Inputs
-procedure(CALLBACK), optional :: callback_fcn
 procedure(OBJ) :: calfun  ! N.B.: INTENT cannot be specified if a dummy procedure is not a POINTER
+procedure(CALLBACK), optional :: callback_fcn
 integer(IK), intent(in) :: iprint
 integer(IK), intent(in) :: maxfun
 integer(IK), intent(in) :: npt

diff --git a/fortran/uobyqa/uobyqa.f90 b/fortran/uobyqa/uobyqa.f90
@@ -19,7 +19,7 @@ module uobyqa_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Wednesday, October 18, 2023 PM07:43:22
+! Last Modified: Friday, December 22, 2023 PM01:25:35
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -134,7 +134,7 @@ subroutine uobyqa(calfun, x, &
 !   CONSTS_MOD (see consts.F90 under the directory named "common").
 !   Use *HIST with caution!!! (N.B.: the algorithm is NOT designed for large problems).
 !
-! CALLBACK
+! CALLBACK_FCN
 !   Input, function to report progress and optionally request termination.
 !
 ! INFO

diff --git a/fortran/uobyqa/uobyqb.f90 b/fortran/uobyqa/uobyqb.f90
@@ -8,7 +8,7 @@ module uobyqb_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Thursday, December 21, 2023 PM03:06:15
+! Last Modified: Friday, December 22, 2023 PM01:20:00
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -69,8 +69,8 @@ subroutine uobyqb(calfun, iprint, maxfun, eta1, eta2, ftarget, gamma1, gamma2, r
 implicit none
 
 ! Inputs
-procedure(CALLBACK), optional :: callback_fcn
 procedure(OBJ) :: calfun  ! N.B.: INTENT cannot be specified if a dummy procedure is not a POINTER
+procedure(CALLBACK), optional :: callback_fcn
 integer(IK), intent(in) :: iprint
 integer(IK), intent(in) :: maxfun
 real(RP), intent(in) :: eta1