Skip to content

threads: configury updates for argo and qthreads #10646

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 1 commit into from
Sep 2, 2022
Merged

threads: configury updates for argo and qthreads #10646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions opal/mca/threads/argobots/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Copyright (c) 2015 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2019 Sandia National Laboratories. All rights reserved.
# Copyright (c) 2019 Triad National Security, LLC. All rights
# Copyright (c) 2019-2022 Triad National Security, LLC. All rights
# Reserved.
# Copyright (c) 2021 Argonne National Laboratory. All rights reserved.
# $COPYRIGHT$
Expand Down Expand Up @@ -56,14 +56,9 @@ AC_DEFUN([OPAL_CONFIG_ARGOBOTS_THREADS],[

AS_IF([test $opal_argo_happy = yes && test $opal_argo11_happy = no],
[AC_MSG_ERROR([Open MPI requires Argobots 1.1 or newer.])])
AS_IF([test $opal_argo_happy = yes && test $opal_argo11_happy = yes && test -n "$opal_argo_dir"],
[OPAL_ARGO_INCLUDE_PATH="$opal_argo_dir/include/"],
[OPAL_ARGO_INCLUDE_PATH=""])

AS_IF([test $opal_argo_happy = yes],
[AC_CONFIG_FILES([opal/mca/threads/argobots/threads_argobots.h])
AC_SUBST([OPAL_ARGO_INCLUDE_PATH])
AC_SUBST([opal_argo_CPPFLAGS])
[ AC_SUBST([opal_argo_CPPFLAGS])
AC_SUBST([opal_argo_LDFLAGS])
AC_SUBST([opal_argo_LIBS])
TPKG_CFLAGS="$opal_argo_CPPFLAGS"
Expand All @@ -74,7 +69,7 @@ AC_DEFUN([OPAL_CONFIG_ARGOBOTS_THREADS],[
TPKG_LDFLAGS="$opal_argo_LDFLAGS"
TPKG_LIBS="$opal_argo_LIBS"])

CPPFLAGS=$opal_check_argo_save_CPPFLAGS
CPPFLAGS="${opal_check_argo_save_CPPFLAGS} ${opal_argo_CPPFLAGS}"
LDFLAGS=$opal_check_argo_save_LDFLAGS
LIBS=$opal_check_argo_save_LIBS

Expand Down
2 changes: 1 addition & 1 deletion ...ca/threads/argobots/threads_argobots.h.in → opal/mca/threads/argobots/threads_argobots.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#ifndef OPAL_MCA_THREADS_ARGOBOTS_THREADS_ARGOBOTS_H
#define OPAL_MCA_THREADS_ARGOBOTS_THREADS_ARGOBOTS_H

#include "@OPAL_ARGO_INCLUDE_PATH@abt.h"
#include "abt.h"

static inline void opal_threads_argobots_ensure_init(void)
{
Expand Down
10 changes: 2 additions & 8 deletions opal/mca/threads/qthreads/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2019 Triad National Security, LLC. All rights
# Copyright (c) 2019-2022 Triad National Security, LLC. All rights
# reserved.
#
# $COPYRIGHT$
Expand Down Expand Up @@ -45,10 +45,6 @@ AC_DEFUN([OPAL_CONFIG_QTHREADS],[
[opal_qthreads_happy=yes],
[opal_qthreads_happy=no])

AS_IF([test $opal_qthreads_happy = yes && test -n "$opal_qthreads_dir"],
[OPAL_QTHREADS_INCLUDE_PATH="$opal_qthreads_dir/include/"],
[OPAL_QTHREADS_INCLUDE_PATH=""])

AS_IF([test $opal_qthreads_happy = yes],
[TPKG_CFLAGS="$opal_qthreads_CPPFLAGS"
TPKG_FCFLAGS="$opal_qthreads_CPPFLAGS"
Expand All @@ -58,13 +54,11 @@ AC_DEFUN([OPAL_CONFIG_QTHREADS],[
TPKG_LDFLAGS="$opal_qthreads_LDFLAGS"
TPKG_LIBS="$opal_qthreads_LIBS"])

AC_CONFIG_FILES([opal/mca/threads/qthreads/threads_qthreads.h])
AC_SUBST([OPAL_QTHREADS_INCLUDE_PATH])
AC_SUBST([opal_qthreads_CPPFLAGS])
AC_SUBST([opal_qthreads_LDFLAGS])
AC_SUBST([opal_qthreads_LIBS])

CPPFLAGS=$opal_check_qthreads_save_CPPFLAGS
CPPFLAGS="${opal_check_argo_save_CPPFLAGS} ${opal_qthreads_CPPFLAGS}"
LDFLAGS=$opal_check_qthreads_save_LDFLAGS
LIBS=$opal_check_qthreads_save_LIBS

Expand Down
4 changes: 2 additions & 2 deletions ...ca/threads/qthreads/threads_qthreads.h.in → opal/mca/threads/qthreads/threads_qthreads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#ifndef OPAL_MCA_THREADS_QTHREADS_THREADS_QTHREADS_H
#define OPAL_MCA_THREADS_QTHREADS_THREADS_QTHREADS_H 1

#include "@OPAL_QTHREADS_INCLUDE_PATH@qthread.h"
#include "@OPAL_QTHREADS_INCLUDE_PATH@qthread/tls.h"
#include "qthread.h"
#include "qthread/tls.h"

static inline void opal_threads_ensure_init_qthreads(void)
{
Expand Down