feat(launcher): default num_shard to CUDA_VISIBLE_DEVICES if possible

This commit is contained in:
OlivierDehaene 2023-03-08 13:02:17 +01:00
parent 0ac38d336a
commit b761d02713

View File

@ -115,13 +115,10 @@ fn main() -> ExitCode {
None => {
// try to default to the number of available GPUs
tracing::info!("Parsing num_shard from CUDA_VISIBLE_DEVICES");
let cuda_visible_devices = env::var("CUDA_VISIBLE_DEVICES")
.expect("--num-shard and CUDA_VISIBLE_DEVICES are not set");
let n_devices = cuda_visible_devices.split(",").count();
let n_devices = num_cuda_devices().expect("--num-shard and CUDA_VISIBLE_DEVICES are not set");
if n_devices <= 1 {
panic!("`sharded` is true but only found {n_devices} CUDA devices");
}
tracing::info!("Sharding on {n_devices} found CUDA devices");
n_devices
}
Some(num_shard) => {
@ -144,9 +141,13 @@ fn main() -> ExitCode {
}
}
} else {
// default to a single shard
num_shard.unwrap_or(1)
match num_shard {
// get num_shard from CUDA_VISIBLE_DEVICES or default to a single shard
None => num_cuda_devices().unwrap_or(1),
Some(num_shard) => num_shard
}
};
tracing::info!("Sharding model on {num_shard} processes");
// Signal handler
let running = Arc::new(AtomicBool::new(true));
@ -154,7 +155,7 @@ fn main() -> ExitCode {
ctrlc::set_handler(move || {
r.store(false, Ordering::SeqCst);
})
.expect("Error setting Ctrl-C handler");
.expect("Error setting Ctrl-C handler");
// Check if model_id is a local model
let local_path = Path::new(&model_id);
@ -669,3 +670,12 @@ fn shutdown_shards(shutdown: Arc<Mutex<bool>>, shutdown_receiver: &mpsc::Receive
// This will block till all shutdown_sender are dropped
let _ = shutdown_receiver.recv();
}
fn num_cuda_devices() -> Option<usize> {
if let Ok(cuda_visible_devices) = env::var("CUDA_VISIBLE_DEVICES") {
let n_devices = cuda_visible_devices.split(",").count();
return Some(n_devices);
}
None
}