File tree Expand file tree Collapse file tree 1 file changed +11
-1
lines changed
opal/mca/threads/argobots Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change 16
16
# Copyright (c) 2019 Sandia National Laboratories. All rights reserved.
17
17
# Copyright (c) 2019 Triad National Security, LLC. All rights
18
18
# Reserved.
19
+ # Copyright (c) 2021 Argonne National Laboratory. All rights reserved.
19
20
# $COPYRIGHT$
20
21
#
21
22
# Additional copyrights may follow
@@ -38,6 +39,7 @@ AC_DEFUN([OPAL_CONFIG_ARGOBOTS_THREADS],[
38
39
opal_check_argo_save_LIBS=$LIBS
39
40
40
41
opal_argo_happy=yes
42
+ opal_argo11_happy=yes
41
43
AS_IF([test " $with_argo " = " no" ],
42
44
[opal_argo_happy= no])
43
45
@@ -63,7 +65,15 @@ AC_DEFUN([OPAL_CONFIG_ARGOBOTS_THREADS],[
63
65
[],
64
66
[opal_argo_happy= no])])
65
67
66
- AS_IF([test $opal_argo_happy = yes && test -n " $opal_argo_dir " ],
68
+
69
+ # ABT_unit_get_thread() is a new Argobots 1.1 API.
70
+ # It was introduced after static mutex/cond initializers.
71
+ AS_IF([test $opal_argo_happy = yes],
72
+ [AC_CHECK_FUNCS([ABT_unit_get_thread], [], [opal_argo11_happy= " yes" ])])
73
+
74
+ AS_IF([test $opal_argo_happy = yes && test $opal_argo11_happy = no],
75
+ [AC_MSG_ERROR([Open MPI requires Argobots 1.1 or newer.])])
76
+ AS_IF([test $opal_argo_happy = yes && test $opal_argo11_happy = yes && test -n " $opal_argo_dir " ],
67
77
[OPAL_ARGO_INCLUDE_PATH= " $opal_argo_dir /include/" ],
68
78
[OPAL_ARGO_INCLUDE_PATH= " " ])
69
79
You can’t perform that action at this time.
0 commit comments