Merge branch 'main' into pr/mpi4py-run-the-spawn-tests

Author: jsquyres

oshmem/shmem/c/shmem_alltoall.c

@@ -17,6 +17,7 @@
 #include "oshmem/runtime/runtime.h"
 
 #include "oshmem/mca/scoll/scoll.h"
+#include "oshmem/mca/spml/spml.h"
 
 #include "oshmem/proc/proc.h"
 

oshmem/shmem/c/shmem_broadcast.c

@@ -17,6 +17,7 @@
 #include "oshmem/runtime/runtime.h"
 
 #include "oshmem/mca/scoll/scoll.h"
+#include "oshmem/mca/spml/spml.h"
 
 #include "oshmem/proc/proc.h"
 

oshmem/shmem/c/shmem_collect.c

@@ -17,6 +17,7 @@
 #include "oshmem/runtime/runtime.h"
 
 #include "oshmem/mca/scoll/scoll.h"
+#include "oshmem/mca/spml/spml.h"
 
 #include "oshmem/proc/proc.h"
 

oshmem/shmem/c/shmem_global_exit.c

@@ -13,6 +13,7 @@
 
 #include "oshmem/include/shmem.h"
 #include "oshmem/runtime/runtime.h"
+#include "oshmem/proc/proc.h"
 
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"

oshmem/shmem/c/shmem_reduce.c

@@ -16,6 +16,7 @@
 #include "oshmem/runtime/runtime.h"
 
 #include "oshmem/mca/scoll/scoll.h"
+#include "oshmem/mca/spml/spml.h"
 #include "oshmem/proc/proc.h"
 #include "oshmem/op/op.h"