X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f4c4c467150b3bea841b968cabd629e9d9282a..267894c2d1ae9097264477039448a93bf473060b:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 5af6d62e54..1bfbc620fd 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -29,7 +30,7 @@ type _XBT_CONCAT(P, name) args #endif -SG_BEGIN_DECL() +SG_BEGIN_DECL #define MPI_THREAD_SINGLE 0 #define MPI_THREAD_FUNNELED 1 #define MPI_THREAD_SERIALIZED 2 @@ -298,7 +299,7 @@ XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER16; XBT_PUBLIC_DATA const MPI_Datatype MPI_COUNT; //defines for fortran compatibility -#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) || defined(__aarch64__) #define MPI_INTEGER MPI_INT #define MPI_2INTEGER MPI_2INT #define MPI_LOGICAL MPI_INT @@ -308,7 +309,7 @@ XBT_PUBLIC_DATA const MPI_Datatype MPI_COUNT; #define MPI_LOGICAL MPI_LONG #endif -#define MPI_Fint int +typedef int MPI_Fint; #define MPI_COMPLEX MPI_C_FLOAT_COMPLEX #define MPI_DOUBLE_COMPLEX MPI_C_DOUBLE_COMPLEX @@ -367,6 +368,27 @@ typedef SMPI_Request* MPI_Request; typedef SMPI_Errhandler* MPI_Errhandler; #define MPI_ERRHANDLER_NULL ((MPI_Errhandler)NULL) +typedef enum SMPI_Combiner_enum{ + MPI_COMBINER_NAMED, + MPI_COMBINER_DUP, + MPI_COMBINER_CONTIGUOUS, + MPI_COMBINER_VECTOR, + MPI_COMBINER_HVECTOR_INTEGER, + MPI_COMBINER_HVECTOR, + MPI_COMBINER_INDEXED, + MPI_COMBINER_HINDEXED_INTEGER, + MPI_COMBINER_HINDEXED, + MPI_COMBINER_INDEXED_BLOCK, + MPI_COMBINER_STRUCT_INTEGER, + MPI_COMBINER_STRUCT, + MPI_COMBINER_SUBARRAY, + MPI_COMBINER_DARRAY, + MPI_COMBINER_F90_REAL, + MPI_COMBINER_F90_COMPLEX, + MPI_COMBINER_F90_INTEGER, + MPI_COMBINER_RESIZED, + MPI_COMBINER_HINDEXED_BLOCK +}SMPI_Combiner_enum; typedef enum SMPI_Topo_type { MPI_GRAPH=1, @@ -816,7 +838,11 @@ MPI_CALL(XBT_PUBLIC int, MPI_Comm_call_errhandler, (MPI_Comm comm, int errorcode MPI_CALL(XBT_PUBLIC int, MPI_Win_set_errhandler, (MPI_Win win, MPI_Errhandler errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_Win_get_errhandler, (MPI_Win win, MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_Win_create_errhandler, (MPI_Win_errhandler_fn * function, MPI_Errhandler* errhandler)); -MPI_CALL(XBT_PUBLIC int, MPI_Win_call_errhandler, (MPI_Win win, int errorcode));MPI_CALL(XBT_PUBLIC int, MPI_Type_get_envelope, +MPI_CALL(XBT_PUBLIC int, MPI_Win_call_errhandler, (MPI_Win win, int errorcode)); +MPI_CALL(XBT_PUBLIC int, MPI_Type_get_contents, + (MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, int* array_of_integers, + MPI_Aint* array_of_addresses, MPI_Datatype* array_of_datatypes)); +MPI_CALL(XBT_PUBLIC int, MPI_Type_get_envelope, (MPI_Datatype datatype, int* num_integers, int* num_addresses, int* num_datatypes, int* combiner)); MPI_CALL(XBT_PUBLIC int, MPI_File_call_errhandler, (MPI_File fh, int errorcode)); MPI_CALL(XBT_PUBLIC int, MPI_File_create_errhandler, @@ -825,27 +851,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_set_errhandler, (MPI_File file, MPI_Errhandler MPI_CALL(XBT_PUBLIC int, MPI_File_get_errhandler, (MPI_File file, MPI_Errhandler* errhandler)); //FIXME: these are not yet implemented -typedef enum MPIR_Combiner_enum{ - MPI_COMBINER_NAMED, - MPI_COMBINER_DUP, - MPI_COMBINER_CONTIGUOUS, - MPI_COMBINER_VECTOR, - MPI_COMBINER_HVECTOR_INTEGER, - MPI_COMBINER_HVECTOR, - MPI_COMBINER_INDEXED, - MPI_COMBINER_HINDEXED_INTEGER, - MPI_COMBINER_HINDEXED, - MPI_COMBINER_INDEXED_BLOCK, - MPI_COMBINER_STRUCT_INTEGER, - MPI_COMBINER_STRUCT, - MPI_COMBINER_SUBARRAY, - MPI_COMBINER_DARRAY, - MPI_COMBINER_F90_REAL, - MPI_COMBINER_F90_COMPLEX, - MPI_COMBINER_F90_INTEGER, - MPI_COMBINER_RESIZED, - MPI_COMBINER_HINDEXED_BLOCK -}MPIR_Combiner_enum; typedef void* MPI_Message; #define MPI_DUP_FN 1 @@ -886,9 +891,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_Irsend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_Get_elements, (MPI_Status * status, MPI_Datatype datatype, int* elements)); MPI_CALL(XBT_PUBLIC int, MPI_Pcontrol, (const int level, ...)); -MPI_CALL(XBT_PUBLIC int, MPI_Type_get_contents, - (MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, int* array_of_integers, - MPI_Aint* array_of_addresses, MPI_Datatype* array_of_datatypes)); MPI_CALL(XBT_PUBLIC int, MPI_Type_create_darray, (int size, int rank, int ndims, int* array_of_gsizes, int* array_of_distribs, int* array_of_dargs, int* array_of_psizes, int order, MPI_Datatype oldtype, MPI_Datatype* newtype)); @@ -976,8 +978,10 @@ XBT_PUBLIC MPI_Comm smpi_process_comm_self(); XBT_PUBLIC MPI_Info smpi_process_info_env(); XBT_PUBLIC void* smpi_process_get_user_data(); XBT_PUBLIC void smpi_process_set_user_data(void*); +XBT_PUBLIC void smpi_init_options(); XBT_PUBLIC void smpi_execute_flops(double flops); +XBT_PUBLIC void smpi_execute_flops_benched(double flops); XBT_PUBLIC void smpi_execute(double duration); XBT_PUBLIC void smpi_execute_benched(double duration); @@ -1000,9 +1004,9 @@ XBT_PUBLIC void smpi_comm_set_copy_data_callback(void (*callback)(smx_activity_t */ XBT_PUBLIC void smpi_trace_set_call_location(const char* file, int line); /** Fortran binding **/ -XBT_PUBLIC void smpi_trace_set_call_location_(const char* file, int* line); +XBT_PUBLIC void smpi_trace_set_call_location_(const char* file, const int* line); /** Fortran binding + -fsecond-underscore **/ -XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, int* line); +XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, const int* line); #define SMPI_ITER_NAME1(line) _XBT_CONCAT(iter_count, line) #define SMPI_ITER_NAME(line) SMPI_ITER_NAME1(line) @@ -1025,14 +1029,13 @@ XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, int* line); SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 1, (iters), (thres)) #define SMPI_SAMPLE_DELAY(duration) for(smpi_execute(duration); 0; ) #define SMPI_SAMPLE_FLOPS(flops) for(smpi_execute_flops(flops); 0; ) - XBT_PUBLIC void* smpi_shared_malloc(size_t size, const char* file, int line); #define SMPI_SHARED_MALLOC(size) smpi_shared_malloc((size), __FILE__, __LINE__) -XBT_PUBLIC void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int nb_shared_blocks); +XBT_PUBLIC void* smpi_shared_malloc_partial(size_t size, const size_t* shared_block_offsets, int nb_shared_blocks); #define SMPI_PARTIAL_SHARED_MALLOC(size, shared_block_offsets, nb_shared_blocks) \ smpi_shared_malloc_partial((size), (shared_block_offsets), (nb_shared_blocks)) -XBT_PUBLIC void smpi_shared_free(void* data); + #define SMPI_SHARED_FREE(data) smpi_shared_free(data) XBT_PUBLIC int smpi_shared_known_call(const char* func, const char* input); @@ -1056,12 +1059,13 @@ XBT_PUBLIC void smpi_replay_run(const char* instance_id, int rank, double start_ XBT_PUBLIC void SMPI_app_instance_register(const char* name, xbt_main_func_t code, int num_processes); XBT_PUBLIC void SMPI_init(); XBT_PUBLIC void SMPI_finalize(); +XBT_PUBLIC void SMPI_thread_create(); -SG_END_DECL() +SG_END_DECL /* C++ declarations for shared_malloc */ #ifdef __cplusplus -XBT_PUBLIC int smpi_is_shared(void* ptr, std::vector>& private_blocks, size_t* offset); +XBT_PUBLIC int smpi_is_shared(const void* ptr, std::vector>& private_blocks, size_t* offset); std::vector> shift_and_frame_private_blocks(const std::vector>& vec, size_t offset, size_t buff_size);