From 2ed6a389da84f773f13b921ae6e544c8b0b707e3 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Thu, 22 Oct 2020 09:23:51 -0400 Subject: [PATCH] Fortran: Renamed submodules to have the full scope in their name. --- bindings/Fortran/CMakeLists.txt | 23 +++++++++++-------- .../Fortran/modules/adios2_adios_init_mod.F90 | 4 ++-- ...mpi.F90 => adios2_adios_init_mpi_smod.F90} | 4 ++-- ....F90 => adios2_adios_init_serial_smod.F90} | 4 ++-- .../Fortran/modules/adios2_io_open_mod.F90 | 4 ++-- ...od_mpi.F90 => adios2_io_open_mpi_smod.F90} | 4 ++-- ...ial.F90 => adios2_io_open_serial_smod.F90} | 4 ++-- 7 files changed, 25 insertions(+), 22 deletions(-) rename bindings/Fortran/modules/{adios2_adios_init_mod_mpi.F90 => adios2_adios_init_mpi_smod.F90} (96%) rename bindings/Fortran/modules/{adios2_adios_init_mod_serial.F90 => adios2_adios_init_serial_smod.F90} (95%) rename bindings/Fortran/modules/{adios2_io_open_mod_mpi.F90 => adios2_io_open_mpi_smod.F90} (94%) rename bindings/Fortran/modules/{adios2_io_open_mod_serial.F90 => adios2_io_open_serial_smod.F90} (93%) diff --git a/bindings/Fortran/CMakeLists.txt b/bindings/Fortran/CMakeLists.txt index 7dfb13121c..c3863f34b0 100644 --- a/bindings/Fortran/CMakeLists.txt +++ b/bindings/Fortran/CMakeLists.txt @@ -9,12 +9,15 @@ FortranCInterface_HEADER(FC.h MACRO_NAMESPACE "FC_") FortranCInterface_VERIFY(CXX QUIET) # Check whether the compiler supports Fortran submodule constructs we need. -if(CMAKE_Fortran_COMPILER_ID MATCHES "Cray") - # Cray submodules have naming issues so just don't use them for now - set(ADIOS2_HAVE_FORTRAN_SUBMODULES 0 CACHE INTERNAL "" FORCE) -else() - adios2_check_fortran_submodules(ADIOS2_HAVE_FORTRAN_SUBMODULES) -endif() +adios2_check_fortran_submodules(ADIOS2_HAVE_FORTRAN_SUBMODULES) + +# Leaving this workaround in place but commented out just in case we need to +# re-enable it in the future +# +# Cray submodules have naming issues so just don't use them for now +#if(CMAKE_Fortran_COMPILER_ID MATCHES "Cray") +# set(ADIOS2_HAVE_FORTRAN_SUBMODULES 0 CACHE INTERNAL "" FORCE) +#endif() if(ADIOS2_USE_Fortran_flag_argument_mismatch) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch") @@ -34,12 +37,12 @@ add_library(adios2_fortran modules/adios2_parameters_mod.f90 modules/adios2_adios_mod.f90 modules/adios2_adios_init_mod.F90 - modules/adios2_adios_init_mod_serial.F90 + modules/adios2_adios_init_serial_smod.F90 modules/adios2_attribute_mod.f90 modules/adios2_attribute_data_mod.f90 modules/adios2_io_mod.f90 modules/adios2_io_open_mod.F90 - modules/adios2_io_open_mod_serial.F90 + modules/adios2_io_open_serial_smod.F90 modules/adios2_io_define_variable_mod.f90 modules/adios2_io_define_attribute_mod.f90 modules/adios2_engine_mod.f90 @@ -84,8 +87,8 @@ if(ADIOS2_HAVE_MPI) target_compile_definitions(adios2_fortran PRIVATE "$<$:ADIOS2_HAVE_MPI_F>") set(adios2_fortran_mpi_srcs - modules/adios2_adios_init_mod_mpi.F90 - modules/adios2_io_open_mod_mpi.F90 + modules/adios2_adios_init_mpi_smod.F90 + modules/adios2_io_open_mpi_smod.F90 f2c/adios2_f2c_adios_mpi.cpp f2c/adios2_f2c_io_mpi.cpp ) diff --git a/bindings/Fortran/modules/adios2_adios_init_mod.F90 b/bindings/Fortran/modules/adios2_adios_init_mod.F90 index 7ab08ddf98..010b6e8461 100644 --- a/bindings/Fortran/modules/adios2_adios_init_mod.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_mod.F90 @@ -67,9 +67,9 @@ module subroutine adios2_init_config_debug_mpi(adios, config_file, comm, ierr) #else - use adios2_adios_init_mod_serial + use adios2_adios_init_serial_mod # ifdef ADIOS2_HAVE_MPI_F - use adios2_adios_init_mod_mpi + use adios2_adios_init_mpi_mod # endif #endif diff --git a/bindings/Fortran/modules/adios2_adios_init_mod_mpi.F90 b/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 similarity index 96% rename from bindings/Fortran/modules/adios2_adios_init_mod_mpi.F90 rename to bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 index ec2245ebdf..2726908404 100644 --- a/bindings/Fortran/modules/adios2_adios_init_mod_mpi.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 @@ -13,9 +13,9 @@ #endif #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES -submodule ( adios2_adios_init_mod ) mpi +submodule ( adios2_adios_init_mod ) adios2_adios_init_mpi_smod #else -module adios2_adios_init_mod_mpi +module adios2_adios_init_mpi_mod #endif use adios2_parameters_mod diff --git a/bindings/Fortran/modules/adios2_adios_init_mod_serial.F90 b/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 similarity index 95% rename from bindings/Fortran/modules/adios2_adios_init_mod_serial.F90 rename to bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 index 2c4cbc1bd1..8c95476ed8 100644 --- a/bindings/Fortran/modules/adios2_adios_init_mod_serial.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 @@ -13,9 +13,9 @@ #endif #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES -submodule ( adios2_adios_init_mod ) serial +submodule ( adios2_adios_init_mod ) adios2_adios_init_serial_smod #else -module adios2_adios_init_mod_serial +module adios2_adios_init_serial_mod #endif use adios2_parameters_mod diff --git a/bindings/Fortran/modules/adios2_io_open_mod.F90 b/bindings/Fortran/modules/adios2_io_open_mod.F90 index 56475a6e73..f464fb39f1 100644 --- a/bindings/Fortran/modules/adios2_io_open_mod.F90 +++ b/bindings/Fortran/modules/adios2_io_open_mod.F90 @@ -38,9 +38,9 @@ module subroutine adios2_open_new_comm(engine, io, name, adios2_mode, comm, ierr #else - use adios2_io_open_mod_serial + use adios2_io_open_serial_mod # ifdef ADIOS2_HAVE_MPI_F - use adios2_io_open_mod_mpi + use adios2_io_open_mpi_mod # endif #endif diff --git a/bindings/Fortran/modules/adios2_io_open_mod_mpi.F90 b/bindings/Fortran/modules/adios2_io_open_mpi_smod.F90 similarity index 94% rename from bindings/Fortran/modules/adios2_io_open_mod_mpi.F90 rename to bindings/Fortran/modules/adios2_io_open_mpi_smod.F90 index f63add5ff9..333a6a5b6d 100644 --- a/bindings/Fortran/modules/adios2_io_open_mod_mpi.F90 +++ b/bindings/Fortran/modules/adios2_io_open_mpi_smod.F90 @@ -13,9 +13,9 @@ #endif #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES -submodule ( adios2_io_open_mod ) mpi +submodule ( adios2_io_open_mod ) adios2_io_open_mpi_smod #else -module adios2_io_open_mod_mpi +module adios2_io_open_mpi_mod #endif use adios2_parameters_mod diff --git a/bindings/Fortran/modules/adios2_io_open_mod_serial.F90 b/bindings/Fortran/modules/adios2_io_open_serial_smod.F90 similarity index 93% rename from bindings/Fortran/modules/adios2_io_open_mod_serial.F90 rename to bindings/Fortran/modules/adios2_io_open_serial_smod.F90 index 334ae757ba..5e3f785e51 100644 --- a/bindings/Fortran/modules/adios2_io_open_mod_serial.F90 +++ b/bindings/Fortran/modules/adios2_io_open_serial_smod.F90 @@ -13,9 +13,9 @@ #endif #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES -submodule ( adios2_io_open_mod ) serial +submodule ( adios2_io_open_mod ) adios2_io_open_serial_smod #else -module adios2_io_open_mod_serial +module adios2_io_open_serial_mod #endif use adios2_parameters_mod