mixed precision updates and fixes to use test-lib for both build systems

rem1776 · rem1776 · commit 10d3f5ddd2c3 · 2025-04-29T17:26:40.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,7 +53,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 # Build options
 option(OPENMP      "Build FMS with OpenMP support"        OFF)
-option(32BIT       "Build 32-bit (r4) FMS library"         ON)
+option(32BIT       "Build 32-bit (r4) FMS library"        OFF)
 option(64BIT       "Build 64-bit (r8) FMS library"        OFF)
 option(FPIC        "Build with position independent code" OFF)
 option(SHARED_LIBS "Build shared/dynamic libraries"       OFF)
@@ -76,7 +76,7 @@ endif()
 if(NOT kinds)
   message(STATUS "Single Precision 32BIT: ${32BIT}")
   message(STATUS "Double Precision 64BIT: ${64BIT}")
-  message(FATAL_ERROR "Either 32BIT or 64BIT should be ON")
+  message(STATUS "No kind specified, building default double precision (with mixed precision support). Real size will not be included in built library name.")
 endif()
 
 # Find dependencies
@@ -89,7 +89,7 @@ if (OPENMP)
 endif()
 
 if (WITH_YAML)
-  find_package(libyaml REQUIRED)
+  find_package(libyaml REQUIRED COMPONENTS C)
   include_directories(${LIBYAML_INCLUDE_DIR})
 endif ()
 
@@ -290,6 +290,7 @@ endif()
 # Obtain compiler-specific flags
 include(fms_compiler_flags)
 
+# TODO remove this section eventually, separate builds are no longer required
 foreach(kind ${kinds})
 
   set(libTgt fms_${kind})
@@ -300,9 +301,8 @@ foreach(kind ${kinds})
   add_library(${libTgt}_c OBJECT ${fms_c_src_files})
 
   target_include_directories(${libTgt}_c PRIVATE include
-                                                 grid_utils)
+                                                   grid_utils)
   target_compile_definitions(${libTgt}_c PRIVATE "${fms_defs}")
-
   target_link_libraries(${libTgt}_c PRIVATE NetCDF::NetCDF_C
                                             MPI::MPI_C)
 
@@ -340,22 +340,18 @@ foreach(kind ${kinds})
                                                  coupler/include
                                                  data_override/include
                                                  amip_interp/include)
-
   target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
   target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
-
   set_target_properties(${libTgt}_f PROPERTIES COMPILE_FLAGS "${${kind}_flags}")
-
   set_target_properties(${libTgt}_f PROPERTIES Fortran_MODULE_DIRECTORY
                                                ${moduleDir})
-
   target_link_libraries(${libTgt}_f PRIVATE NetCDF::NetCDF_Fortran
                                             MPI::MPI_Fortran)
-
   if(OpenMP_Fortran_FOUND)
     target_link_libraries(${libTgt}_f PRIVATE OpenMP::OpenMP_Fortran)
   endif()
 
