Skip to content

Commit c3d1f59

Browse files
Remove old qthread multinode code. It hasn't been tested or maintained in many many years.
1 parent 78c7aec commit c3d1f59

34 files changed

+3
-3732
lines changed

Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
EXTRA_DIST = \
77
README.md \
88
README.affinity \
9-
README.multinode \
109
README.performance-monitoring.md \
1110
SCHEDULING \
1211
TODO.md \
@@ -37,9 +36,6 @@ featuretests: core
3736
stresstests: core
3837
$(MAKE) -C test stresstests
3938

40-
multinodetests: core
41-
$(MAKE) -C test multinodetests
42-
4339
buildtests: tests
4440

4541
tests:

README.multinode

Lines changed: 0 additions & 54 deletions
This file was deleted.

config/ompi_check_package.m4

Lines changed: 0 additions & 170 deletions
This file was deleted.

configure.ac

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ AC_ARG_ENABLE([debug],
171171
io,
172172
loops,
173173
mpool,
174-
multinode,
175174
qarray,
176175
shepherd,
177176
syncvars,
@@ -181,7 +180,7 @@ AC_ARG_ENABLE([debug],
181180
threadqueues,
182181
xomp])],
183182
[AS_IF([test "x$enable_debug" = "xyes"],
184-
[enable_debug="affinity,threadqueues,thread,shepherd,core,team,mpool,syscalls,febs,syncvars,io,loops,barrier,qarray,futurelib,xomp,multinode"])
183+
[enable_debug="affinity,threadqueues,thread,shepherd,core,team,mpool,syscalls,febs,syncvars,io,loops,barrier,qarray,futurelib,xomp"])
185184
for area in $(echo "$enable_debug" | sed 's/,/ /g') ; do
186185
case "$area" in
187186
affinity) enable_debug_affinity=yes ;;
@@ -200,7 +199,6 @@ AC_ARG_ENABLE([debug],
200199
qarray|qarrays) enable_debug_qarray=yes ;;
201200
futurelib) enable_debug_futurelib=yes ;;
202201
xomp) enable_debug_xomp=yes ;;
203-
multinode) enable_debug_multinode=yes ;;
204202
*) AC_MSG_ERROR([Unrecognized debug category ($area).]) ;;
205203
esac
206204
done],
@@ -383,10 +381,6 @@ AC_ARG_WITH([cacheline-width],
383381
[],
384382
[with_cacheline_width=256])
385383

386-
AC_ARG_ENABLE([multinode],
387-
[AS_HELP_STRING([--enable-multinode],
388-
[Enable experimental support for multi-node qthreads applications])])
389-
390384
AC_ARG_VAR([MPICC], [Path to the MPI C compiler-wrapper.])
391385
AC_ARG_VAR([MPICXX], [Path to the MPI C++ compiler-wrapper.])
392386

@@ -860,8 +854,6 @@ AS_IF([test "x$enable_debug" = x -o "x$enable_debug" = xno],
860854
[QTHREAD_DEBUG_FUTURELIB], [prints out futurelib debugging information at runtime])
861855
QT_COND_DEFINE([$enable_debug_xomp],
862856
[QTHREAD_DEBUG_XOMP], [prints out xomp debugging information at runtime])
863-
QT_COND_DEFINE([$enable_debug_multinode],
864-
[QTHREAD_DEBUG_MULTINODE], [prints out multinode debugging information at runtime])
865857
])
866858

867859
AS_IF([test "x$enable_hardware_timer" != "xno"],
@@ -953,16 +945,6 @@ AS_IF([test "x$qthread_topo" != xno],
953945
[AC_MSG_ERROR([Specified topology library ($qthread_topo) does not work.])])])])
954946
])
955947

