fixes for cmake 32/64bit builds and enable CI testing via ctest #1787
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -343,7 +343,7 @@ foreach(kind ${kinds}) | |
| 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}") | ||
|
Contributor
There was a problem hiding this comment. comments not for this line, but just looking at line 76 - 79, the messages seem misleading. Could they be changed to something like "building select modules and procedures in 32bit precision"?
Contributor
There was a problem hiding this comment. Also, line 278 - 278, I don't think the OVERLOAD macros are there anymore
Contributor
Author
There was a problem hiding this comment.
nice catch! should be removed now |
||
| set_target_properties(${libTgt}_f PROPERTIES Fortran_MODULE_DIRECTORY | ||
| ${moduleDir}) | ||
| target_link_libraries(${libTgt}_f PRIVATE NetCDF::NetCDF_Fortran | ||
|
|
@@ -588,6 +588,14 @@ include(CTest) | |
| set(MPI_LAUNCHER "mpirun") | ||
| # used in the test-lib.sh.in to make it behave differently when parsed by cmake | ||
| set(USING_CMAKE "true") | ||
| # set the fms library to link tests with based on whats built | ||
| if(NOT kinds) | ||
| set(fmsLibraryName FMS::fms) | ||
|
Contributor
There was a problem hiding this comment. line 439, isn't kind always defined?
Contributor
Author
There was a problem hiding this comment. line 439 uses |
||
| elseif(64BIT) | ||
| set(fmsLibraryName FMS::fms_r8) | ||
| else() | ||
|
||
| set(fmsLibraryName FMS::fms_r4) | ||
| endif() | ||
|
|
||
| # 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 | ||
|
|
@@ -610,7 +618,7 @@ list(APPEND TEST_MODS_SRC | |
| test_fms/mpp/test_system_clock.F90) | ||
|
|
||
| add_library(testLibs "${TEST_MODS_SRC}") | ||
| target_link_libraries(testLibs ${fmsLibraryName}) | ||
| target_compile_definitions(testLibs PRIVATE TEST_MOS_KIND_=r8_kind) | ||
| target_include_directories(testLibs PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include | ||
| PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_fms/fms/include | ||
|
|
@@ -691,6 +699,7 @@ list(APPEND TEST_SRC_SINGLE_TARGET | |
| test_fms/fms2_io/test_domain_io.F90 | ||
| test_fms/fms2_io/test_collective_io.F90 | ||
| test_fms/fms2_io/test_generalized_indices.F90 | ||
| test_fms/fms2_io/test_parallel_writes.F90 | ||
| test_fms/fms/test_fms.F90 | ||
| test_fms/interpolator/test_interpolator.F90 | ||
| test_fms/mpp/test_clock_init.F90 | ||
|
|
@@ -769,21 +778,25 @@ list(APPEND TEST_SRC_MULTI_TARGET | |
| test_fms/sat_vapor_pres/test_sat_vapor_pres.F90 | ||
| test_fms/time_interp/test_time_interp.F90 | ||
| test_fms/time_interp/test_time_interp_external.F90 | ||
| test_fms/time_interp/test_time_interp_conservative_hi.F90 | ||
| test_fms/topography/test_topography.F90 | ||
| test_fms/tracer_manager/test_tracer_manager.F90 | ||
| test_fms/tridiagonal/test_tridiagonal.F90 | ||
| ) | ||
|
|
||
| # add all the test executables and set up linking + compile flags | ||
| foreach (testFile ${TEST_SRC_SINGLE_TARGET}) | ||
|
|
||
| get_filename_component (TName ${testFile} NAME_WE) | ||
| add_executable(${TName} ${testFile}) | ||
| target_link_libraries(${TName} PUBLIC ${fmsLibraryName} | ||
| PRIVATE testLibs) | ||
| if(32BIT) | ||
| target_compile_definitions(${TName} PRIVATE "${r4_defs} ${fms_defs}") | ||
| else() | ||
| target_compile_definitions(${TName} PRIVATE "${r8_defs} ${fms_defs} ") | ||
| set_target_properties(${TName} PROPERTIES COMPILE_FLAGS ${r8_flags}) | ||
| endif() | ||
|
|
||
| if(WITH_YAML) | ||
| target_link_libraries(${TName} PRIVATE yaml ${LIBYAML_LIBRARIES}) | ||
|
|
@@ -806,18 +819,16 @@ foreach (testFile ${TEST_SRC_MULTI_TARGET}) | |
| get_filename_component (TName ${testFile} NAME_WE) | ||
|
|
||
| add_executable(${TName}_r8 ${testFile}) | ||
| target_compile_definitions(${TName}_r8 PRIVATE "${r8_defs} ${fms_defs}") | ||
| set_target_properties(${TName}_r8 PROPERTIES COMPILE_FLAGS ${r8_flags}) | ||
| target_link_libraries(${TName}_r8 PUBLIC ${fmsLibraryName} | ||
| PRIVATE testLibs) | ||
| add_executable(${TName}_r4 ${testFile}) | ||
| target_compile_definitions(${TName}_r4 PRIVATE "${r4_defs} ${fms_defs}") | ||
| # seems counterintuitive but r4 tests use r8 default | ||
| # they specify kind values explicitly with the preprocessor where needed (TEST_FMS_KIND_) | ||
| set_target_properties(${TName}_r4 PROPERTIES COMPILE_FLAGS ${r8_flags}) | ||
| target_link_libraries(${TName}_r4 PUBLIC ${fmsLibraryName} | ||
| PRIVATE testLibs | ||
| ) | ||
|
|
||
|
|
@@ -879,8 +890,16 @@ foreach (testScript ${TEST_SCRIPTS}) | |
| ENVIRONMENT "parser_skip=skip" | ||
| ) | ||
| endif() | ||
|
|
||
| endforeach() | ||
|
|
||
| # skip parallel netcdf tests if its not enabled in given install | ||
| IF(NOT NetCDF_PARALLEL) | ||
|
Contributor
There was a problem hiding this comment. Leaving what @J-Lentz pointed out, line 290 should say "parallel netcdf io" instead of "collective netcdf io" |
||
| set_tests_properties(test_collective_io PROPERTIES | ||
| ENVIRONMENT "parallel_skip=skip" | ||
| ) | ||
| endif() | ||
|
|
||
| set(CMAKE_CTEST_ARGUMENTS "--output-on-failure") | ||
|
|
||
| ### Package config | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just curious, why was this removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was mainly to make the amount of jobs smaller. It'll just compile with openmp everytime.
I was thinking as we move away from autotools we can add more options to this one, just didn't want to make the CI too bloated.