From b56260efe013fb013259a8e9fc77db099dd1e5b8 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 26 Apr 2011 21:13:52 -0700
Subject: [PATCH] select/cray: set default TopologyPlugin

The select/cray plugin discovers the topology as part of its initialisation and
generates a node ranking. No further topology information is required by the
plugin, hence this patch sets the default TopologyPlugin to topology/none.
---
 src/common/read_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/read_config.h b/src/common/read_config.h
index 7d9b53b35cc..6f78d3427e7 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -138,7 +138,7 @@ extern char *default_plugstack;
 #define DEFAULT_SWITCH_TYPE         "switch/none"
 #define DEFAULT_TASK_PLUGIN         "task/none"
 #define DEFAULT_TMP_FS              "/tmp"
-#ifdef HAVE_3D
+#if defined HAVE_3D && !defined HAVE_CRAY
 #  define DEFAULT_TOPOLOGY_PLUGIN     "topology/3d_torus"
 #else
 #  define DEFAULT_TOPOLOGY_PLUGIN     "topology/none"
-- 
GitLab