Merge branch 'main' into features_application

Author: perazz

ci/run_tests.sh

@@ -164,6 +164,11 @@ pushd program_with_module
 "$fpm" run --target Program_with_module
 popd
 
+pushd program_with_cpp_guarded_module
+"$fpm" build
+"$fpm" run 
+popd
+
 pushd link_executable
 "$fpm" build
 "$fpm" run --target gomp_test

example_packages/program_with_cpp_guarded_module/.gitignore

@@ -0,0 +1 @@
+build/*

example_packages/program_with_cpp_guarded_module/app/main.f90

@@ -0,0 +1,12 @@
+program program_with_module
+#if defined(HAVE_MODULE)
+  use greet_m, only: greeting
+#endif  
+  implicit none
+
+#ifndef HAVE_MODULE
+  print *, 'OK without module'
+#else  
+  print *, greeting
+#endif  
+end program program_with_module

example_packages/program_with_cpp_guarded_module/fpm.toml

@@ -0,0 +1,3 @@
+name = "Program_with_cpp_guarded_module"
+# Enable CPP but do not define macros
+[preprocess.cpp]

src/fpm.f90

@@ -169,7 +169,8 @@ subroutine build_model(model, settings, package_config, error)
                     lib_dir = join_path(dep%proj_dir, manifest%library%source_dir)
                     if (is_dir(lib_dir)) then
                         call add_sources_from_dir(model%packages(i)%sources, lib_dir, FPM_SCOPE_LIB, &
-                            with_f_ext=model%packages(i)%preprocess%suffixes, error=error)
+                            with_f_ext=model%packages(i)%preprocess%suffixes, error=error, &
+                            preprocess=model%packages(i)%preprocess)
                         if (allocated(error)) exit
                     end if
                 end if
@@ -223,7 +224,7 @@ subroutine build_model(model, settings, package_config, error)
     if (is_dir('app') .and. auto_exe) then
         call add_sources_from_dir(model%packages(1)%sources,'app', FPM_SCOPE_APP, &
                                    with_executables=.true., with_f_ext=model%packages(1)%preprocess%suffixes,&
-                                   error=error)
+                                   error=error,preprocess=model%packages(1)%preprocess)
 
         if (allocated(error)) then
             return
@@ -233,7 +234,8 @@ subroutine build_model(model, settings, package_config, error)
     if (is_dir('example') .and. auto_example) then
         call add_sources_from_dir(model%packages(1)%sources,'example', FPM_SCOPE_EXAMPLE, &
                                   with_executables=.true., &
-                                  with_f_ext=model%packages(1)%preprocess%suffixes,error=error)
+                                  with_f_ext=model%packages(1)%preprocess%suffixes,error=error,&
+                                  preprocess=model%packages(1)%preprocess)
 
         if (allocated(error)) then
             return
@@ -243,7 +245,8 @@ subroutine build_model(model, settings, package_config, error)
     if (is_dir('test') .and. auto_test) then
         call add_sources_from_dir(model%packages(1)%sources,'test', FPM_SCOPE_TEST, &
                                   with_executables=.true., &
-                                  with_f_ext=model%packages(1)%preprocess%suffixes,error=error)
+                                  with_f_ext=model%packages(1)%preprocess%suffixes,error=error,&
+                                  preprocess=model%packages(1)%preprocess)
 
         if (allocated(error)) then
             return
@@ -254,7 +257,7 @@ subroutine build_model(model, settings, package_config, error)
         call add_executable_sources(model%packages(1)%sources, package%executable, FPM_SCOPE_APP, &
                                      auto_discover=auto_exe, &
                                      with_f_ext=model%packages(1)%preprocess%suffixes, &
-                                     error=error)
+                                     error=error,preprocess=model%packages(1)%preprocess)
 
         if (allocated(error)) then
             return
@@ -265,7 +268,7 @@ subroutine build_model(model, settings, package_config, error)
         call add_executable_sources(model%packages(1)%sources, package%example, FPM_SCOPE_EXAMPLE, &
                                      auto_discover=auto_example, &
                                      with_f_ext=model%packages(1)%preprocess%suffixes, &
-                                     error=error)
+                                     error=error,preprocess=model%packages(1)%preprocess)
 
         if (allocated(error)) then
             return
@@ -276,7 +279,7 @@ subroutine build_model(model, settings, package_config, error)
         call add_executable_sources(model%packages(1)%sources, package%test, FPM_SCOPE_TEST, &
                                      auto_discover=auto_test, &
                                      with_f_ext=model%packages(1)%preprocess%suffixes, &
-                                     error=error)
+                                     error=error,preprocess=model%packages(1)%preprocess)
 
         if (allocated(error)) then
             return

src/fpm/manifest/feature.f90

@@ -40,12 +40,7 @@ module fpm_manifest_feature
     use fpm_error, only: error_t, fatal_error, syntax_error
     use fpm_environment, only: OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_WINDOWS, OS_CYGWIN, OS_SOLARIS, &
                              OS_FREEBSD, OS_OPENBSD, OS_ALL, OS_NAME, match_os_type
-    use fpm_compiler, only: compiler_enum, compiler_id_name, match_compiler_type, &
-                          id_unknown, id_gcc, id_f95, id_caf, &
-                          id_intel_classic_nix, id_intel_classic_mac, id_intel_classic_windows, &
-                          id_intel_llvm_nix, id_intel_llvm_windows, id_intel_llvm_unknown, &
-                          id_pgi, id_nvhpc, id_nag, id_flang, id_flang_new, id_f18, &
-                          id_ibmxl, id_cray, id_lahey, id_lfortran, id_all
+    use fpm_compiler, only: compiler_enum, compiler_id_name, match_compiler_type, id_all
     use fpm_strings, only: string_t, lower, operator(==)
     use tomlf, only: toml_table, toml_array, toml_key, toml_stat
     use fpm_toml, only: get_value, len, serializable_t, set_value, set_string, set_list, add_table, &

src/fpm/manifest/feature_collection.f90

@@ -15,8 +15,7 @@ module fpm_manifest_feature_collection
                           id_unknown, id_gcc, id_f95, id_caf, &
                           id_intel_classic_nix, id_intel_classic_mac, id_intel_classic_windows, &
                           id_intel_llvm_nix, id_intel_llvm_windows, id_intel_llvm_unknown, &
-                          id_pgi, id_nvhpc, id_nag, id_flang, id_flang_new, id_f18, &
-                          id_ibmxl, id_cray, id_lahey, id_lfortran, id_all
+                          id_pgi, id_nvhpc, id_nag, id_flang, id_lahey, id_lfortran, id_all
     use fpm_strings, only: string_t, lower, operator(==), split, str
     use tomlf, only: toml_table, toml_array, toml_key, toml_stat
     use fpm_toml, only: get_value, len, serializable_t, set_value, set_string, set_list, add_table, &
@@ -857,38 +856,38 @@ function default_release_feature() result(collection)
         collection%base%default = .true.
 
         ! Add release variants for different compilers
-        call collection%push_variant(default_variant('release-caf', id_caf, OS_ALL, &
+        call collection%push_variant(default_variant('release', id_caf, OS_ALL, &
             ' -O3 -Wimplicit-interface -fPIC -fmax-errors=1 -funroll-loops'))
 
-        call collection%push_variant(default_variant('release-gfortran', id_gcc, OS_ALL, &
+        call collection%push_variant(default_variant('release', id_gcc, OS_ALL, &
             ' -O3 -Wimplicit-interface -fPIC -fmax-errors=1 -funroll-loops -fcoarray=single'))
 
-        call collection%push_variant(default_variant('release-f95', id_f95, OS_ALL, &
+        call collection%push_variant(default_variant('release', id_f95, OS_ALL, &
             ' -O3 -Wimplicit-interface -fPIC -fmax-errors=1 -ffast-math -funroll-loops'))
 
-        call collection%push_variant(default_variant('release-nvfortran', id_nvhpc, OS_ALL, &
+        call collection%push_variant(default_variant('release', id_nvhpc, OS_ALL, &
             ' -Mbackslash'))
 
-        call collection%push_variant(default_variant('release-ifort', id_intel_classic_nix, OS_ALL, &
+        call collection%push_variant(default_variant('release', id_intel_classic_nix, OS_LINUX, &
             ' -fp-model precise -pc64 -align all -error-limit 1 -reentrancy&
             & threaded -nogen-interfaces -assume byterecl'))
 
-        call collection%push_variant(default_variant('release-ifort-windows', id_intel_classic_nix, &
+        call collection%push_variant(default_variant('release', id_intel_classic_windows, &
             OS_WINDOWS, ' /fp:precise /align:all /error-limit:1 /reentrancy:threaded&
             & /nogen-interfaces /assume:byterecl'))
 
-        call collection%push_variant(default_variant('release-ifx', id_intel_llvm_nix, OS_ALL, &
-            ' -fp-model=precise -pc64 -align all -error-limit 1 -reentrancy&
-            & threaded -nogen-interfaces -assume byterecl'))
+        call collection%push_variant(default_variant('release', id_intel_llvm_nix, &
+            OS_LINUX, ' -fp-model=precise -pc64 -align all -error-limit 1 -reentrancy threaded&
+            & -nogen-interfaces -assume byterecl'))
 
-        call collection%push_variant(default_variant('release-ifx-windows', id_intel_llvm_nix, &
+        call collection%push_variant(default_variant('release', id_intel_llvm_nix, &
             OS_WINDOWS, ' /fp:precise /align:all /error-limit:1 /reentrancy:threaded&
             & /nogen-interfaces /assume:byterecl'))
 
-        call collection%push_variant(default_variant('release-nagfor', id_nag, OS_ALL, &
+        call collection%push_variant(default_variant('release', id_nag, OS_ALL, &
             ' -O4 -coarray=single -PIC'))
 
-        call collection%push_variant(default_variant('release-lfortran', id_lfortran, OS_ALL, &
+        call collection%push_variant(default_variant('release', id_lfortran, OS_ALL, &
             ' flag_lfortran_opt'))
 
     end function default_release_feature

src/fpm_compiler.F90

@@ -10,7 +10,7 @@
 ! Intel oneAPI      ifx        icx     -module         -I            -qopenmp   X
 ! PGI               pgfortran  pgcc    -module         -I            -mp        X
 ! NVIDIA            nvfortran  nvc     -module         -I            -mp        X
-! LLVM flang        flang      clang   -module         -I            -mp        X
+! LLVM flang        flang      clang   -module-dir     -I            -fopenmp   X
 ! LFortran          lfortran   ---     -J              -I            --openmp   X
 ! Lahey/Futjitsu    lfc        ?       -M              -I            -openmp    ?
 ! NAG               nagfor     ?       -mdir           -I            -openmp    x
@@ -71,8 +71,8 @@ module fpm_compiler
         id_pgi, &
         id_nvhpc, &
         id_nag, &
+        id_flang_classic, &
         id_flang, &
-        id_flang_new, &
         id_f18, &
         id_ibmxl, &
         id_cray, &
@@ -275,7 +275,13 @@ module fpm_compiler
     flag_cray_free_form = " -ffree"
 
 character(*), parameter :: &
-    flag_flang_new_openmp = " -fopenmp"
+    flag_flang_new_openmp = " -fopenmp", &
+    flag_flang_new_debug = " -g", &
+    flag_flang_new_opt = " -O3", &
+    flag_flang_new_pic = " -fPIC", &
+    flag_flang_new_free_form = " -ffree-form", &
+    flag_flang_new_fixed_form = " -ffixed-form", &
+    flag_flang_new_no_implicit_typing = " -fimplicit-none"
 
 contains
 
@@ -296,11 +302,11 @@ function get_default_flags(self, release) result(flags)
     ! Append position-independent code (PIC) flag, that is necessary 
     ! building shared libraries
     select case (self%id)
-    case (id_gcc, id_f95, id_caf, id_flang, id_f18, id_lfortran, &
+    case (id_gcc, id_f95, id_caf, id_flang_classic, id_f18, id_lfortran, &
           id_intel_classic_nix, id_intel_classic_mac, id_intel_llvm_nix, &
           id_pgi, id_nvhpc, id_nag, id_cray, id_ibmxl)
         pic_flag = " -fPIC"
-    case (id_flang_new)
+    case (id_flang)
         ! flang-new doesn't support -fPIC on Windows MSVC target
         if (get_os_type() == OS_WINDOWS) then
             pic_flag = ""
@@ -414,6 +420,11 @@ subroutine get_release_compile_flags(id, flags)
         flags = &
             flag_lfortran_opt
 
+    case(id_flang)
+        flags = &
+            flag_flang_new_opt//&
+            flag_flang_new_pic
+
     end select
 end subroutine get_release_compile_flags
 
@@ -509,6 +520,12 @@ subroutine get_debug_compile_flags(id, flags)
 
     case(id_lfortran)
         flags = ""
+
+    case(id_flang)
+        flags = &
+            flag_flang_new_debug//&
+            flag_flang_new_pic
+
     end select
 end subroutine get_debug_compile_flags
 
@@ -521,7 +538,7 @@ pure subroutine set_cpp_preprocessor_flags(id, flags)
     select case(id)
     case default
         flag_cpp_preprocessor = ""
-    case(id_caf, id_gcc, id_f95, id_nvhpc, id_flang_new)
+    case(id_caf, id_gcc, id_f95, id_nvhpc, id_flang)
         flag_cpp_preprocessor = "-cpp"
     case(id_intel_classic_windows, id_intel_llvm_windows)
         flag_cpp_preprocessor = "/fpp"
@@ -616,7 +633,7 @@ function get_include_flag(self, path) result(flags)
         flags = "-I "//path
 
     case(id_caf, id_gcc, id_f95, id_cray, id_nvhpc, id_pgi, &
-        & id_flang, id_flang_new, id_f18, &
+        & id_flang_classic, id_flang, id_f18, &
         & id_intel_classic_nix, id_intel_classic_mac, &
         & id_intel_llvm_nix, id_lahey, id_nag, id_ibmxl, &
         & id_lfortran)
@@ -640,10 +657,10 @@ function get_module_flag(self, path) result(flags)
     case(id_caf, id_gcc, id_f95, id_cray, id_lfortran)
         flags = "-J "//path
 
-    case(id_nvhpc, id_pgi, id_flang)
+    case(id_nvhpc, id_pgi, id_flang_classic)
         flags = "-module "//path
 
-    case(id_flang_new, id_f18)
+    case(id_flang, id_f18)
         flags = "-module-dir "//path
 
     case(id_intel_classic_nix, id_intel_classic_mac, &
@@ -674,7 +691,7 @@ function get_shared_flag(self) result(shared_flag)
     select case (self%id)
     case default
         shared_flag = "-shared"
-    case (id_gcc, id_f95, id_flang, id_flang_new, id_lfortran)
+    case (id_gcc, id_f95, id_flang_classic, id_flang, id_lfortran)
         shared_flag = "-shared"
     case (id_intel_classic_nix, id_intel_llvm_nix, id_pgi, id_nvhpc)
         shared_flag = "-shared"
@@ -709,6 +726,9 @@ function get_feature_flag(self, feature) result(flags)
        case(id_cray)
            flags = flag_cray_no_implicit_typing
 
+       case(id_flang)
+           flags = flag_flang_new_no_implicit_typing
+
        end select
 
     case("implicit-typing")
@@ -740,7 +760,7 @@ function get_feature_flag(self, feature) result(flags)
        case(id_caf, id_gcc, id_f95)
            flags = flag_gnu_free_form
 
-       case(id_pgi, id_nvhpc, id_flang)
+       case(id_pgi, id_nvhpc, id_flang_classic)
            flags = flag_pgi_free_form
 
        case(id_nag)
@@ -756,14 +776,17 @@ function get_feature_flag(self, feature) result(flags)
        case(id_cray)
            flags = flag_cray_free_form
 
+       case(id_flang)
+           flags = flag_flang_new_free_form
+
        end select
 
     case("fixed-form")
        select case(self%id)
        case(id_caf, id_gcc, id_f95)
            flags = flag_gnu_fixed_form
 
-       case(id_pgi, id_nvhpc, id_flang)
+       case(id_pgi, id_nvhpc, id_flang_classic)
            flags = flag_pgi_fixed_form
 
        case(id_nag)
@@ -782,6 +805,9 @@ function get_feature_flag(self, feature) result(flags)
        case(id_lfortran)
            flags = flag_lfortran_fixed_form
 
+       case(id_flang)
+           flags = flag_flang_new_fixed_form
+
        end select
 
     case("default-form")
@@ -851,7 +877,7 @@ subroutine get_default_c_compiler(f_compiler, c_compiler)
     case(id_intel_llvm_nix,id_intel_llvm_windows)
         c_compiler = 'icx'
 
-    case(id_flang, id_flang_new, id_f18)
+    case(id_flang_classic, id_flang, id_f18)
         c_compiler='clang'
 
     case(id_ibmxl)
@@ -886,7 +912,7 @@ subroutine get_default_cxx_compiler(f_compiler, cxx_compiler)
     case(id_intel_llvm_nix,id_intel_llvm_windows)
         cxx_compiler = 'icpx'
 
-    case(id_flang, id_flang_new, id_f18)
+    case(id_flang_classic, id_flang, id_f18)
         cxx_compiler='clang++'
 
     case(id_ibmxl)
@@ -1000,7 +1026,7 @@ function match_compiler_type(compiler) result(id)
     end if
 
     if (check_compiler(compiler, "flang-new")) then
-        id = id_flang_new
+        id = id_flang
         return
     end if
 
@@ -1009,6 +1035,11 @@ function match_compiler_type(compiler) result(id)
         return
     end if
 
+    if (check_compiler(compiler, "flang-classic")) then
+        id = id_flang_classic
+        return
+    end if
+
     if (check_compiler(compiler, "flang")) then
         id = id_flang
         return
@@ -1061,7 +1092,7 @@ pure elemental subroutine validate_compiler_name(compiler_name, is_valid)
       case("gfortran", "ifort", "ifx", "pgfortran", &
            "nvfortran", "flang", "caf", &
            "f95", "lfortran", "lfc", "nagfor",&
-           "crayftn", "xlf90", "ftn95")
+           "crayftn", "xlf90", "ftn95", "all")
         is_valid = .true.
       case default
         is_valid = .false.
@@ -1793,8 +1824,8 @@ pure function compiler_id_name(id) result(name)
        case(id_pgi);                   name = "pgfortran"
        case(id_nvhpc);                 name = "nvfortran"
        case(id_nag);                   name = "nagfor"
-       case(id_flang);                 name = "flang"
-       case(id_flang_new);             name = "flang-new"
+       case(id_flang_classic);         name = "flang"
+       case(id_flang);                 name = "flang-new"
        case(id_f18);                   name = "f18"
        case(id_ibmxl);                 name = "xlf90"
        case(id_cray);                  name = "crayftn"