Skip to content

Commit

Permalink
4.11.0 MINOR UPDATE
Browse files Browse the repository at this point in the history
* SF_TIMER has been upgraded to use
cpu_time
system_clock
date_and_time

so to provide cpu and wall times from start/stop clock

TODO: add MPI awareness so to
. avoid if(master)start_timer in the calling program
. use MPI_WTIME to get wall time and gather cpu_time to measure total used CPU time (it matters for HPC)
  • Loading branch information
aamaricci committed Sep 13, 2024
1 parent e1bb48b commit 4705c9b
Show file tree
Hide file tree
Showing 4 changed files with 330 additions and 179 deletions.
13 changes: 7 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ ADD_SUBDIRECTORY(${SRC_DIR_MINPACK})
SET(SRC_DIR_QUADPACK ${LIB_SRC}/quadpack)
ADD_SUBDIRECTORY(${SRC_DIR_QUADPACK})


SET(SRC_DIR_SF_MPI ${LIB_SRC}/SF_MPI)
ADD_SUBDIRECTORY(${SRC_DIR_SF_MPI})

#########################################

SET(SRC_DIR_SF_ARRAYS ${LIB_SRC}/SF_ARRAYS)
Expand Down Expand Up @@ -174,9 +178,6 @@ ADD_SUBDIRECTORY(${SRC_DIR_SF_TIMER})

#########################################

SET(SRC_DIR_SF_MPI ${LIB_SRC}/SF_MPI)
ADD_SUBDIRECTORY(${SRC_DIR_SF_MPI})


SET(SRC_DIR_SF_IOTOOLS ${LIB_SRC}/SF_IOTOOLS)
ADD_SUBDIRECTORY(${SRC_DIR_SF_IOTOOLS})
Expand Down Expand Up @@ -238,6 +239,7 @@ IF(WITH_BLAS_LAPACK)
$<TARGET_OBJECTS:SF_MISCLIB>
$<TARGET_OBJECTS:SF_TIMERLIB>
$<TARGET_OBJECTS:SF_MPILIB>
$<TARGET_OBJECTS:SF_PARSE_INPUTLIB>
$<TARGET_OBJECTS:SF_IOTOOLSLIB>
$<TARGET_OBJECTS:SF_LINALGLIB>
$<TARGET_OBJECTS:SF_DERIVATELIB>
Expand All @@ -248,7 +250,6 @@ IF(WITH_BLAS_LAPACK)
$<TARGET_OBJECTS:SF_INTERPOLATELIB>
$<TARGET_OBJECTS:SF_RANDOMLIB>
$<TARGET_OBJECTS:SF_SP_LINALGLIB>
$<TARGET_OBJECTS:SF_PARSE_INPUTLIB>
$<TARGET_OBJECTS:SCIFORLIB>
)
ELSE()
Expand All @@ -265,6 +266,7 @@ ELSE()
$<TARGET_OBJECTS:SF_TIMERLIB>
$<TARGET_OBJECTS:SF_MPILIB>
$<TARGET_OBJECTS:SF_IOTOOLSLIB>
$<TARGET_OBJECTS:SF_PARSE_INPUTLIB>
$<TARGET_OBJECTS:SF_LINALGLIB>
$<TARGET_OBJECTS:SF_DERIVATELIB>
$<TARGET_OBJECTS:SF_OPTIMIZELIB>
Expand All @@ -274,7 +276,6 @@ ELSE()
$<TARGET_OBJECTS:SF_INTERPOLATELIB>
$<TARGET_OBJECTS:SF_RANDOMLIB>
$<TARGET_OBJECTS:SF_SP_LINALGLIB>
$<TARGET_OBJECTS:SF_PARSE_INPUTLIB>
$<TARGET_OBJECTS:SCIFORLIB>
)
ENDIF()
Expand Down Expand Up @@ -304,6 +305,7 @@ ADD_DEPENDENCIES(SCIFORLIB
SF_TIMERLIB
SF_MPILIB
SF_IOTOOLSLIB
SF_PARSE_INPUTLIB
SF_DERIVATELIB
SF_LINALGLIB
SF_OPTIMIZELIB
Expand All @@ -313,7 +315,6 @@ ADD_DEPENDENCIES(SCIFORLIB
SF_RANDOMLIB
SF_FFTLIB
SF_SP_LINALGLIB
SF_PARSE_INPUTLIB
)


Expand Down
Loading

0 comments on commit 4705c9b

Please sign in to comment.