diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch by Fab. Riguzzi to fix MPI interface

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-02-06 18:08:06 +00:00
parent bae7b716e2
commit 7b4cd0d256
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/lammpi/prologterms2c.c
View File

@ -102,11 +102,7 @@ void
change_buffer_size(const size_t newsize) { change_buffer_size(const size_t newsize) {
if ( BUFFER_SIZE>=BLOCK_SIZE && BUFFER_SIZE>=newsize) if ( BUFFER_SIZE>=BLOCK_SIZE && BUFFER_SIZE>=newsize)
return; return;
if (BUFFER_PTR) { if (realloc( BUFFER_PTR, newsize) == NULL) {
free(BUFFER_PTR);
}
BUFFER_PTR = (char*)malloc(newsize);
if( BUFFER_PTR == NULL ) {
YAP_Error(0,0,"Prolog2Term: Out of memory.\n"); YAP_Error(0,0,"Prolog2Term: Out of memory.\n");
#ifdef MPI #ifdef MPI
MPI_Finalize(); MPI_Finalize();

8
library/lammpi/yap_mpi.c
View File

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2004,2005,2006 (Nuno A. Fonseca) <nuno.fonseca@gmail.com> Copyright (C) 2004,2005,2006 (Nuno A. Fonseca) <nuno.fonseca@gmail.com>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -41,9 +41,7 @@ Comments: YAP interface to LAM/MPI
#include "prologterms2c.h" #include "prologterms2c.h"
#ifndef _yap_c_interface_h
#include <YapInterface.h> #include <YapInterface.h>
#endif
#include "hash.h" #include "hash.h"
@ -976,7 +974,7 @@ mpi_gc(void) {
RETURN(TRUE); RETURN(TRUE);
} }
int BLOCK_SIZE=4*1024; size_t BLOCK_SIZE=4*1024;
static int static int
mpi_default_buffer_size(void) mpi_default_buffer_size(void)
@ -1022,7 +1020,7 @@ init_mpi(void) {
YAP_UserCPredicate( "mpi_wait", mpi_wait,2); // mpi_wait(+Handle,-Status). YAP_UserCPredicate( "mpi_wait", mpi_wait,2); // mpi_wait(+Handle,-Status).
YAP_UserCPredicate( "mpi_wait_recv", mpi_wait_recv,3); // mpi_wait_recv(+Handle,-Status,-Data). YAP_UserCPredicate( "mpi_wait_recv", mpi_wait_recv,3); // mpi_wait_recv(+Handle,-Status,-Data).
YAP_UserCPredicate( "mpi_test", mpi_test,2); // mpi_test(+Handle,-Status). YAP_UserCPredicate( "mpi_test", mpi_test,2); // mpi_test(+Handle,-Status).
YAP_UserCPredicate( "mpi_test_rcv", mpi_test_recv,3); // mpi_test(+Handle,-Status,-Data). YAP_UserCPredicate( "mpi_test_recv", mpi_test_recv,3); // mpi_test(+Handle,-Status,-Data).
YAP_UserCPredicate( "mpi_bcast", mpi_bcast,2); // mpi_bcast(Root,Term) YAP_UserCPredicate( "mpi_bcast", mpi_bcast,2); // mpi_bcast(Root,Term)
YAP_UserCPredicate( "mpi_bcast2", mpi_bcast2,2); // mpi_bcast2(Root,Term) YAP_UserCPredicate( "mpi_bcast2", mpi_bcast2,2); // mpi_bcast2(Root,Term)
YAP_UserCPredicate( "mpi_bcast3", mpi_bcast3,3); // mpi_bcast3(Root,Term,Tag) YAP_UserCPredicate( "mpi_bcast3", mpi_bcast3,3); // mpi_bcast3(Root,Term,Tag)