Skip to content

Commit

Permalink
#1173: remove dummy worker
Browse files Browse the repository at this point in the history
  • Loading branch information
cz4rs committed Feb 1, 2021
1 parent 0c565ba commit ee906bd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 93 deletions.
4 changes: 2 additions & 2 deletions src/vt/configs/debug/debug_masterconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ using VTPrintConfig = Configuration<
#define backend_no_threading \
!vt_check_enabled(openmp) && !vt_check_enabled(stdthread)

#define vt_no_threading \
!vt_check_enabled(openmp) && !vt_check_enabled(stdthread) && !vt_check_enabled(fcontext)
#define vt_threading_enabled \
vt_check_enabled(openmp) && vt_check_enabled(stdthread) && vt_check_enabled(fcontext)

#endif /*INCLUDED_VT_CONFIGS_DEBUG_DEBUG_MASTERCONFIG_H*/
87 changes: 0 additions & 87 deletions src/vt/worker/worker_dummy.h

This file was deleted.

4 changes: 2 additions & 2 deletions src/vt/worker/worker_group.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#elif vt_check_enabled(fcontext)
#include "vt/worker/worker_seq.h"
#else
#include "vt/worker/worker_dummy.h"
// #include "vt/worker/worker_dummy.h"
#endif

#include <vector>
Expand Down Expand Up @@ -118,7 +118,7 @@ struct WorkerGroupAny
#elif vt_check_enabled(fcontext)
using WorkerGroupSeq = WorkerGroupAny<WorkerSeq>;
#else
using WorkerGroupDummy = WorkerGroupAny<WorkerDummy>;
// using WorkerGroupDummy = WorkerGroupAny<WorkerDummy>;
#endif /*vt_check_enabled(stdthread)*/

}} /* end namespace vt::worker */
Expand Down
8 changes: 6 additions & 2 deletions src/vt/worker/worker_headers.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
#if !defined INCLUDED_WORKER_WORKER_HEADERS_H
#define INCLUDED_WORKER_WORKER_HEADERS_H

#if vt_threading_enabled

#include "vt/worker/worker.h"
#include "vt/worker/worker_group.h"
#include "vt/worker/worker_types.h"
Expand All @@ -64,7 +66,7 @@ namespace vt { namespace worker {
#elif vt_check_enabled(fcontext)
using WorkerGroupType = WorkerGroupSeq;
#else
using WorkerGroupType = WorkerGroupDummy;
// using WorkerGroupType = WorkerGroupDummy;
#endif

#if vt_check_enabled(openmp)
Expand All @@ -74,7 +76,7 @@ namespace vt { namespace worker {
#elif vt_check_enabled(fcontext)
using WorkerType = WorkerSeq;
#else
using WorkerType = WorkerDummy;
// using WorkerType = WorkerDummy;
#endif

}} /* end namespace vt::worker */
Expand All @@ -85,4 +87,6 @@ extern worker::WorkerGroupType* theWorkerGrp();

} /* end namespace vt */

#endif /* vt_threading_enabled */

#endif /*INCLUDED_WORKER_WORKER_HEADERS_H*/

0 comments on commit ee906bd

Please sign in to comment.