Merge branch 'master' into issue-#559-installer-updates

Author: zbeekman

src/mpi/AITuning_OpenCoarrays.cpp

@@ -1,26 +1,21 @@
 include ../make.inc
 
 MPICC ?= mpicc
-MPIC++ ?= mpic++
-AITUNING_DIR = ./AITuning/lib/libaituning.a
-AITUNING_LIB = 
 
-libcaf_mpi.a: mpi_caf.o AITuning_OpenCoarrays.o ../common/caf_auxiliary.o
-	ar rcv $@ mpi_caf.o AITuning_OpenCoarrays.o ../common/caf_auxiliary.o
+libcaf_mpi.a: mpi_caf.o ../common/caf_auxiliary.o
+	ar rcv $@ mpi_caf.o ../common/caf_auxiliary.o
 	ranlib $@
 
 .c.o:
 	$(MPICC) $(CFLAGS) $(MPI_CFLAGS) -I.. -c $< -o $@
-.cpp.o:
-	$(MPIC++) $(CFLAGS) $(MPI_CFLAGS) -I.. -I./AITuning/include -c $< -o $@
 
-mpi_caf.o: mpi_caf.c AITuning_OpenCoarrays.o ../libcaf.h ../libcaf-gfortran-descriptor.h $(AITUNING_DIR) $(AITUNING_LIB)
+mpi_caf.o: mpi_caf.c ../libcaf.h ../libcaf-gfortran-descriptor.h
 
 ../common/caf_auxiliary.o:
 	$(MAKE) -C ../common
 
 clean:
-	rm -f *.o
+	rm -f mpi_caf.o
 
 distclean: clean
 	rm -f libcaf_mpi.a

src/mpi/Makefile

@@ -441,7 +441,7 @@ unimplemented_alloc_comps_message(const char * functionname);
 
 static void
 locking_atomic_op(MPI_Win win, int *value, int newval,
-                  int compare, int image_index, int index)
+                  int compare, int image_index, size_t index)
 {
   CAF_Win_lock(MPI_LOCK_EXCLUSIVE, image_index - 1, win);
   int ierr = MPI_Compare_and_swap(&newval, &compare,value, MPI_INT,
@@ -652,7 +652,7 @@ failed_stopped_errorhandler_function (MPI_Comm* pcomm, int* perr, ...)
 }
 #endif
 
-void mutex_lock(MPI_Win win, int image_index, int index, int *stat,
+void mutex_lock(MPI_Win win, int image_index, size_t index, int *stat,
                 int *acquired_lock, char *errmsg, size_t errmsg_len)
 {
   const char msg[] = "Already locked";
@@ -737,7 +737,7 @@ void mutex_lock(MPI_Win win, int image_index, int index, int *stat,
 #endif // MPI_VERSION
 }
 
-void mutex_unlock(MPI_Win win, int image_index, int index, int *stat,
+void mutex_unlock(MPI_Win win, int image_index, size_t index, int *stat,
                   char* errmsg, size_t errmsg_len)
 {
   const char msg[] = "Variable is not locked";

src/mpi/mpi_caf.c

@@ -269,15 +269,15 @@ caf_runtime_error (const char *message, ...)
 /*        being used, we could add something of the form "#ifdef _CMAKE" to remove the */
 /*        keyword only when building with CMake */
 /* inline */ void locking_atomic_op(MPI_Win win, int *value, int newval,
-			      int compare, int image_index, int index)
+			      int compare, int image_index, size_t index)
 {
       CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index-1, win);
       MPI_Compare_and_swap (&newval,&compare,value, MPI_INT,image_index-1,
                             index*sizeof(int), win);
       CAF_Win_unlock (image_index-1, win);
 }
 
-void mutex_lock(MPI_Win win, int image_index, int index, int *stat,
+void mutex_lock(MPI_Win win, int image_index, size_t index, int *stat,
 		int *acquired_lock, char *errmsg, int errmsg_len)
 {
   const char msg[] = "Already locked";
@@ -326,7 +326,7 @@ void mutex_lock(MPI_Win win, int image_index, int index, int *stat,
 #endif // MPI_VERSION
 }
 
-void mutex_unlock(MPI_Win win, int image_index, int index, int *stat,
+void mutex_unlock(MPI_Win win, int image_index, size_t index, int *stat,
 		  char* errmsg, int errmsg_len)
 {
   const char msg[] = "Variable is not locked";