diff options
| -rw-r--r-- | fpm/src/fpm.f90 | 6 | ||||
| -rw-r--r-- | fpm/src/fpm_backend.f90 | 114 | ||||
| -rw-r--r-- | fpm/src/fpm_model.f90 | 10 |
3 files changed, 88 insertions, 42 deletions
diff --git a/fpm/src/fpm.f90 b/fpm/src/fpm.f90 index 95327b7..c822571 100644 --- a/fpm/src/fpm.f90 +++ b/fpm/src/fpm.f90 @@ -11,7 +11,7 @@ use fpm_model, only: fpm_model_t, srcfile_t, build_target_t, & FPM_TARGET_EXECUTABLE use fpm_sources, only: add_executable_sources, add_sources_from_dir -use fpm_targets, only: targets_from_sources, resolve_module_dependencies +use fpm_targets, only: targets_from_sources, resolve_module_dependencies, FPM_TARGET_ARCHIVE use fpm_manifest, only : get_package_data, default_executable, & default_library, package_t, default_test use fpm_error, only : error_t, fatal_error @@ -241,6 +241,10 @@ subroutine build_model(model, settings, package, error) model%link_flags = model%link_flags // " -l" // model%link_libraries(i)%s end do + if (model%targets(1)%ptr%target_type == FPM_TARGET_ARCHIVE) then + model%library_file = model%targets(1)%ptr%output_file + end if + call resolve_module_dependencies(model%targets,error) end subroutine build_model diff --git a/fpm/src/fpm_backend.f90 b/fpm/src/fpm_backend.f90 index aa087ea..08ea899 100644 --- a/fpm/src/fpm_backend.f90 +++ b/fpm/src/fpm_backend.f90 @@ -22,11 +22,9 @@ contains subroutine build_package(model) type(fpm_model_t), intent(inout) :: model - integer :: i, ilib - character(:), allocatable :: base, linking, subdir, link_flags + integer :: i, j type(build_target_ptr), allocatable :: queue(:) - - allocate(queue(0)) + integer, allocatable :: region_ptr(:) if (.not.exists(model%output_directory)) then call mkdir(model%output_directory) @@ -35,45 +33,47 @@ subroutine build_package(model) call mkdir(join_path(model%output_directory,model%package_name)) end if - if (model%targets(1)%ptr%target_type == FPM_TARGET_ARCHIVE) then - linking = " "//model%targets(1)%ptr%output_file - else - linking = " " - end if - - linking = linking//" "//model%link_flags - do i=1,size(model%targets) - call schedule_target(queue,model%targets(i)%ptr) + call schedule_target(model%targets(i)%ptr) end do - do i=1,size(queue) + call get_build_queue(queue, region_ptr, model%targets) - call build_target(model,queue(i)%ptr,linking) + do i=1,size(region_ptr)-1 + + !$OMP PARALLEL DO DEFAULT(SHARED) + do j=region_ptr(i),(region_ptr(i+1)-1) + + call build_target(model,queue(j)%ptr) + + end do + !$OMP END PARALLEL DO end do + end subroutine build_package -recursive subroutine schedule_target(queue,target) - ! Compile Fortran source, called recursively on it dependents +recursive subroutine schedule_target(target) + ! ! - type(build_target_ptr), intent(inout), allocatable :: queue(:) type(build_target_t), intent(inout), target :: target integer :: i, j, fh, stat type(build_target_t), pointer :: exe_obj - type(build_target_ptr) :: q_ptr - character(:), allocatable :: link_flags - if (target%enqueued .or. target%skip) then + if (target%scheduled .or. target%skip) then return end if + if (.not.exists(dirname(target%output_file))) then + call mkdir(dirname(target%output_file)) + end if + if (target%touched) then write(*,*) '(!) Circular dependency found with: ',target%output_file stop @@ -102,19 +102,20 @@ recursive subroutine schedule_target(queue,target) if (allocated(target%digest_cached)) then if (target%digest_cached == target%source%digest) target%skip = .true. end if - else + elseif (exists(target%output_file)) then target%skip = .true. end if target%link_objects = " " - + target%region = 1 do i=1,size(target%dependencies) - call schedule_target(queue,target%dependencies(i)%ptr) + call schedule_target(target%dependencies(i)%ptr) if (.not.target%dependencies(i)%ptr%skip) then target%skip = .false. + target%region = max(target%region,target%dependencies(i)%ptr%region+1) end if @@ -146,35 +147,63 @@ recursive subroutine schedule_target(queue,target) end do - if ( target%skip ) then + target%scheduled = .not.target%skip - return +end subroutine schedule_target - end if - q_ptr%ptr => target - queue = [queue, q_ptr] - target%enqueued = .true. +subroutine get_build_queue(queue, region_ptr, targets) + type(build_target_ptr), allocatable, intent(out) :: queue(:) + integer, allocatable :: region_ptr(:) + type(build_target_ptr), intent(in) :: targets(:) - ! target%built = .true. + integer :: i, j + integer :: nRegion, n_scheduled -end subroutine schedule_target + nRegion = 0 + n_scheduled = 0 + do i=1,size(targets) + if (targets(i)%ptr%scheduled) then + n_scheduled = n_scheduled + 1 + end if + nRegion = max(nRegion, targets(i)%ptr%region) + + end do + + allocate(queue(n_scheduled)) + allocate(region_ptr(nRegion+1)) + + n_scheduled = 1 + region_ptr(n_scheduled) = 1 + do i=1,nRegion + + do j=1,size(targets) + + if (targets(j)%ptr%scheduled) then + if (targets(j)%ptr%region == i) then + + queue(n_scheduled)%ptr => targets(j)%ptr + n_scheduled = n_scheduled + 1 + end if + end if + + end do + region_ptr(i+1) = n_scheduled + + end do + +end subroutine get_build_queue -subroutine build_target(model,target,linking) +subroutine build_target(model,target) type(fpm_model_t), intent(in) :: model - type(build_target_t), intent(inout), target :: target - character(*), intent(in) :: linking + type(build_target_t), intent(in), target :: target integer :: ilib, fh character(:), allocatable :: link_flags - if (.not.exists(dirname(target%output_file))) then - call mkdir(dirname(target%output_file)) - end if - select case(target%target_type) case (FPM_TARGET_OBJECT) @@ -182,7 +211,12 @@ subroutine build_target(model,target,linking) // " -o " // target%output_file) case (FPM_TARGET_EXECUTABLE) - link_flags = linking + if (allocated(model%library_file)) then + link_flags = " "//model%library_file//" "//model%link_flags + else + link_flags = " "//model%link_flags + end if + if (allocated(target%link_libraries)) then do ilib = 1, size(target%link_libraries) link_flags = link_flags // " -l" // target%link_libraries(ilib)%s diff --git a/fpm/src/fpm_model.f90 b/fpm/src/fpm_model.f90 index 2b8f312..3a879ad 100644 --- a/fpm/src/fpm_model.f90 +++ b/fpm/src/fpm_model.f90 @@ -75,10 +75,16 @@ type build_target_t ! Native libraries to link against character(:), allocatable :: link_objects + ! Objects needed to link this target logical :: touched = .false. - logical :: enqueued = .false. + ! Flag set when first visited to check for circular dependencies + logical :: scheduled = .false. + ! Flag set if build target is scheduled for building logical :: skip = .false. + ! Flag set if build target will be skipped (not built) + integer :: region + ! Targets in the same region are guaranteed independent integer(int64), allocatable :: digest_cached ! Previous hash @@ -97,6 +103,8 @@ type :: fpm_model_t ! Command line flags passed to fortran for compilation character(:), allocatable :: link_flags ! Command line flags pass for linking + character(:), allocatable :: library_file + ! Output file for library archive character(:), allocatable :: output_directory ! Base directory for build type(string_t), allocatable :: link_libraries(:) |