Merge branch 'master' of https://github.com/ralna/CUTEst

ralna · Oct 26, 2024 · c02a816 · c02a816
2 parents 8de841c + 23606d6
commit c02a816
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/doc/README.C b/doc/README.C
@@ -41,8 +41,22 @@ and Julia), so C users need to be careful. The main issues are
      as Jacobians and compressed bands. Since Hessians are symmetric, 
      there is no need to switch the indices in this case.
 
+<<<<<<< HEAD
   Potential users should examine the provided CUTEst interfaces to 
   C and C++ codes in the files
+=======
+ test/utest.c and test/ctest.c 
+ derchk/derchk_main.c
+ genc/genc.c and genc/genc_main.c
+ gsl/gsl_main.c and gsl/gsl_test.c
+ knitro/knitro_main.c
+ loqo/loqo_main.c
+ matlab/mcutest.c
+ nomad/nomad_main.c
+ octave/ocutest.c
+ osqp/osqp_main.c
+ osqp/osqp_test.c
+>>>>>>> 23606d646bdfe69242a9601e66839da6c7186adf
 
    test/utest.c and test/c_test.c 
    derchk/derchk_main.c

diff --git a/meson.build b/meson.build
@@ -226,22 +226,22 @@ if build_tests
     file = test[3]
 
     if precision == 'single'
-      libgalahad_precision = libcutest_single
+      libcutest_precision = libcutest_single
       args_precision = pp_flag + '-DREAL_32'
     endif
     if precision == 'double'
-      libgalahad_precision = libcutest_double
+      libcutest_precision = libcutest_double
       args_precision = pp_flag
     endif
     if precision == 'quadruple'
-      libgalahad_precision = libcutest_quadruple
+      libcutest_precision = libcutest_quadruple
       args_precision = pp_flag + '-DREAL_128' + '-DCUTEST_16btye_reals_exist'
     endif
 
     test(name,
          executable(name, file,
                     fortran_args : args_precision,
-                    link_with : libgalahad_precision,
+                    link_with : libcutest_precision,
                     link_language : 'fortran',
                     include_directories: libcutest_include,
                     install : true,
@@ -264,23 +264,23 @@ if build_tests
     file = test[3]
 
     if precision == 'single'
-      libgalahad_precision = libcutest_single
+      libcutest_precision = libcutest_single
       args_precision = pp_flag + '-DREAL_32'
     endif
     if precision == 'double'
-      libgalahad_precision = libcutest_double
+      libcutest_precision = libcutest_double
       args_precision = pp_flag
     endif
     if precision == 'quadruple'
-      libgalahad_precision = libcutest_quadruple
+      libcutest_precision = libcutest_quadruple
       args_precision = pp_flag + '-DREAL_128' + '-DCUTEST_16btye_reals_exist'
     endif
 
     test(name,
          executable(name, file,
                     fortran_args : args_precision,
                     c_args : args_precision,
-                    link_with : libgalahad_precision,
+                    link_with : libcutest_precision,
                     link_language : 'fortran',
                     include_directories: libcutest_include,
                     install : true,

diff --git a/src/test/meson.build b/src/test/meson.build
@@ -9,10 +9,10 @@ cutest_tests += [['cutest', 'single', 'ctest_single'         , files('ctest.F90'
                  ['cutest', 'double', 'utest_threaded_double', files('utest_threaded.F90', 'u_elfun_double.f', 'u_group_double.f', 'u_range_double.f')],
                  ['cutest', 'double', 'lqp_test_double'      , files('lqptest.F90'       , 'q_elfun_double.f', 'q_group_double.f', 'q_range_double.f')]]
 
-# cutest_c_tests += [['cutest', 'single', 'ctest_c_single', files('ctest.c', 'c_elfun_single.f', 'c_group_single.f', 'c_range_single.f')],
-                   # ['cutest', 'double', 'ctest_c_double', files('ctest.c', 'c_elfun_double.f', 'c_group_double.f', 'c_range_double.f')],
-                   # ['cutest', 'single', 'utest_c_single', files('utest.c', 'u_elfun_single.f', 'u_group_single.f', 'u_range_single.f')],
-                   # ['cutest', 'double', 'utest_c_double', files('utest.c', 'u_elfun_double.f', 'u_group_double.f', 'u_range_double.f')]]
+cutest_c_tests += [['cutest', 'single', 'ctest_c_single', files('ctest.c', 'c_elfun_single.f', 'c_group_single.f', 'c_range_single.f')],
+                   ['cutest', 'double', 'ctest_c_double', files('ctest.c', 'c_elfun_double.f', 'c_group_double.f', 'c_range_double.f')],
+                   ['cutest', 'single', 'utest_c_single', files('utest.c', 'u_elfun_single.f', 'u_group_single.f', 'u_range_single.f')],
+                   ['cutest', 'double', 'utest_c_double', files('utest.c', 'u_elfun_double.f', 'u_group_double.f', 'u_range_double.f')]]
 
 if build_quadruple
     cutest_tests += [['cutest', 'quadruple', 'ctest_quadruple'         , files('ctest.F90'         , 'c_elfun_quadruple.f', 'c_group_quadruple.f', 'c_range_quadruple.f')],
@@ -21,6 +21,6 @@ if build_quadruple
                      ['cutest', 'quadruple', 'utest_threaded_quadruple', files('utest_threaded.F90', 'u_elfun_quadruple.f', 'u_group_quadruple.f', 'u_range_quadruple.f')],
                      ['cutest', 'quadruple', 'lqp_test_quadruple'      , files('lqptest.F90'       , 'q_elfun_quadruple.f', 'q_group_quadruple.f', 'q_range_quadruple.f')]]
 
-    # cutest_c_tests += [['cutest', 'quadruple', 'ctest_c_quadruple', files('ctest.c', 'c_elfun_quadruple.f', 'c_group_quadruple.f', 'c_range_quadruple.f')],
-                       # ['cutest', 'quadruple', 'utest_c_quadruple', files('utest.c', 'u_elfun_quadruple.f', 'u_group_quadruple.f', 'u_range_quadruple.f')]]
+    cutest_c_tests += [['cutest', 'quadruple', 'ctest_c_quadruple', files('ctest.c', 'c_elfun_quadruple.f', 'c_group_quadruple.f', 'c_range_quadruple.f')],
+                       ['cutest', 'quadruple', 'utest_c_quadruple', files('utest.c', 'u_elfun_quadruple.f', 'u_group_quadruple.f', 'u_range_quadruple.f')]]
 endif