From 4ecfe57eda09c43be539c7048cba7c5d4405cec1 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Wed, 22 Nov 2023 14:50:31 -0500 Subject: [PATCH 1/6] Update CMakeLists.txt --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7eb2546b16..d687fb7142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,9 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_ if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 21.7) message(FATAL_ERROR "${__err_msg}ERROR: NVHPC v21.7 or newer is required to build MFC.") endif() + if ((CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.0) AND (MAKE_BUILD_TYPE STREQUAL "Debug")) + message(FATAL_ERROR "${__err_msg}ERROR: NVHPC v23.0 or newer is required to build MFC with GPU and Debug options.") + endif() elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") message(FATAL_ERROR "${__err_msg}ERROR: MFC does not support the Apple Clang compilers. Please consult the documentation.") endif() From 353be7d35ec636b66eac6ab0b4305c0272649a1b Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Wed, 22 Nov 2023 15:00:07 -0500 Subject: [PATCH 2/6] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d687fb7142..577f3bff63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,7 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_ endif() if (CMAKE_BUILD_TYPE STREQUAL "Debug") - add_compile_options(-C -g -traceback -Mchkptr -Mchkstk -Minform=inform -Mbounds) + add_compile_options(-C -g -O0 -traceback -Mchkptr -Mchkstk -Minform=inform -Mbounds) endif() endif() From 78de8fc0d7458bbf9c5fac95d62018d7ebc58142 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Wed, 22 Nov 2023 15:03:55 -0500 Subject: [PATCH 3/6] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 577f3bff63..e650807947 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_ if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 21.7) message(FATAL_ERROR "${__err_msg}ERROR: NVHPC v21.7 or newer is required to build MFC.") endif() - if ((CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.0) AND (MAKE_BUILD_TYPE STREQUAL "Debug")) + if ((CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.0) AND (MAKE_BUILD_TYPE STREQUAL "Debug") AND (MFC_OpenACC)) message(FATAL_ERROR "${__err_msg}ERROR: NVHPC v23.0 or newer is required to build MFC with GPU and Debug options.") endif() elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") From 53d3b3b389e9f14d63e76d110c5fb35432950bd3 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Wed, 22 Nov 2023 15:22:31 -0500 Subject: [PATCH 4/6] Update CMakeLists.txt --- CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e650807947..af8af981a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,10 +65,16 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") endif() elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_ID STREQUAL "PGI")) if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 21.7) - message(FATAL_ERROR "${__err_msg}ERROR: NVHPC v21.7 or newer is required to build MFC.") + message(FATAL_ERROR "${__err_msg}ERROR: When using NVHPC, v21.7 or newer is required to build MFC.") endif() - if ((CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.0) AND (MAKE_BUILD_TYPE STREQUAL "Debug") AND (MFC_OpenACC)) - message(FATAL_ERROR "${__err_msg}ERROR: NVHPC v23.0 or newer is required to build MFC with GPU and Debug options.") + if (MAKE_BUILD_TYPE STREQUAL "Debug")) + if (MFC_OpenACC) + if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.0)) + message(FATAL_ERROR "${__err_msg}ERROR: When using NVHPC, v23.0 or newer is required to build MFC with Debug and GPU options.") + endif() + else() + message(FATAL_ERROR "${__err_msg}ERROR: Debug is not working with NVHPC and CPU options at present.") + endif() endif() elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") message(FATAL_ERROR "${__err_msg}ERROR: MFC does not support the Apple Clang compilers. Please consult the documentation.") From 317933105f07c8278abad1a7e9eb6ef6df66617e Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Wed, 22 Nov 2023 15:27:27 -0500 Subject: [PATCH 5/6] Update CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af8af981a7..d24ed14828 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,9 +67,9 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_ if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 21.7) message(FATAL_ERROR "${__err_msg}ERROR: When using NVHPC, v21.7 or newer is required to build MFC.") endif() - if (MAKE_BUILD_TYPE STREQUAL "Debug")) + if (MAKE_BUILD_TYPE STREQUAL "Debug") if (MFC_OpenACC) - if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.0)) + if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.0) message(FATAL_ERROR "${__err_msg}ERROR: When using NVHPC, v23.0 or newer is required to build MFC with Debug and GPU options.") endif() else() From f2786c57da4f9d1b21e0531d81e5a88f9afc4511 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Mon, 11 Dec 2023 08:22:29 -0500 Subject: [PATCH 6/6] Update CMakeLists.txt --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d24ed14828..c2d9a0e86c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,8 +73,9 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_ message(FATAL_ERROR "${__err_msg}ERROR: When using NVHPC, v23.0 or newer is required to build MFC with Debug and GPU options.") endif() else() - message(FATAL_ERROR "${__err_msg}ERROR: Debug is not working with NVHPC and CPU options at present.") - endif() + if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 23.8) + message(FATAL_ERROR "${__err_msg}ERROR: Debug is not working with NVHPC 23.X and older and CPU options at present.") + endif() endif() elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") message(FATAL_ERROR "${__err_msg}ERROR: MFC does not support the Apple Clang compilers. Please consult the documentation.")