Removed gprof references. (#924)

* Removed gprof references.
bmad-sim · Apr 19, 2024 · 5fa0935 · 5fa0935
1 parent 915beef
commit 5fa0935
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 67 deletions.
diff --git a/bmad/CMakeLists.txt b/bmad/CMakeLists.txt
@@ -9,6 +9,7 @@ SET (PLOT_LINK_LIBS $ENV{PLOT_LINK_LIBS})
 
 # If this is a conda build, xraylib is contained
 # one level deeper in the include folder
+
 IF ($ENV{ACC_CONDA_BUILD})
   SET (INC_DIRS
     $ENV{ACC_CONDA_PATH}/include/xraylib/
@@ -36,15 +37,6 @@ SET (SRC_DIRS
   spin
   )
 
-# For profiling... - Note: This is not compatible with the -fPIC flag, so -pg can't be set for SHARED build.
-# SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-# SET (FFLAGS "-pg") 
-# SET (CFLAGS "-pg")
-
-# For SHARED support - Note: should now be set automatically by Master.cmake
-# SET (FFLAGS "-fPIC")
-# SET (LINK_FLAGS "-fPIC")
-
 SET (SHARED_DEPS
   sim_utils
   $ENV{ACC_BMAD_LINK_LIBS}

diff --git a/bsim/CMakeLists.txt b/bsim/CMakeLists.txt
@@ -48,9 +48,4 @@ if($ENV{ACC_ENABLE_MPI})
   list(APPEND EXE_SPECS "cmake_files/cmake.tune_scan_mpi")
 endif()
 
-## Profiler flags - Note: This is not compatible with the -fPIC flag, so -pg can't be set for SHARED build.
-# set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-# set (FFLAGS "-pg")  # For profiling
-# set (CFLAGS "-pg")
-
 include($ENV{ACC_BUILD_SYSTEM}/Master.cmake)
diff --git a/code_examples/cmake_template_scripts/CMakeLists.txt b/code_examples/cmake_template_scripts/CMakeLists.txt
@@ -7,9 +7,4 @@ project(ACC)
 
 set(EXE_SPECS cmake.test)
 
-## Profiler flags - Note: This	is not compatible with the -fPIC flag, so -pg can't be set for SHARED build.
-# SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-# SET (FFLAGS "-pg")  # For profiling
-# SET (CFLAGS "-pg")
-
 include($ENV{ACC_BUILD_SYSTEM}/Master.cmake)
diff --git a/forest/CMakeLists.txt b/forest/CMakeLists.txt
@@ -13,11 +13,6 @@ SET (SRC_DIRS
   code
   )
 
-## Profiler flags - Note: This  is not compatible with the -fPIC flag, so -pg can't be set for SHARED build.
-# set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-# set (FFLAGS "-pg") 
-# set (CFLAGS "-pg")
-
 include($ENV{ACC_BUILD_SYSTEM}/Master.cmake)
 
 

diff --git a/lux/CMakeLists.txt b/lux/CMakeLists.txt
@@ -14,9 +14,4 @@ if ($ENV{ACC_ENABLE_MPI})
   list (APPEND EXE_SPECS cmake.lux_mpi)
 endif ()
 
-# For profiling...
-# set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-# set (FFLAGS "-pg") 
-# set (CFLAGS "-pg")
-
 include($ENV{ACC_BUILD_SYSTEM}/Master.cmake)
diff --git a/sim_utils/CMakeLists.txt b/sim_utils/CMakeLists.txt
@@ -32,11 +32,6 @@ SET (SRC_DIRS
   special_functions
   )
 
-## Profiler flags - Note: This  is not compatible with the -fPIC flag, so -pg can't be set for the SHARED build.
-# SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-# SET (FFLAGS "-pg")  
-# SET (CFLAGS "-pg")
-
 SET (SHARED_DEPS
   ${PLOT_LINK_LIBS}
   $ENV{ACC_BMAD_LINK_LIBS}

diff --git a/tao/CMakeLists.txt b/tao/CMakeLists.txt
@@ -7,11 +7,6 @@ SET (CREATE_SHARED true)
 
 SET (PLOT_LINK_LIBS $ENV{PLOT_LINK_LIBS})
 
-## Profiler flags - Note: This	is not compatible with the -fPIC flag, so -pg can't be set for SHARED build.
-# SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-# SET (FFLAGS "-pg")  # For profiling
-# SET (CFLAGS "-pg")
-
 SET (SRC_DIRS
   code 
   ## hook # Now using function pointers

diff --git a/tao/version/tao_version_mod.f90 b/tao/version/tao_version_mod.f90
@@ -6,5 +6,5 @@
 !-
 
 module tao_version_mod
-character(*), parameter :: tao_version_date = "2024/04/18 12:45:55"
+character(*), parameter :: tao_version_date = "2024/04/18 23:00:54"
 end module
diff --git a/util/Master.cmake b/util/Master.cmake
@@ -362,22 +362,6 @@ ELSE ()
 ENDIF ()
 
 
-#------------------------------------------
-# Honor requests for compiling with 
-# profiling made via environment variable.
-#------------------------------------------
-IF ($ENV{ACC_ENABLE_PROFILING})
-  SET (BASE_Fortran_FLAGS "${BASE_Fortran_FLAGS} -pg")
-  SET (ACC_LINK_FLAGS "${ACC_LINK_FLAGS} -pg")
-  SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-  SET (BASE_C_FLAGS "${BASE_C_FLAGS} -pg")
-  SET (BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -pg")
-  IF ($ENV{ACC_ENABLE_SHARED})
-    SET (CMAKE_SHARED_LINKER_FLAGS "-pg ${CMAKE_SHARED_LINKER_FLAGS}")
-  ENDIF () 
-ENDIF ()
-
-
 #-----------------------------------------
 # Print some friendly build information
 # and according to the build type, set

diff --git a/util/dist_prefs b/util/dist_prefs
@@ -155,17 +155,6 @@ export ACC_ENABLE_SHARED_ONLY="Y"
 export ACC_ENABLE_FPIC="Y"
 
 
-#-----------------------------------------------------------
-# By default the gprof profiling flag "-pg" is off.
-# Setting the variable ACC_ENABLE_PROFILING here to "Y"
-# will enable the "-pg" flag to be added for compiling and 
-# linking all libraries and executables.
-#
-# NOTE - WILL NOT WORK ON macOS WITH XCODE 11.
-#-----------------------------------------------------------
-export ACC_ENABLE_PROFILING="N"
-
-
 #-----------------------------------------------------------
 # Setting the variable ACC_SET_GMAKE_JOBS here to an 
 # interger value will set gmake to execute that number of