From b21546ef31285de480624f1bcf8603cbaafe9a9c Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 19 Apr 2016 21:56:59 +0200 Subject: [PATCH] kill MSG_gpu_task_create. Was unused and unusable --- include/simgrid/msg.h | 24 ------------------------ src/msg/msg_private.h | 9 --------- src/msg/msg_task.cpp | 34 ---------------------------------- 3 files changed, 67 deletions(-) diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 562f659456..0ea4c0ef63 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -130,26 +130,6 @@ static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){ return (msg_storage_priv_t )xbt_lib_get_level(storage, MSG_STORAGE_LEVEL); } -/*************** Begin GPU ***************/ -typedef struct simdata_gpu_task *simdata_gpu_task_t; - -typedef struct msg_gpu_task { - char *name; /**< @brief task name if any */ - simdata_gpu_task_t simdata; /**< @brief simulator data */ - long long int counter; /* task unique identifier for instrumentation */ - char *category; /* task category for instrumentation */ -} s_msg_gpu_task_t; - -/** @brief GPU task datatype. - @ingroup m_task_management - - A task may then be defined by a computing - amount, a dispatch latency and a collect latency. - \see m_task_management -*/ -typedef struct msg_gpu_task *msg_gpu_task_t; -/*************** End GPU ***************/ - /** * \brief @brief Communication action. * \ingroup msg_task_usage @@ -382,10 +362,6 @@ XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process); XBT_PUBLIC(msg_task_t) MSG_task_create(const char *name, double flops_amount, double bytes_amount, void *data); -XBT_PUBLIC(msg_gpu_task_t) MSG_gpu_task_create(const char *name, - double flops_amount, - double dispatch_latency, - double collect_latency); XBT_PUBLIC(msg_task_t) MSG_parallel_task_create(const char *name, int host_nb, const msg_host_t * host_list, diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 8327148aa3..efe693ffb8 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -68,15 +68,6 @@ typedef struct simdata_file { XBT_PRIVATE int __MSG_host_get_file_descriptor_id(msg_host_t host); XBT_PRIVATE void __MSG_host_release_file_descriptor_id(msg_host_t host, int id); -/*************** Begin GPU ***************/ -typedef struct simdata_gpu_task { - double flops_amount; /* Computation size */ - double dispatch_latency; - double collect_latency; - int isused; /* Indicates whether the task is used in SIMIX currently */ -} s_simdata_gpu_task_t; -/*************** End GPU ***************/ - /******************************* Process *************************************/ typedef struct simdata_process { diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index b7e6a6d1a8..95382ab787 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -102,40 +102,6 @@ msg_task_t MSG_parallel_task_create(const char *name, int host_nb, const msg_hos return task; } -/*************** Begin GPU ***************/ -/** \ingroup m_task_management - * \brief Creates a new #msg_gpu_task_t. - - * A constructor for #msg_gpu_task_t taking four arguments and returning a pointer to the new created GPU task. - - * \param name a name for the object. It is for user-level information and can be NULL. - * \param flops_amount a value of the processing amount (in flop)needed to process this new task. If 0, then it cannot - * be executed with MSG_gpu_task_execute(). This value has to be >=0. - * \param dispatch_latency time in seconds to load this task on the GPU - * \param collect_latency time in seconds to transfer result from the GPU back to the CPU (host) when done - - * \see msg_gpu_task_t - * \return The new corresponding object. - */ -msg_gpu_task_t MSG_gpu_task_create(const char *name, double flops_amount, double dispatch_latency, - double collect_latency) -{ - msg_gpu_task_t task = xbt_new(s_msg_gpu_task_t, 1); - simdata_gpu_task_t simdata = xbt_new(s_simdata_gpu_task_t, 1); - task->simdata = simdata; - /* Task structure */ - task->name = xbt_strdup(name); - - /* Simulator Data */ - simdata->flops_amount = flops_amount; - simdata->dispatch_latency = dispatch_latency; - simdata->collect_latency = collect_latency; - - /* TRACE_msg_gpu_task_create(task); FIXME*/ - return task; -} -/*************** End GPU ***************/ - /** \ingroup m_task_management * \brief Return the user data of a #msg_task_t. * -- 2.20.1