Skip to content

Commit 1f521d3

Browse files
committed
Removes commented code
1 parent 58c9e42 commit 1f521d3

File tree

10 files changed

+0
-52
lines changed

10 files changed

+0
-52
lines changed

crates/hyperqueue/src/server/client/submit.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ fn create_task_submit(
3838
task_desc,
3939
resource_rq,
4040
} => {
41-
//let rqv = grm.convert_client_resource_rq(resource_rq);
4241
let resource_rq_id = server_ref.get_or_create_resource_rq_id(resource_rq);
4342
build_tasks_array(
4443
job_id,

crates/hyperqueue/src/transfer/messages.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ pub enum FromClientMessage {
3030
/// It is basically as sending Submit and StreamEvents, but it is done atomically,
3131
/// so no message is lost.
3232
Submit(SubmitRequest, Option<StreamEvents>),
33-
//GetResourceRqId(Vec<ResourceRequestVariants>),
3433
Cancel(CancelRequest),
3534
ForgetJob(ForgetJobRequest),
3635
JobDetail(JobDetailRequest),
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
pub mod auth;
22
pub mod connection;
33
pub mod messages;
4-
pub mod protocol;
54
pub mod stream;

crates/hyperqueue/src/transfer/protocol.rs

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

crates/tako/src/internal/server/task.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ static_assert_size!(Task, 96);
129129

130130
impl fmt::Debug for Task {
131131
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
132-
//let task_ids : Vec<_> = self.tasks.iter().map(|r| r.get().id.to_string()).collect();
133132
f.debug_struct("Task")
134133
.field("id", &self.id)
135134
.field("state", &self.state)

crates/tako/src/internal/tests/test_reactor.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ fn test_worker_add() {
144144
#[test]
145145
fn test_scheduler_priority() {
146146
let mut rt = TestEnv::new();
147-
//new_workers(&mut core, &mut comm, vec![1]);
148-
149147
let t = TaskBuilder::new();
150148

151149
let t1 = rt.new_task(&t);

crates/tako/src/internal/worker/reactor.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,6 @@ fn try_start_task(
116116
return Some(allocation);
117117
}
118118

119-
// let Some(allocation) = state.allocator.try_allocate(&rq) else {
120-
// // Soft reject, we remember rejection as we unblock in the future
121-
// state
122-
// .blocked_requests
123-
// .insert((task.resource_rq_id, resource_rq_variant));
124-
// task_updates.push(WorkerTaskUpdate::RejectRequest {
125-
// task_id: task.id,
126-
// resource_rq_variant,
127-
// });
128-
// return Some(allocation);
129-
// };
130-
131119
match launch_task(state, &task, rv_id, &allocation) {
132120
Ok((task_comm, task_context)) => {
133121
let msg = TaskRunningMsg {
@@ -198,7 +186,6 @@ fn launch_task(
198186
log::debug!("Task initialization failed id={task_id}, error={error:?}");
199187
state.lc_state.borrow_mut().unregister_token(&token);
200188
Err(error)
201-
//state.finish_task_failed(task_id, TaskFailInfo::from_string(error.to_string()));
202189
}
203190
}
204191
}

crates/tako/src/internal/worker/resources/test_allocator.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use crate::resources::{
1010
ResourceIndex, ResourceUnits,
1111
};
1212

13-
1413
impl ResourceAllocator {
1514
pub fn get_sockets(&self, allocation: &Allocation, idx: u32) -> Vec<usize> {
1615
let idx = ResourceId::new(idx);
@@ -1071,21 +1070,3 @@ fn test_tight_scattering() {
10711070
assert_eq!(r1[4].group_idx, r1[5].group_idx);
10721071
assert_ne!(r1[0].group_idx, r1[4].group_idx);
10731072
}
1074-
1075-
// #[test]
1076-
// fn test_coupling_tight() {
1077-
// for coupled in [true, false] {
1078-
// let descriptor = descriptor_cpus_gpus(3, 4, 2, coupled);
1079-
// let mut allocator = test_allocator(&descriptor);
1080-
//
1081-
// allocator.force_claim_from_groups(0.into(), &[0], 4.into());
1082-
// allocator.force_claim_from_groups(1.into(), &[1, 2], 4.into());
1083-
//
1084-
// let rq = ResBuilder::default()
1085-
// .add_force_compact(0, ResourceAmount::new_units(1))
1086-
// .add_force_compact(1, ResourceAmount::new_units(1))
1087-
// .finish_v();
1088-
// let al = allocator.try_allocate(&rq);
1089-
// assert_eq!(al.is_none(), coupled);
1090-
// }
1091-
// }

crates/tako/src/internal/worker/rpc.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,9 @@ pub async fn run_worker(
179179
Some(d) => Either::Right(tokio::time::sleep(d)),
180180
};
181181
let future = async move {
182-
//let try_start_tasks = task_starter_process(state_ref.clone(), start_task_notify);
183182
let send_loop = forward_queue_to_sealed_sink(queue_receiver, sender, sealer);
184183
tokio::pin! {
185184
let send_loop = send_loop;
186-
//let try_start_tasks = try_start_tasks;
187185
}
188186

189187
let result: crate::Result<Option<FromWorkerMessage>> = tokio::select! {
@@ -203,7 +201,6 @@ pub async fn run_worker(
203201
log::info!("Worker received an external stop notification");
204202
Ok(Some(FromWorkerMessage::Stop(WorkerStopReason::Interrupted)))
205203
}
206-
//_ = &mut try_start_tasks => { unreachable!() }
207204
_ = heartbeat_fut => { unreachable!() }
208205
_ = overview_fut => { unreachable!() }
209206
_ = local_comm_fut => { unreachable!() }
@@ -227,7 +224,6 @@ pub async fn run_worker(
227224
Err(e) => {
228225
// Server has disconnected
229226
tokio::select! {
230-
//_ = &mut try_start_tasks => { unreachable!() }
231227
r = finish_tasks_on_server_lost(state_ref.clone()) => r
232228
}
233229
Err(e)

crates/tako/src/internal/worker/state.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ pub struct WorkerState {
3737
/// If `Some`, forcefully overrides `configuration.overview_configuration.send_interval`.
3838
pub(crate) worker_overview_interval_override: Option<Duration>,
3939
pub(crate) task_launcher: Box<dyn TaskLauncher>,
40-
//pub(crate) secret_key: Option<Arc<SecretKey>>,
4140
pub(crate) start_time: Instant,
4241

4342
pub(crate) lc_state: RefCell<LocalCommState>,
@@ -252,7 +251,6 @@ impl WorkerStateRef {
252251
let resource_label_map = ResourceLabelMap::new(&configuration.resources, &resource_map);
253252
let allocator =
254253
ResourceAllocator::new(&configuration.resources, &resource_map, &resource_label_map);
255-
//let ready_task_queue = ResourceWaitQueue::new(allocator);
256254
let now = Instant::now();
257255

258256
let state = Self::wrap(WorkerState {

0 commit comments

Comments
 (0)