ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #3908 from edgargabriel/pr/lustre-header-update

Просмотр исходного кода 
fs/lustre: update lustre header file used in the component
Этот коммит содержится в:
Edgar Gabriel 2017-07-18 09:57:11 -05:00 коммит произвёл GitHub
родитель 6d6f5fdfb8 bc8f642211
Коммит b363a0f4db
3 изменённых файлов: 7 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
config/ompi_check_lustre.m4
Просмотреть файл

@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2006 The Regents of the University of California. dnl Copyright (c) 2004-2006 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved dnl Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
dnl Copyright (c) 2008-2012 University of Houston. All rights reserved. dnl Copyright (c) 2008-2017 University of Houston. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
@ -43,7 +43,7 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
AC_ARG_WITH([lustre], AC_ARG_WITH([lustre],
[AC_HELP_STRING([--with-lustre(=DIR)], [AC_HELP_STRING([--with-lustre(=DIR)],
[Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])]) [Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/liblustreapi.h]) OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/lustreapi.h])
AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"], AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"],
[ompi_check_lustre_dir="/usr"], [ompi_check_lustre_dir="/usr"],
@ -56,13 +56,13 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
fi fi
# Add correct -I and -L flags # Add correct -I and -L flags
OPAL_CHECK_PACKAGE([$1], [lustre/liblustreapi.h], [lustreapi], [llapi_file_create], [], OPAL_CHECK_PACKAGE([$1], [lustre/lustreapi.h], [lustreapi], [llapi_file_create], [],
[$ompi_check_lustre_dir], [$ompi_check_lustre_libdir], [ompi_check_lustre_happy="yes"], [$ompi_check_lustre_dir], [$ompi_check_lustre_libdir], [ompi_check_lustre_happy="yes"],
[ompi_check_lustre_happy="no"]) [ompi_check_lustre_happy="no"])
AC_MSG_CHECKING([for required lustre data structures]) AC_MSG_CHECKING([for required lustre data structures])
cat > conftest.c <<EOF cat > conftest.c <<EOF
#include "lustre/liblustreapi.h" #include "lustre/lustreapi.h"
void alloc_lum() void alloc_lum()
{ {
int v1, v3; int v1, v3;

4
ompi/mca/fs/lustre/fs_lustre.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008-2016 University of Houston. All rights reserved. * Copyright (c) 2008-2017 University of Houston. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -43,8 +43,6 @@
#endif #endif
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <lustre/liblustreapi.h>
#include <lustre/lustre_user.h>
/* /*
* ******************************************************************* * *******************************************************************

4
ompi/mca/fs/lustre/fs_lustre.h
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2008-2016 University of Houston. All rights reserved. * Copyright (c) 2008-2017 University of Houston. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016-2017 IBM Corporation. All rights reserved. * Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
@ -34,7 +34,7 @@ extern int mca_fs_lustre_stripe_width;
BEGIN_C_DECLS BEGIN_C_DECLS
#include <lustre/liblustreapi.h> #include <lustre/lustreapi.h>
#include <lustre/lustre_user.h> #include <lustre/lustre_user.h>
#ifndef LOV_MAX_STRIPE_COUNT #ifndef LOV_MAX_STRIPE_COUNT