231101.234804.HKT minor revisions

fortlab · Nov 1, 2023 · 3dbad04 · 3dbad04
1 parent b1b2983
commit 3dbad04
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/test_gfortran_pi32_small.yml b/.github/workflows/test_gfortran_pi32_small.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v4
         if: github.event.inputs.git-ref != ''
         with:
-          ref: ${{ github.event.inputs.git-ref }} 
+          ref: ${{ github.event.inputs.git-ref }}
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_ACT }} # This forces checkout to use SSH, not HTTPS
           submodules: recursive
 
@@ -53,7 +53,7 @@ jobs:
       - name: Conduct the test
         shell: bash
         run: |
-            cd "$ROOT_DIR"/fortran/${{ matrix.solver }} && bash ./flint -g && bash ./mlint -g  # On Raspberry Pi, perform lintering only for small tests of gfortran
+            #cd "$ROOT_DIR"/fortran/${{ matrix.solver }} && bash ./flint -g && bash ./mlint -g  # On Raspberry Pi, perform lintering only for small tests of gfortran
             export FFLAGS=${{ matrix.fflags }}
             export TESTDIM=${{ matrix.testdim }}
             cd "$ROOT_DIR"/fortran/tests && make gtest_${{ matrix.ikind }}_r4_d1_tst_c.${{ matrix.solver }} && make gtest_${{ matrix.ikind }}_r4_d1_tst.${{ matrix.solver }}

diff --git a/.github/workflows/test_gfortran_pi64_small.yml b/.github/workflows/test_gfortran_pi64_small.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v4
         if: github.event.inputs.git-ref != ''
         with:
-          ref: ${{ github.event.inputs.git-ref }} 
+          ref: ${{ github.event.inputs.git-ref }}
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_ACT }} # This forces checkout to use SSH, not HTTPS
           submodules: recursive
 
@@ -53,7 +53,7 @@ jobs:
       - name: Conduct the test
         shell: bash
         run: |
-            cd "$ROOT_DIR"/fortran/${{ matrix.solver }} && bash ./flint -g && bash ./mlint -g  # On Raspberry Pi, perform lintering only for small tests of gfortran
+            #cd "$ROOT_DIR"/fortran/${{ matrix.solver }} && bash ./flint -g && bash ./mlint -g  # On Raspberry Pi, perform lintering only for small tests of gfortran
             export FFLAGS=${{ matrix.fflags }}
             export TESTDIM=${{ matrix.testdim }}
             cd "$ROOT_DIR"/fortran/tests && make gtest_${{ matrix.ikind }}_r4_d1_tst_c.${{ matrix.solver }} && make gtest_${{ matrix.ikind }}_r4_d1_tst.${{ matrix.solver }}

diff --git a/fortran/bobyqa/trustregion.f90 b/fortran/bobyqa/trustregion.f90
@@ -8,7 +8,7 @@ module trustregion_bobyqa_mod
 !
 ! Started: February 2022
 !
-! Last Modified: Sunday, August 27, 2023 PM09:42:37
+! Last Modified: Tuesday, October 31, 2023 PM02:31:05
 !--------------------------------------------------------------------------------------------------!
 
 implicit none
@@ -515,7 +515,7 @@ subroutine trsbox(delta, gopt_in, hq_in, pq_in, sl, su, xopt, xpt, crvmin, d)
     if (any(is_nan(args))) then
         exit
     end if
-    ! Defile the grid size of the search for HANGT. Powell defined the size to be 4 if hangt_bd is
+    ! Define the grid size of the search for HANGT. Powell defined the size to be 4 if hangt_bd is
     ! nearly zero and 20 if it is nearly one, with a linear interpolation in between. We double this
     ! size, which improves the performance of BOBYQA in general according to a test on 20230827.
     !grid_size = nint(17.0_RP * hangt_bd + 4.1_RP, kind(grid_size))  ! Powell's version

diff --git a/fortran/tests/makefiles/Makefile.common b/fortran/tests/makefiles/Makefile.common
@@ -347,8 +347,8 @@ atest_i2_r16_d1_tst_c atest_i4_r16_d1_tst_c atest_i8_r16_d1_tst_c atest_i2_r16_d
 
 # AMD AOCC Flang
 AFLANG := $(shell find -L /opt/AMD -type f -executable -name flang -print 2>/dev/null | sort | tail -n 1)
-AFINC := $(shell dirname $$(dirname $(AFLANG)) 2>/dev/null)/include
-AFLIB := $(shell dirname $$(dirname $(AFLANG)) 2>/dev/null)/lib
+AFINC := $(shell dirname $$(dirname $(AFLANG) 2>/dev/null) 2>/dev/null)/include
+AFLIB := $(shell dirname $$(dirname $(AFLANG) 2>/dev/null) 2>/dev/null)/lib
 AFLANG := $(AFLANG) -I$(AFINC) -L$(AFLIB)
 AFLANG := $(AFLANG) -pedantic-errors -Werror
 ifeq ($(TESTDIM),small)
@@ -966,7 +966,7 @@ source_%: $(SRC_DIRS)
 		-o -name "*.out" \
 		-o -name "*__genmod.f90" \
 		\) -exec rm {} \;  # Cleaning up; important!!!
-	# Classic Flang 15.0.3, Huawei Bisheng Flang 2.1.0, Arm Fortran Compiler version 22.1, and AOCC
+	# Classic Flang 15.0.3, Huawei Bisheng Flang 2.1.0, Arm Fortran Compiler version 23.10, and AOCC
 	# 4.1.0 are buggy concerning 0-dimensional arrays, and they report false positive out-bound
 	# indices. Thus preprocessing by frdsrc is needed. See
 	# https://github.com/flang-compiler/flang/issues/1238