Debian Codegraph @

debian/patches/mpi_core

raw
1 https://gitlab.com/eztrace/eztrace/-/issues/70
2
3 ---
4 src/eztrace-lib/CMakeLists.txt | 4 ++--
5 src/eztrace-lib/eztrace_mpi_core.c | 12 ++++++------
6 src/eztrace-lib/eztrace_mpi_core_empty.c | 1 +
7 src/modules/mpi/CMakeLists.txt | 13 ++++++++++++-
8 4 files changed, 21 insertions(+), 9 deletions(-)
9
10 --- a/src/eztrace-lib/CMakeLists.txt
11 +++ b/src/eztrace-lib/CMakeLists.txt
12 @@ -50,14 +50,14 @@ set(CMAKE_C_COMPILER ${MPICC})
13 set(CMAKE_Fortran_COMPILER ${MPIF90})
14
15 set(eztrace-mpi_core_SOURCES
16 - eztrace_mpi_core.c
17 + eztrace_mpi_core_empty.c
18 include/eztrace-lib/eztrace_mpi.h
19 )
20
21 if(CMAKE_Fortran_COMPILER)
22 # mpif.h may define a bunch of unused parameter which would generate lots of warnings
23 set(eztrace-mpi_core_SOURCES ${eztrace-mpi_core_SOURCES}
24 - eztrace_mpi_core_f.f90 eztrace_mpi_core_fortran.c)
25 + )
26
27 set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wno-unused-parameter")
28 endif()
29 --- a/src/modules/mpi/CMakeLists.txt
30 +++ b/src/modules/mpi/CMakeLists.txt
31 @@ -2,6 +2,8 @@ file(GLOB mpi_function_files mpi_funcs/*
32
33 set(eztrace-mpi_SOURCES
34 ${mpi_function_files}
35 + ../../eztrace-lib/eztrace_mpi_core.c
36 + ../../eztrace-lib/include/eztrace-lib/eztrace_mpi.h
37 mpi.c
38 mpi_eztrace.h
39 )
40 @@ -13,7 +15,9 @@ set(CMAKE_Fortran_COMPILER ${MPIF90})
41 if(CMAKE_Fortran_COMPILER)
42 # mpif.h may define a bunch of unused parameter which would generate lots of warnings
43 set(eztrace-mpi_SOURCES ${eztrace-mpi_SOURCES}
44 - mpi3_f.f90 fortran_utils.f90 mpi_f.f90 mpi_fortran.c)
45 + mpi3_f.f90 fortran_utils.f90 mpi_f.f90 mpi_fortran.c
46 + ../../eztrace-lib/eztrace_mpi_core_f.f90
47 + ../../eztrace-lib/eztrace_mpi_core_fortran.c)
48
49 set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wno-unused-parameter")
50 endif()
51 @@ -31,9 +35,16 @@ target_include_directories(eztrace-mpi
52
53 target_link_libraries(eztrace-mpi
54 PRIVATE
55 + ${OTF2_LIBRARY}
56 + atomic
57 ${INTERCEPT_LIB}
58 eztrace-core
59 eztrace-lib
60 + dl
61 + PRIVATE
62 + ${CMAKE_DL_LIBS}
63 + rt
64 + m
65 )
66
67 target_compile_options(eztrace-mpi
68 --- a/src/eztrace-lib/eztrace_mpi_core.c
69 +++ b/src/eztrace-lib/eztrace_mpi_core.c
70 @@ -34,8 +34,8 @@ int (*libMPI_Init_thread)(int*, char***,
71 int (*libMPI_Comm_size)(MPI_Comm, int*);
72 int (*libMPI_Comm_rank)(MPI_Comm, int*);
73 int (*libMPI_Finalize)(void);
74 -int (*libMPI_Initialized)(int*);
75 -int (*libMPI_Barrier)(MPI_Comm);
76 +extern int (*libMPI_Initialized)(int*);
77 +extern int (*libMPI_Barrier)(MPI_Comm);
78
79 /* fortran bindings */
80 void (*libmpi_init_)(int* e);
81 @@ -147,12 +147,12 @@ int MPI_Init(int* argc, char*** argv) {
82 return ret;
83 }
84
85 -int (*libMPI_Send)(CONST void* buf, int count, MPI_Datatype datatype, int dest,
86 +extern int (*libMPI_Send)(CONST void* buf, int count, MPI_Datatype datatype, int dest,
87 int tag, MPI_Comm comm);
88 -int (*libMPI_Recv)(void* buf, int count, MPI_Datatype datatype, int source,
89 +extern int (*libMPI_Recv)(void* buf, int count, MPI_Datatype datatype, int source,
90 int tag, MPI_Comm comm, MPI_Status* status);
91 -int (*libMPI_Barrier)(MPI_Comm);
92 -int (*libMPI_Reduce)(CONST void*, void*, int, MPI_Datatype, MPI_Op, int,
93 +extern int (*libMPI_Barrier)(MPI_Comm);
94 +extern int (*libMPI_Reduce)(CONST void*, void*, int, MPI_Datatype, MPI_Op, int,
95 MPI_Comm);
96
97 static int _EZT_MPI_Recv(void* buffer, size_t size, int src, int tag) {
98 --- /dev/null
99 +++ b/src/eztrace-lib/eztrace_mpi_core_empty.c
100 @@ -0,0 +1 @@
101 +/* */