956-
AS_IF([test "x$enable_multinode" = "xyes"],
957-
[AC_DEFINE([QTHREAD_MULTINODE], [1], [Defined if multinode support desired])
958-
QTHREAD_CHECK_PORTALS4([], [AC_MSG_ERROR([Could not find Portals 4 library])])
959-
CPPFLAGS="$CPPFLAGS $portals4_CPPFLAGS $portals4_runtime_CPPFLAGS"
960-
LDFLAGS="$LDFLAGS $portals4_LDFLAGS $portals4_runtime_LDFLAGS"
961-
LIBS="$LIBS $portals4_LIBS $portals4_runtime_LIBS"
962-
])
963-
964-
965-
966948
AS_IF([test "x$enable_lf_febs" == "xyes"],
967949
[AC_DEFINE([LOCK_FREE_FEBS], [1], [Define to use a lock-free hash table for FEB metadata.])],
968950
[enable_lf_febs=no])
@@ -993,7 +975,6 @@ AM_CONDITIONAL([COMPILE_SPAWNCACHE], [test "x$enable_spawn_cache" = "xyes"])
993975
AM_CONDITIONAL([COMPILE_EUREKAS], [test "x$enable_eurekas" = "xyes"])
994976
AM_CONDITIONAL([HAVE_GUARD_PAGES], [test "x$enable_guard_pages" = "xyes"])
995977
AM_CONDITIONAL([HAVE_PROG_TIMELIMIT], [test "x$timelimit_path" != "x"])
996-
AM_CONDITIONAL([COMPILE_MULTINODE], [test "$enable_multinode" = "yes"])
997978
AM_CONDITIONAL([QTHREAD_PERFORMANCE], [test "$enable_performance_monitoring" = "yes"])
998979
AM_CONDITIONAL([WANT_SINGLE_WORKER_SCHEDULER], [test "x$with_scheduler" = "xnemesis" -o "x$with_scheduler" = "xlifo" -o "x$with_scheduler" = "xmutexfifo" -o "x$with_scheduler" = "xmtsfifo" -o "x$with_scheduler" = "xmdlifo"])
999980
AM_CONDITIONAL([COMPILE_OMP_BENCHMARKS], [test "x$have_openmp" = "xyes"])
@@ -1016,7 +997,6 @@ AC_CONFIG_FILES([Makefile
1016997
test/utils/rng/Makefile
1017998
test/basics/Makefile
1018999
test/features/Makefile
1019-
test/multinode/Makefile
10201000
test/stress/Makefile
10211001
test/benchmarks/Makefile
10221002
test/benchmarks/mantevo/Makefile
@@ -1045,13 +1025,9 @@ case "$qthread_cv_stack_size" in
10451025
2096) stack_string="2kB" ;;
10461026
*) stack_string="${qthread_cv_stack_size} bytes" ;;
10471027
esac
1048-
AS_IF([test "x$enable_multinode" = "xyes"],
1049-
[multinode_string="$enable_multinode, $with_multinode_runtime"],
1050-
[multinode_string="no"])
10511028
echo ""
10521029
echo "System Characteristics:"
10531030
echo " Target Style: $qthread_implementation"
1054-
echo " Multi-node: $multinode_string"
10551031
echo " Topology API: ${qthread_topo:-none}"
10561032
echo " Qtimer type: ${qthread_timer_type:-none}"
10571033
echo " Aligned_t size: $sizeof_aligned_t (aligned on $align_aligned_t byte boundaries)"

include/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ noinst_HEADERS = \
1010
fastcontext/taskimpl.h \
1111
fastcontext/power-ucontext.h \
1212
fastcontext/386-ucontext.h \
13-
net/net.h \
1413
qthread_innards.h \
1514
qloop_innards.h \
1615
qt_asserts.h \
@@ -61,6 +60,3 @@ if COMPILE_EUREKAS
6160
noinst_HEADERS += qt_eurekas.h
6261
endif
6362

64-
if COMPILE_MULTINODE
65-
noinst_HEADERS += qt_multinode_innards.h
66-
endif

include/net/net.h

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)