Skip to content

Bring fuzzy matching support into master #5508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 6, 2018
Merged

Bring fuzzy matching support into master #5508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
572694b
Adding custom match source.
mdosanjh Jul 18, 2018
dd74c62
pml/ob1: custom matching cleanup and configury
hjelmn Jul 25, 2018
c8d1348
Fixed promotion bug
mdosanjh Aug 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ompi/mca/pml/ob1/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@ ob1_sources = \
pml_ob1_recvreq.h \
pml_ob1_sendreq.c \
pml_ob1_sendreq.h \
pml_ob1_start.c
pml_ob1_start.c \
custommatch/pml_ob1_custom_match.h \
custommatch/pml_ob1_custom_match_arrays.h \
custommatch/pml_ob1_custom_match_vectors.h \
custommatch/pml_ob1_custom_match_linkedlist.h \
custommatch/pml_ob1_custom_match_fuzzy512-byte.h \
custommatch/pml_ob1_custom_match_fuzzy512-short.h \
custommatch/pml_ob1_custom_match_fuzzy512-word.h

# If we have CUDA support requested, build the CUDA file also
if OPAL_cuda_support
Expand Down
38 changes: 38 additions & 0 deletions ompi/mca/pml/ob1/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,44 @@ AC_DEFUN([MCA_ompi_pml_ob1_POST_CONFIG], [
# ------------------------------------------------
# We can always build, unless we were explicitly disabled.
AC_DEFUN([MCA_ompi_pml_ob1_CONFIG],[
OPAL_VAR_SCOPE_PUSH([pml_ob1_matching_engine])
AC_ARG_WITH([pml-ob1-matching], [AC_HELP_STRING([--with-pml-ob1-matching=type],
[Configure pml/ob1 to use an alternate matching engine. Only valid on x86_64 systems.
Valid values are: none, default, arrays, fuzzy-byte, fuzzy-short, fuzzy-word, vector (default: none)])])

pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_NONE

if test -n "$with_pml_ob1_matching" ; then
case $with_pml_ob1_matching in
none)
pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_NONE
;;
default)
pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_LINKEDLIST
;;
arrays)
pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_ARRAYS
;;
fuzzy-byte)
pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_BYTE
;;
fuzzy-short)
pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_SHORT
;;
fuzzy-word)
pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_WORD
;;
vector)
pml_ob1_matching_engine=MCA_PML_OB1_CUSTOM_MATCHING_VECTOR
;;
*)
AC_ERROR([invalid matching type specified for --pml-ob1-matching: $with_pml_ob1_matching])
;;
esac
fi

AC_DEFINE_UNQUOTED([MCA_PML_OB1_CUSTOM_MATCHING], [$pml_ob1_matching_engine], [Custom matching engine to use in pml/ob1])

AC_CONFIG_FILES([ompi/mca/pml/ob1/Makefile])
[$1]
])dnl
58 changes: 58 additions & 0 deletions ompi/mca/pml/ob1/custommatch/pml_ob1_custom_match.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/*
* Copyright (c) 2018 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 Sandia National Laboratories. All rights reserved.
*
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/

#ifndef PML_OB1_CUSTOM_MATCH_H
#define PML_OB1_CUSTOM_MATCH_H

#include "ompi_config.h"
#include "ompi/mca/pml/ob1/pml_ob1.h"

#define CUSTOM_MATCH_DEBUG 1
#define CUSTOM_MATCH_DEBUG_VERBOSE 1

/**
* Custom match types
*/
#define MCA_PML_OB1_CUSTOM_MATCHING_NONE 0
#define MCA_PML_OB1_CUSTOM_MATCHING_LINKEDLIST 1
#define MCA_PML_OB1_CUSTOM_MATCHING_ARRAYS 2
#define MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_BYTE 3
#define MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_SHORT 4
#define MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_WORD 5
#define MCA_PML_OB1_CUSTOM_MATCHING_VECTOR 6

#if MCA_PML_OB1_CUSTOM_MATCHING != MCA_PML_OB1_CUSTOM_MATCHING_NONE

#define MCA_PML_OB1_CUSTOM_MATCH 1

#if MCA_PML_OB1_CUSTOM_MATCHING == MCA_PML_OB1_CUSTOM_MATCHING_LINKEDLIST
#include "pml_ob1_custom_match_linkedlist.h"
#elif MCA_PML_OB1_CUSTOM_MATCHING == MCA_PML_OB1_CUSTOM_MATCHING_ARRAYS
#include "pml_ob1_custom_match_arrays.h"
#elif MCA_PML_OB1_CUSTOM_MATCHING == MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_BYTE
#include "pml_ob1_custom_match_fuzzy512-byte.h"
#elif MCA_PML_OB1_CUSTOM_MATCHING == MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_SHORT
#include "pml_ob1_custom_match_fuzzy512-short.h"
#elif MCA_PML_OB1_CUSTOM_MATCHING == MCA_PML_OB1_CUSTOM_MATCHING_FUZZY_WORD
#include "pml_ob1_custom_match_fuzzy512-word.h"
#elif MCA_PML_OB1_CUSTOM_MATCHING == MCA_PML_OB1_CUSTOM_MATCHING_VECTOR
#include "pml_ob1_custom_match_vectors.h"
#endif

#else

#define MCA_PML_OB1_CUSTOM_MATCH 0

#endif

#endif
Loading