From 8f2d3aeb65e6de672ec210ff41f70832f5135ac2 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 11 Sep 2015 09:34:10 +0900 Subject: [PATCH] oshmem: do not include pml/ob1 headers this is an abstraction violation and that can cause linker failure --- oshmem/mca/spml/base/spml_base_request.h | 3 ++- oshmem/mca/spml/yoda/spml_yoda_getreq.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/oshmem/mca/spml/base/spml_base_request.h b/oshmem/mca/spml/base/spml_base_request.h index 2db1632068..c3bac84f58 100644 --- a/oshmem/mca/spml/base/spml_base_request.h +++ b/oshmem/mca/spml/base/spml_base_request.h @@ -4,6 +4,8 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -22,7 +24,6 @@ #include "opal/datatype/opal_convertor.h" #include "opal/class/opal_free_list.h" -#include "ompi/mca/pml/ob1/pml_ob1_comm.h" BEGIN_C_DECLS diff --git a/oshmem/mca/spml/yoda/spml_yoda_getreq.h b/oshmem/mca/spml/yoda/spml_yoda_getreq.h index 0588a865bb..765f2e3df9 100644 --- a/oshmem/mca/spml/yoda/spml_yoda_getreq.h +++ b/oshmem/mca/spml/yoda/spml_yoda_getreq.h @@ -4,6 +4,8 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -17,7 +19,6 @@ #include "opal/mca/btl/btl.h" #include "oshmem/mca/spml/base/spml_base_putreq.h" #include "opal/mca/mpool/base/base.h" -#include "ompi/mca/pml/ob1/pml_ob1_comm.h" #include "ompi/mca/bml/bml.h" #include "oshmem/mca/spml/yoda/spml_yoda_rdmafrag.h" #include "oshmem/mca/spml/yoda/spml_yoda.h"