Use fypp instead of C preprocessor for Macro expansion

CMakeLists.txt

@@ -310,7 +310,18 @@ endif()
 # and generate documentation. Instead, we can simply include the list of .f90
 # files that will eventually be used to compile <target>.
 
-macro(HANDLE_SOURCES target useCommon)
+macro(HANDLE_SOURCES target useCommon useOpenACC useOpenMP)
+
+    if (${useOpenACC} AND ${useOpenMP})
+      message(FATAL_ERROR "OpenACC and OpenMP at same time is unsupported.")
+    elseif (${useOpenACC})
+      set(MFC_GPU_MODE "OpenACC")
+    elseif (${useOpenMP})
+      set(MFC_GPU_MODE "OpenMP")
+    else()
+      set(MFC_GPU_MODE "")
+    endif()
+
     set(${target}_DIR "${CMAKE_SOURCE_DIR}/src/${target}")
     set(common_DIR    "${CMAKE_SOURCE_DIR}/src/common")
 
@@ -372,6 +383,7 @@ macro(HANDLE_SOURCES target useCommon)
                                  -D MFC_${${target}_UPPER}
                                  -D MFC_COMPILER="${CMAKE_Fortran_COMPILER_ID}"
                                  -D MFC_CASE_OPTIMIZATION=False
+                                 -D MFC_GPU_MODE="${MFC_GPU_MODE}"
                                  -D chemistry=False
                                  --line-numbering
                                  --no-folding
@@ -388,10 +400,10 @@ macro(HANDLE_SOURCES target useCommon)
 endmacro()
 
 
-HANDLE_SOURCES(pre_process ON)
-HANDLE_SOURCES(simulation ON)
-HANDLE_SOURCES(post_process ON)
-HANDLE_SOURCES(syscheck OFF)
+HANDLE_SOURCES(pre_process ON OFF OFF)
+HANDLE_SOURCES(simulation ON ${MFC_OpenACC} ${MFC_OpenMP})
+HANDLE_SOURCES(post_process ON OFF OFF)
+HANDLE_SOURCES(syscheck OFF ${MFC_OpenACC} ${MFC_OpenMP})
 
 
 # MFC_SETUP_TARGET: Given a target (herein <target>), this macro creates a new

src/common/include/omp_macros.fpp

@@ -1,11 +1,5 @@
 #:include 'shared_parallel_macros.fpp'
 
-#:set NVIDIA_COMPILER_ID="NVHPC"
-#:set PGI_COMPILER_ID="PGI"
-#:set INTEL_COMPILER_ID="Intel"
-#:set CCE_COMPILER_ID="Cray"
-#:set AMD_COMPILER_ID="LLVMFlang"
-
 #:def OMP_MAP_STR(map_type, var_list)
     #:assert map_type is not None
     #:assert isinstance(map_type, str) 
@@ -23,11 +17,11 @@
         #:assert isinstance(default, str)
         #:assert (default == 'present' or default == 'none')
         #:if default == 'present'
-            #:if MFC_COMPILER == NVIDIA_COMPILER_ID or MFC_COMPILER == PGI_COMPILER_ID
+            #:if USING_NVHPC
                 #:set default_val = 'defaultmap(tofrom:aggregate) defaultmap(tofrom:allocatable) defaultmap(tofrom:pointer) '
-            #:elif MFC_COMPILER == CCE_COMPILER_ID
+            #:elif USING_CCE
                 #:set default_val = 'defaultmap(tofrom:aggregate) defaultmap(present:allocatable) defaultmap(present:pointer) '
-            #:elif MFC_COMPILER == AMD_COMPILER_ID
+            #:elif USING_AMD
                 #:set default_val = ''
             #:else
                 #:set default_val = 'defaultmap(tofrom:aggregate) defaultmap(tofrom:allocatable) defaultmap(tofrom:pointer) '
@@ -176,13 +170,13 @@
         & deviceptr_val.strip('\n') + attach_val.strip('\n')
     #! Hardcoding the parallelism for now
 
-    #:if MFC_COMPILER == NVIDIA_COMPILER_ID or MFC_COMPILER == PGI_COMPILER_ID
+    #:if USING_NVHPC
         #:set omp_start_directive = '!$omp target teams loop defaultmap(firstprivate:scalar) bind(teams,parallel) '
         #:set omp_end_directive = '!$omp end target teams loop'
