Skip to content

Commit 627336d

Browse files
mabrahamacmnpv
authored andcommitted
Remove ExtraE support
This never did anything
1 parent df581b5 commit 627336d

File tree

5 files changed

+8
-142
lines changed

5 files changed

+8
-142
lines changed

CMakeLists.txt

-13
Original file line numberDiff line numberDiff line change
@@ -662,19 +662,6 @@ if(GMX_EXTERNAL_TINYXML2)
662662
endif()
663663
endif()
664664

665-
option(GMX_EXTRAE "Add support for tracing using EXTRAE" OFF)
666-
mark_as_advanced(GMX_EXTRAE)
667-
668-
if (GMX_EXTRAE)
669-
find_package(EXTRAE)
670-
if(EXTRAE_FOUND)
671-
include_directories(SYSTEM ${EXTRAE_INCLUDE_DIR})
672-
set(HAVE_EXTRAE 1)
673-
else()
674-
message(FATAL_ERROR "EXTRAE library was not found. Please add the correct path to CMAKE_PREFIX_PATH")
675-
endif()
676-
endif()
677-
678665
include(ThreadMPI)
679666
# Enable core threading facilities
680667
tmpi_enable_core("${CMAKE_SOURCE_DIR}/src/external/thread_mpi/include")

cmake/FindEXTRAE.cmake

-105
This file was deleted.

src/config.h.cmakein

-3
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@
171171
/* Use (and compile) HDF5 related i/o features (H5MD) */
172172
#cmakedefine01 GMX_USE_HDF5
173173

174-
/* Add support for tracing using Extrae */
175-
#cmakedefine01 HAVE_EXTRAE
176-
177174
/* Enable NVIDIA NVTX instrumentation */
178175
#cmakedefine01 GMX_USE_NVTX
179176

src/gromacs/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ endif()
389389

390390
target_link_libraries(libgromacs
391391
PRIVATE
392-
${EXTRAE_LIBRARIES}
393392
${GMX_EXTRA_LIBRARIES}
394393
${GMX_COMMON_LIBRARIES}
395394
${FFT_LIBRARIES} ${LINEAR_ALGEBRA_LIBRARIES}

src/gromacs/utility/binaryinformation.cpp

+8-20
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,16 @@
4444
#include "config.h"
4545

4646
#include <climits>
47+
#include <cstdio>
48+
#include <cstdlib>
49+
#include <cstring>
4750

51+
#include <algorithm>
52+
#include <array>
4853
#include <filesystem>
54+
#include <numeric>
55+
#include <string>
56+
#include <unordered_map>
4957
#include <vector>
5058

5159
#if GMX_FFT_FFTW3 || GMX_FFT_ARMPL_FFTW3
@@ -61,10 +69,6 @@
6169
# include <oneapi/math/dft.hpp>
6270
#endif
6371

64-
#if HAVE_EXTRAE
65-
# include <extrae_user_events.h>
66-
#endif
67-
6872
#if GMX_USE_HWLOC
6973
# include <hwloc.h>
7074
#endif
@@ -81,15 +85,6 @@
8185
# include <torch/torch.h>
8286
#endif
8387

84-
#include <cstdio>
85-
#include <cstdlib>
86-
#include <cstring>
87-
88-
#include <algorithm>
89-
#include <array>
90-
#include <numeric>
91-
#include <string>
92-
9388
/* This file is completely threadsafe - keep it that way! */
9489

9590
#include "gromacs/utility/arraysize.h"
@@ -478,14 +473,7 @@ void gmx_print_version_info(gmx::TextWriter* writer)
478473
#else
479474
writer->writeLine("Hwloc support: disabled");
480475
#endif
481-
#if HAVE_EXTRAE
482-
unsigned major, minor, revision;
483-
Extrae_get_version(&major, &minor, &revision);
484-
writer->writeLine(formatString(
485-
"Tracing support: enabled. Using Extrae-%d.%d.%d", major, minor, revision));
486-
#else
487476
writer->writeLine("Tracing support: disabled");
488-
#endif
489477

490478
/* MDModules */
491479
#if GMX_HAVE_COLVARS

0 commit comments

Comments
 (0)