250720.104500.PDT minor updates

Author: zaikunzhang

matlab/mex_gateways/R2025a/bobyqa_mex.F90

@@ -36,8 +36,8 @@ module calfun_mod
 contains
 
 subroutine calfun(x, f)
-use, non_intrinsic :: consts_mod, only : RP
 use, non_intrinsic :: cbfun_mod, only : evalcb
+use, non_intrinsic :: consts_mod, only : RP
 implicit none
 real(RP), intent(in) :: x(:)
 real(RP), intent(out) :: f

matlab/mex_gateways/R2025a/cobyla_mex.F90

@@ -31,13 +31,13 @@ module calcfc_mod
 private
 public :: funcon_ptr, calcfc
 
-mwPointer :: funcon_ptr  ! Pointer to the objective function handle
+mwPointer :: funcon_ptr  ! Pointer to the objective/constraint function handle
 
 contains
 
 subroutine calcfc(x, f, nlconstr)
-use, non_intrinsic :: consts_mod, only : RP
 use, non_intrinsic :: cbfun_mod, only : evalcb
+use, non_intrinsic :: consts_mod, only : RP
 implicit none
 real(RP), intent(in) :: x(:)
 real(RP), intent(out) :: f

matlab/mex_gateways/R2025a/cobylb.f90

@@ -25,24 +25,18 @@ module calcfc_internal_mod
 contains
 
 subroutine calcfc_internal(x_internal, f_internal, constr_internal)
-!--------------------------------------------------------------------------------------------------!
-! This internal subroutine evaluates the objective function and ALL the constraints.
-! In MATLAB/Python/R/Julia, this can be implemented as a lambda function/anonymous function.
-!--------------------------------------------------------------------------------------------------!b
 use, non_intrinsic :: linalg_mod, only : matprod
 implicit none
-! Inputs
 real(RP), intent(in) :: x_internal(:)
-! Outputs
 real(RP), intent(out) :: f_internal
 real(RP), intent(out) :: constr_internal(:)
 constr_internal(1:m_lcon_internal) = matprod(x_internal, amat_ptr) - bvec_ptr
 call calcfc_ptr(x_internal, f_internal, constr_internal(m_lcon_internal+1:m_internal))
 end subroutine calcfc_internal
 
-
 end module calcfc_internal_mod
 
+
 module cobylb_mod
 !--------------------------------------------------------------------------------------------------!
 ! This module performs the major calculations of COBYLA.

matlab/mex_gateways/R2025a/lincoa_mex.F90

@@ -36,8 +36,8 @@ module calfun_mod
 contains
 
 subroutine calfun(x, f)
-use, non_intrinsic :: consts_mod, only : RP
 use, non_intrinsic :: cbfun_mod, only : evalcb
+use, non_intrinsic :: consts_mod, only : RP
 implicit none
 real(RP), intent(in) :: x(:)
 real(RP), intent(out) :: f

matlab/mex_gateways/R2025a/newuoa_mex.F90

@@ -36,8 +36,8 @@ module calfun_mod
 contains
 
 subroutine calfun(x, f)
-use, non_intrinsic :: consts_mod, only : RP
 use, non_intrinsic :: cbfun_mod, only : evalcb
+use, non_intrinsic :: consts_mod, only : RP
 implicit none
 real(RP), intent(in) :: x(:)
 real(RP), intent(out) :: f

matlab/mex_gateways/R2025a/uobyqa_mex.F90

@@ -36,8 +36,8 @@ module calfun_mod
 contains
 
 subroutine calfun(x, f)
-use, non_intrinsic :: consts_mod, only : RP
 use, non_intrinsic :: cbfun_mod, only : evalcb
+use, non_intrinsic :: consts_mod, only : RP
 implicit none
 real(RP), intent(in) :: x(:)
 real(RP), intent(out) :: f

matlab/setup_tools/compile.m

@@ -66,7 +66,7 @@ function compile(solvers, mexdir, fortd, gateways, options)
 % The following code is to circumvent a bug in MATLAB R2025a, which segfaults on Linux when the
 % Fortran files contain internal procedures that are passed as actual arguments to other procedures.
 % To avoid this bug, we replace gateways/*_mex.F90 with gateways/R2025a/*_mex.F90, and
-% fortran/cobylb.f90 with gateways/R2025a/cobylb.f90, which uses module variables instead of
+% fortran/cobylb.f90 with gateways/R2025a/cobylb.f90, which use module variables instead of
 % internal procedures. The price is that PRIMA becomes thread-unsafe and recursion-unsafe.
 % See MathWorks Technical Support Case 07931486 and
 % https://www.mathworks.com/matlabcentral/answers/2178414-bug-matlab-2025a-segfaults-on-ubuntu-when-handling-fortran-mex-files-with-internal-subroutines
@@ -80,12 +80,16 @@ function compile(solvers, mexdir, fortd, gateways, options)
             ['MATLAB R2025a has a bug that causes segmentation faults when handling Fortran MEX files with internal procedures.\n', ...
             '         PRIMA is adapted to circumvent this bug but it becomes thread-unsafe and recursion-unsafe.']);
     end
-    % Replace the files. N.B.: The .*f90 files have become .* files after the refactorization in setup.m.
+    % Replace the files. N.B.: The .*90 files have become .* after the code refactoring in setup.m.
+    replacement_dir = fullfile(gateways, 'R2025a');
     for isol = 1 : length(solvers)
         solver = solvers{isol};
-        copyfile(fullfile(gateways, 'R2025a', [solver, '_mex.F']), fullfile(gateways, [solver, '_mex.F']));
+        copyfile(fullfile(replacement_dir, [solver, '_mex.F']), fullfile(gateways, [solver, '_mex.F']));
+        if strcmp(solver, 'cobyla')
+            % For COBYLA, we also need to replace the Fortran source file cobylb.f.
+            copyfile(fullfile(replacement_dir, 'cobylb.f'), fullfile(fortd, 'cobyla', 'cobylb.f'));
+        end
     end
-    copyfile(fullfile(gateways, 'R2025a', 'cobylb.f'), fullfile(fortd, 'cobyla', 'cobylb.f'));
 end
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%