Browse Source

starpu-top: remove references to gordon

Nathalie Furmento 12 years ago
parent
commit
5b7284c849
2 changed files with 2 additions and 12 deletions
  1. 1 9
      starpu-top/communicationmanager.cpp
  2. 1 3
      starpu-top/starpu_top_types.h

+ 1 - 9
starpu-top/communicationmanager.cpp

@@ -674,9 +674,7 @@ void CommunicationManager::parseInitDevMessage(QString messageString)
                         _inMessageStrings.key(COM_MSG_IN_DEV_CUDA))
                 == 0 || deviceTypeString.compare(
                         _inMessageStrings.key(COM_MSG_IN_DEV_OPENCL)) == 0
-                || deviceTypeString.compare(
-                        _inMessageStrings.key(COM_MSG_IN_DEV_GORDON))
-                == 0,
+		,
                 "CommunicationManager::parseInitDevMessage()",
                 "Bogus message received in INIT DEV");
 
@@ -695,11 +693,6 @@ void CommunicationManager::parseInitDevMessage(QString messageString)
         {
             deviceType = SERVERDEVICE_OPENCL;
         }
-        else if (deviceTypeString.compare(
-                _inMessageStrings.key(COM_MSG_IN_DEV_GORDON)) == 0)
-        {
-            deviceType = SERVERDEVICE_GORDON;
-        }
 
         starpu_top_device device;
         device.id = deviceId;
@@ -1517,7 +1510,6 @@ void CommunicationManager::initInMessageStrings()
     _inMessageStrings.insert("CPU", COM_MSG_IN_DEV_CPU);
     _inMessageStrings.insert("GPU", COM_MSG_IN_DEV_CUDA);
     _inMessageStrings.insert("OPENCL", COM_MSG_IN_DEV_OPENCL);
-    _inMessageStrings.insert("GORDON", COM_MSG_IN_DEV_GORDON);
     _beginEndMessageStrings.insert("DEV");
     _beginEndMessageStrings.insert("/DEV");
     // Server ready

+ 1 - 3
starpu-top/starpu_top_types.h

@@ -116,8 +116,7 @@ enum starpu_top_device_type
 {
     SERVERDEVICE_CPU = 0,
     SERVERDEVICE_CUDA = 1,
-    SERVERDEVICE_OPENCL = 2,
-    SERVERDEVICE_GORDON = 3,
+    SERVERDEVICE_OPENCL = 2
 };
 
 // Server devices
@@ -232,7 +231,6 @@ enum CommunicationInMessageType
     COM_MSG_IN_DEV_CPU = 32,
     COM_MSG_IN_DEV_CUDA = 33,
     COM_MSG_IN_DEV_OPENCL = 34,
-    COM_MSG_IN_DEV_GORDON = 35,
 
     COM_MSG_IN_READY = 40,