fortran-lang minpack

Author: perazz

ci/meta_tests.sh

@@ -27,6 +27,11 @@ pushd metapackage_stdlib
 "$fpm" run --verbose
 popd
 
+pushd metapackage_minpack
+"$fpm" build --verbose
+"$fpm" run --verbose
+popd
+
 pushd metapackage_mpi
 "$fpm" build --verbose 
 "$fpm" run --verbose

example_packages/metapackage_minpack/app/main.f90

@@ -0,0 +1,7 @@
+program main
+  use metapackage_minpack, only: simple_test
+  implicit none
+  logical :: success
+  call simple_test(success)
+  stop merge(0,1,success) 
+end program main

example_packages/metapackage_minpack/fpm.toml

@@ -0,0 +1,2 @@
+name = "metapackage_minpack"
+dependencies.minpack="*"

example_packages/metapackage_minpack/src/metapackage_minpack.f90

@@ -0,0 +1,14 @@
+module metapackage_minpack
+  use minpack_module, only: wp
+  use iso_fortran_env, only: real64
+  implicit none
+  private
+
+  public :: simple_test
+contains
+  subroutine simple_test(success)
+    logical, intent(out) :: success 
+    ! Success! can read minpack module
+    success = wp == real64 
+  end subroutine simple_test 
+end module metapackage_minpack

src/fpm/manifest/meta.f90

@@ -45,6 +45,9 @@ module fpm_manifest_metapackages
         !> Request stdlib support
         type(metapackage_request_t) :: stdlib
 
+        !> fortran-lang minpack
+        type(metapackage_request_t) :: minpack
+
     end type metapackage_config_t
 
 
@@ -158,12 +161,15 @@ subroutine new_meta_config(self, table, error)
 
         !> The toml table is not checked here because it already passed
         !> the "new_dependencies" check
-        call new_request(self%openmp, "openmp", table, error);
+        call new_request(self%openmp, "openmp", table, error)
         if (allocated(error)) return
 
         call new_request(self%stdlib, "stdlib", table, error)
         if (allocated(error)) return
 
+        call new_request(self%minpack, "minpack", table, error)
+        if (allocated(error)) return
+
         call new_request(self%mpi, "mpi", table, error)
         if (allocated(error)) return
 
@@ -178,7 +184,7 @@ logical function is_meta_package(key)
         select case (key)
 
             !> Supported metapackages
-            case ("openmp","stdlib","mpi")
+            case ("openmp","stdlib","mpi","minpack")
                 is_meta_package = .true.
 
             case default

src/fpm_meta.f90

@@ -19,7 +19,7 @@ module fpm_meta
 use fpm_model
 use fpm_command_line
 use fpm_manifest_dependency, only: dependency_config_t
-use fpm_git, only : git_target_branch
+use fpm_git, only : git_target_branch, git_target_tag
 use fpm_manifest, only: package_config_t
 use fpm_environment, only: get_env,os_is_unix
 use fpm_filesystem, only: run, get_temp_filename, getline, exists, canon_path, is_dir, get_dos_path
@@ -153,9 +153,10 @@ subroutine init_from_name(this,name,compiler,error)
 
     !> Initialize metapackage by name
     select case(name)
-        case("openmp"); call init_openmp(this,compiler,error)
-        case("stdlib"); call init_stdlib(this,compiler,error)
-        case("mpi");    call init_mpi   (this,compiler,error)
+        case("openmp");  call init_openmp (this,compiler,error)
+        case("stdlib");  call init_stdlib (this,compiler,error)
+        case("minpack"); call init_minpack(this,compiler,error)
+        case("mpi");     call init_mpi    (this,compiler,error)
         case default
             call syntax_error(error, "Package "//name//" is not supported in [metapackages]")
             return
@@ -216,6 +217,30 @@ subroutine init_openmp(this,compiler,error)
 
 end subroutine init_openmp
 
+!> Initialize minpack metapackage for the current system
+subroutine init_minpack(this,compiler,error)
+    class(metapackage_t), intent(inout) :: this
+    type(compiler_t), intent(in) :: compiler
+    type(error_t), allocatable, intent(out) :: error
+
+    !> Cleanup
+    call destroy(this)
+
+    !> minpack is queried as a dependency from the official repository
+    this%has_dependencies = .true.
+
+    allocate(this%dependency(1))
+
+    !> 1) minpack. There are no true releases currently. Fetch HEAD
+    this%dependency(1)%name = "minpack"
+    this%dependency(1)%git = git_target_tag("https://github.com/fortran-lang/minpack", "v2.0.0-rc.1")
+    if (.not.allocated(this%dependency(1)%git)) then
+        call fatal_error(error,'cannot initialize git repo dependency for minpack metapackage')
+        return
+    end if
+
+end subroutine init_minpack
+
 !> Initialize stdlib metapackage for the current system
 subroutine init_stdlib(this,compiler,error)
     class(metapackage_t), intent(inout) :: this
@@ -408,6 +433,13 @@ subroutine resolve_metapackage_model(model,package,settings,error)
         if (allocated(error)) return
     endif
 
+    ! stdlib
+    if (package%meta%minpack%on) then
+        call add_metapackage_model(model,package,settings,"minpack",error)
+        if (allocated(error)) return
+    endif
+
+
     ! Stdlib is not 100% thread safe. print a warning to the user
     if (package%meta%stdlib%on .and. package%meta%openmp%on) then
         write(stdout,'(a)')'<WARNING> both openmp and stdlib requested: some functions may not be thread-safe!'