-    #:elif MFC_COMPILER == CCE_COMPILER_ID
+    #:elif USING_CCE
         #:set omp_start_directive = '!$omp target teams distribute parallel do simd defaultmap(firstprivate:scalar) '
         #:set omp_end_directive = '!$omp end target teams distribute parallel do simd'
-    #:elif MFC_COMPILER == AMD_COMPILER_ID
+    #:elif USING_AMD
         #:set omp_start_directive = '!$omp target teams distribute parallel do '
         #:set omp_end_directive = '!$omp end target teams distribute parallel do'
     #:else
@@ -223,11 +217,11 @@
         & deviceptr_val.strip('\n') + attach_val.strip('\n')
     #! Hardcoding the parallelism for now
 
-    #:if MFC_COMPILER == NVIDIA_COMPILER_ID or MFC_COMPILER == PGI_COMPILER_ID
+    #:if USING_NVHPC
         #:set omp_start_directive = '!$omp target teams loop defaultmap(firstprivate:scalar) bind(teams,parallel) '
-    #:elif MFC_COMPILER == CCE_COMPILER_ID
+    #:elif USING_CCE
         #:set omp_start_directive = '!$omp target teams distribute parallel do simd defaultmap(firstprivate:scalar) '
-    #:elif MFC_COMPILER == AMD_COMPILER_ID
+    #:elif USING_AMD
         #:set omp_start_directive = '!$omp target teams distribute parallel do '
     #:else
         #:set omp_start_directive = '!$omp target teams loop defaultmap(firstprivate:scalar) bind(teams,parallel) '
@@ -239,11 +233,11 @@
 
 #:def END_OMP_PARALLEL_LOOP()
 
-    #:if MFC_COMPILER == NVIDIA_COMPILER_ID or MFC_COMPILER == PGI_COMPILER_ID
+    #:if USING_NVHPC
         #:set omp_end_directive = '!$omp end target teams loop'
-    #:elif MFC_COMPILER == CCE_COMPILER_ID
+    #:elif USING_CCE
         #:set omp_end_directive = '!$omp end target teams distribute parallel do simd'
-    #:elif MFC_COMPILER == AMD_COMPILER_ID
+    #:elif USING_AMD
         #:set omp_end_directive = '!$omp end target teams distribute parallel do'
     #:else
         #:set omp_end_directive = '!$omp end target teams loop'
@@ -266,7 +260,7 @@
         #:set function_name_val = ''
     #:endif
 
-    #:if MFC_COMPILER == AMD_COMPILER_ID
+    #:if USING_AMD
         #:set clause_val = ''
     #:else
         #:set clause_val = nohost_val.strip('\n')
@@ -290,9 +284,9 @@
 
 #! Not fully implemented yet (ignores most args right now)
 #:def OMP_LOOP(collapse=None, parallelism=None, data_dependency=None, reduction=None, reductionOp=None, private=None, extraOmpArgs=None)
-    #:if MFC_COMPILER == NVIDIA_COMPILER_ID or MFC_COMPILER == PGI_COMPILER_ID
+    #:if USING_NVHPC
         #:set omp_directive = '!$omp loop bind(thread)'
-    #:elif MFC_COMPILER == CCE_COMPILER_ID or MFC_COMPILER == AMD_COMPILER_ID
+    #:elif USING_CCE or USING_AMD
         #:set omp_directive = ''
     #:else
         #:set omp_directive = ''
@@ -390,34 +384,4 @@
     #:set omp_directive = '!$omp barrier ' + clause_val + extraOmpArgs_val.strip('\n')
     $:omp_directive
 #:enddef
-
-#:def UNDEF_AMD(code)
-    #:if MFC_COMPILER != AMD_COMPILER_ID
-        $:code
-    #:endif
-#:enddef
-
-#:def DEF_AMD(code)
-    #:if MFC_COMPILER == AMD_COMPILER_ID
-        $:code
-    #:endif
-#:enddef
-
-#:def UNDEF_CCE(code)
-    #:if MFC_COMPILER != CCE_COMPILER_ID
-        $:code
-    #:endif
-#:enddef
-
-#:def DEF_CCE(code)
-    #:if MFC_COMPILER == CCE_COMPILER_ID
-        $:code
-    #:endif
-#:enddef
-
-#:def UNDEF_NVIDIA(code)
-    #:if MFC_COMPILER != NVIDIA_COMPILER_ID and MFC_COMPILER != PGI_COMPILER_ID
-        $:code
-    #:endif
-#:enddef
 ! New line at end of file is required for FYPP