+
   # Check if gnu 10 or higher
   # this should only be needed with mpich, but wasn't able to find a good way to find the MPI flavor consistently
   if ( CMAKE_Fortran_COMPILER_VERSION MATCHES "1[0-9]\.[0-9]*\.[0-9]*" AND CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
@@ -405,7 +401,6 @@ foreach(kind ${kinds})
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tridiagonal/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/amip_interp/include>)
-
   set(moduleDir "${CMAKE_CURRENT_BINARY_DIR}/${includeDir}")
   target_include_directories(${libTgt} INTERFACE
     $<BUILD_INTERFACE:${moduleDir}>
@@ -430,6 +425,149 @@ foreach(kind ${kinds})
 
 endforeach()
 
+# default build, same as an r8 build just different name
+if(NOT kinds)
+    message(STATUS "building default kind")
+    set(libTgt "fms")
+    set(includeDir "include")
+    set(moduleDir "${CMAKE_CURRENT_BINARY_DIR}/${includeDir}")
+    set(kind "r8")
+
+    # C
+    add_library(${libTgt}_c OBJECT ${fms_c_src_files})
+
+    target_include_directories(${libTgt}_c PRIVATE include
+                                                   grid_utils)
+    target_compile_definitions(${libTgt}_c PRIVATE "${fms_defs}")
+    target_link_libraries(${libTgt}_c PRIVATE NetCDF::NetCDF_C
+                                              MPI::MPI_C)
+
+    if(OpenMP_C_FOUND)
+      target_link_libraries(${libTgt}_c PRIVATE OpenMP::OpenMP_C)
+    endif()
+
+    if(WITH_YAML)
+      target_link_libraries(${libTgt}_c PRIVATE libyaml_C)
+      set_target_properties(${libTgt}_c PROPERTIES COMPILE_FLAGS "-L${LIBYAML_LIBRARIES} -lyaml")
+    endif()
+
+
+    # Fortran
+    add_library(${libTgt}_f OBJECT ${fms_fortran_src_files})
+
+    target_include_directories(${libTgt}_f PRIVATE include
+                                                   fms
+                                                   fms/include
+                                                   fms2_io/include
+                                                   string_utils/include
+                                                   mpp/include
+                                                   column_diagnostics/include
+                                                   monin_obukhov/include
+                                                   sat_vapor_pres/include
+                                                   horiz_interp/include
+                                                   diag_integral/include
+                                                   random_numbers/include
+                                                   diag_manager/include
+                                                   constants4
+                                                   topography/include
+                                                   axis_utils/include
+                                                   mosaic2/include
+                                                   constants
+                                                   astronomy/include
+                                                   field_manager/include
+                                                   time_interp/include
+                                                   tracer_manager/include
+                                                   tridiagonal/include
+                                                   interpolator/include
+                                                   coupler/include
+                                                   data_override/include
+                                                   amip_interp/include)
+    target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
+    target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
+    set_target_properties(${libTgt}_f PROPERTIES COMPILE_FLAGS "${${kind}_flags}")
+    set_target_properties(${libTgt}_f PROPERTIES Fortran_MODULE_DIRECTORY
+                                                 ${moduleDir})
+    target_link_libraries(${libTgt}_f PRIVATE NetCDF::NetCDF_Fortran
+                                              MPI::MPI_Fortran)
+    if(OpenMP_Fortran_FOUND)
+      target_link_libraries(${libTgt}_f PRIVATE OpenMP::OpenMP_Fortran)
+    endif()
+
+    # Check if gnu 10 or higher
+    # this should only be needed with mpich, but wasn't able to find a good way to find the MPI flavor consistently
+    if ( CMAKE_Fortran_COMPILER_VERSION MATCHES "1[0-9]\.[0-9]*\.[0-9]*" AND CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+      include(CheckFortranCompilerFlag)
+      check_fortran_compiler_flag("-fallow-argument-mismatch" _arg_mismatch_flag)
+      if(_arg_mismatch_flag)
+        message(STATUS "Adding -fallow-argument-mismatch flag to compile with GCC >=10 and MPICH")
+        target_compile_options(${libTgt}_f PRIVATE "-fallow-argument-mismatch;-w")
+      endif()
+    endif()
+
+    # FMS (C + Fortran)
+    if (SHARED_LIBS)
+        message(STATUS "Shared library target: ${libTgt}")
+        add_library(${libTgt} SHARED $<TARGET_OBJECTS:${libTgt}_c>
+                                     $<TARGET_OBJECTS:${libTgt}_f>)
+    else ()
+        message(STATUS "Static library target: ${libTgt}")
+        add_library(${libTgt} STATIC $<TARGET_OBJECTS:${libTgt}_c>
+                                     $<TARGET_OBJECTS:${libTgt}_f>)
+    endif ()
+
+    target_include_directories(${libTgt} PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms2_io/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/column_diagnostics/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/astronomy/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/monin_obukhov/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sat_vapor_pres/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/grid_utils>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/horiz_interp/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/topography/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/random_numbers/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_integral/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tracer_manager/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/interpolator/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/coupler/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tridiagonal/include>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/amip_interp/include>)
+
+    set(moduleDir "${CMAKE_CURRENT_BINARY_DIR}/${includeDir}")
+    target_include_directories(${libTgt} INTERFACE
+      $<BUILD_INTERFACE:${moduleDir}>
+      $<INSTALL_INTERFACE:${includeDir}>)
+
+    target_compile_definitions(${libTgt} PRIVATE "${fms_defs}")
+    target_compile_definitions(${libTgt} PRIVATE "${${kind}_defs}")
+
+    target_link_libraries(${libTgt} PUBLIC NetCDF::NetCDF_C
+                                           NetCDF::NetCDF_Fortran
+                                           MPI::MPI_Fortran)
+
+    if(OpenMP_Fortran_FOUND)
+      target_link_libraries(${libTgt} PRIVATE OpenMP::OpenMP_C OpenMP::OpenMP_Fortran)
+    endif()
+
+    add_library(FMS::${libTgt} ALIAS ${libTgt})
+
+    list(APPEND LIB_TARGETS ${libTgt})
+    install(DIRECTORY ${moduleDir}    DESTINATION ${CMAKE_INSTALL_PREFIX})
+    install(FILES ${fms_header_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/${includeDir})
+
+
+endif()
+
 install(
   TARGETS ${LIB_TARGETS}
   EXPORT FMSExports
@@ -440,23 +578,16 @@ install(
 ### Unit Testing
 include(CTest)
 
-# TODO set these like autotools
+# TODO autotools also checks if srun is available
 set(MPI_LAUNCHER "mpirun")
+# used in the test-lib.sh.in to make it behave differently when parsed by cmake
+set(USING_CMAKE "true")
 
-# parse and add build info to test script util functions (test-lib-cmake.sh.in)
+# parse and add build info to test script util file
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_fms/test-lib.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/test-lib.sh
                @ONLY)
 
-# single test for reference
-#add_executable(test_mpp test_fms/mpp/test_mpp.F90)
-#target_link_libraries(test_mpp FMS::fms_r4)
-#target_include_directories(test_mpp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include_r4)
-#add_test(NAME test_mpp
-#         COMMAND test_mpp2.sh
-#         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/mpp)
-
-
-# first we need to build any helper modules that are used by unit tests
+# build any helper modules that are used by unit tests
 list(APPEND TEST_MODS_SRC
   test_fms/diag_manager/testing_utils.F90
   test_fms/fms/test_fms.F90
@@ -471,11 +602,10 @@ list(APPEND TEST_MODS_SRC
   test_fms/mpp/test_mpp_update_domains_real.F90
   test_fms/mpp/test_system_clock.F90)
 
-
 add_library(testLibs "${TEST_MODS_SRC}")
-target_link_libraries(testLibs FMS::fms_r4)
+target_link_libraries(testLibs FMS::fms)
 target_compile_definitions(testLibs PRIVATE TEST_MOS_KIND_=r8_kind)
-target_include_directories(testLibs PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include_r4
+target_include_directories(testLibs PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include
                                     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/fms/include
                                     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/data_override/include
                                     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/mosaic2
@@ -489,20 +619,28 @@ foreach (testFile ${TEST_SRC})
   get_filename_component (TName ${testFile} NAME_WE)
 
   add_executable(${TName} ${testFile})
-  # openmp/ mpi ?
-  target_link_libraries(${TName} PUBLIC FMS::fms_r4
+  target_compile_definitions(${TName} PRIVATE "${r8_defs}")
+  set_target_properties(${TName} PROPERTIES COMPILE_FLAGS "${r8_flags}")
+  target_link_libraries(${TName} PUBLIC FMS::fms
+                                 PRIVATE testLibs
+                                   )
+
+  if(WITH_YAML)
+    target_link_libraries(${TName} PRIVATE yaml ${LIBYAML_LIBRARIES})
+  endif()
 
-                                 PRIVATE testLibs)
+  if(OPENMP)
+    target_link_libraries(${TName} PRIVATE OpenMP::OpenMP_Fortran)
+  endif()
 
   set_target_properties(${TName} PROPERTIES Fortran_MODULE_DIRECTORY
-                                               ${moduleDir})
-  target_include_directories(${TName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include_r4
+                                            ${moduleDir})
+  target_include_directories(${TName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include
                                        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/fms/include
                                        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/data_override/include
                                        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/mosaic2
                                        PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-  # TODO we'll need to compile the tests with both precisions and change the executable names accordingly
-  # this is just to get the compile working
+  # TODO compile with both precisions
   target_compile_definitions(${TName} PRIVATE TEST_MOS_KIND_=r8_kind
                                      PRIVATE AU_TEST_KIND_=r8_kind
                                      PRIVATE FMS_TEST_BC_TYPE_=bc
@@ -523,11 +661,32 @@ foreach (testFile ${TEST_SRC})
 endforeach ()
 
 
-# find any test scripts and run them
-file(GLOB_RECURSE TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/mpp/*.sh)
-#list(FILTER ${TEST_SCRIPTS} EXCLUDE REGEX "test-lib*")
-#list(FILTER ${TEST_SCRIPTS} EXCLUDE REGEX "tap-driver.*")
-
+# find any test scripts and run them (TODO after the precision tests are worked out this can be used)
+#file(GLOB_RECURSE TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/*/*.sh)
+#list(FILTER TEST_SCRIPTS EXCLUDE REGEX "test-lib*")
+#list(FILTER TEST_SCRIPTS EXCLUDE REGEX "tap-driver.*")
+
+# gather all the tests scripts that don't need mixed precision executables
+file(GLOB_RECURSE DM_TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/diag_manager/*.sh)
+file(GLOB_RECURSE IO_TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/fms2_io/*.sh)
+file(GLOB_RECURSE MPP_TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/mpp/*.sh)
+list(APPEND TEST_SCRIPTS
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/block_control/test_block_control.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/coupler/test_gex.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/data_override/test_data_override_init.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/drifters/test_drifters2.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/exchange/test_xgrid2.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/fms/test_fms2.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/parser/test_yaml_parser.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/string_utils/test_string_utils.sh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/time_manager/test_time_manager2.sh
+  ${DM_TEST_SCRIPTS}
+  ${IO_TEST_SCRIPTS}
+  ${MPP_TEST_SCRIPTS})
+
+list(FILTER TEST_SCRIPTS EXCLUDE REGEX "check_crashes.*")
+
+# add each test
 foreach (testScript ${TEST_SCRIPTS})
   get_filename_component(testName ${testScript} NAME_WE)
   add_test(NAME ${testName}
diff --git a/configure.ac b/configure.ac
@@ -463,6 +463,10 @@ AC_SUBST([NOUNDEFINED])
 # Used in Makefiles.
 AC_SUBST([MODDIR],[\$\(top_builddir\)/.mods])
 
+# Define CMake variables used in test-lib.sh.in as empty strings
+AC_SUBST([CMAKE_CURRENT_SOURCE_DIR], [])
+AC_SUBST([USING_CMAKE],[])
+
 # These files will be created when the configure script is run.
 AC_CONFIG_FILES([
   Makefile
diff --git a/test_fms/mpp/Makefile.am b/test_fms/mpp/Makefile.am
@@ -87,7 +87,7 @@ test_mpp_print_memuse_stats_stderr_SOURCES = test_mpp_print_memuse_stats_stderr.
 test_mpp_print_memuse_stats_file_SOURCES = test_mpp_print_memuse_stats_file.F90
 test_mpp_memutils_begin_2x_SOURCES = test_mpp_memutils_begin_2x.F90
 test_mpp_memutils_end_before_begin_SOURCES = test_mpp_memutils_end_before_begin.F90
-test_read_ascii_file_SOURCES = test_mpp_read_ascii_file.F90
+test_mpp_read_ascii_file_SOURCES = test_mpp_read_ascii_file.F90
 test_read_input_nml_SOURCES = test_read_input_nml.F90
 test_stdout_SOURCES = test_stdout.F90
 test_stderr_SOURCES = test_stderr.F90
@@ -150,7 +150,7 @@ TESTS = test_mpp_domains2.sh \
   test_mpp_memuse.sh \
   test_mpp_mem_dump.sh \
   test_mpp_memutils_mod.sh \
-  test_read_ascii_file.sh \
+  test_mpp_read_ascii_file.sh \
   test_read_input_nml2.sh \
   test_stdout.sh \
   test_stderr.sh \
@@ -193,7 +193,7 @@ EXTRA_DIST = test_mpp_domains2.sh \
   test_mpp_memuse.sh \
   test_mpp_mem_dump.sh \
   test_mpp_memutils_mod.sh \
-  test_read_ascii_file.sh \
+  test_mpp_read_ascii_file.sh \
   test_read_input_nml2.sh \
   test_stdout.sh \
   test_stderr.sh \
diff --git a/test_fms/mpp/test_mpp_init_logfile.sh b/test_fms/mpp/test_mpp_init_logfile.sh
@@ -1,5 +1,3 @@
-!/bin/sh
-
 #***********************************************************************
 #                   GNU Lesser General Public License
 #
diff --git a/test_fms/mpp/test_mpp_read_ascii_file.sh b/test_fms/mpp/test_mpp_read_ascii_file.sh
diff --git a/test_fms/test-lib.sh.in b/test_fms/test-lib.sh.in

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-!/bin/sh`
`2`		`-`
`3`	`1`	`#***********************************************************************`
`4`	`2`	`# GNU Lesser General Public License`
`5`	`3`	`#`