diff --git a/ApplicationLibCode/Application/Tools/RiaHpcTools.cpp b/ApplicationLibCode/Application/Tools/RiaHpcTools.cpp index 57eb93e107..0ec84d8a4b 100644 --- a/ApplicationLibCode/Application/Tools/RiaHpcTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaHpcTools.cpp @@ -28,13 +28,9 @@ namespace QStringList runUtilityCommand( QString cmdStr, QStringList arguments ) { - bool useWsl = RiaPreferencesOpm::current()->useWsl(); - - RimProcess proc( false ); - QStringList cmdList; - if ( useWsl ) + if ( RiaPreferencesOpm::current()->useWsl() ) { cmdList.append( RiaWslTools::wslCommand() ); cmdList.append( RiaPreferencesOpm::current()->wslOptions() ); @@ -43,6 +39,8 @@ QStringList runUtilityCommand( QString cmdStr, QStringList arguments ) cmdList.append( cmdStr ); cmdList.append( arguments ); + RimProcess proc( false /*no logging*/ ); + QString cmd = cmdList.takeFirst(); proc.setCommand( cmd ); if ( !cmdList.isEmpty() ) proc.addParameters( cmdList ); @@ -65,11 +63,7 @@ namespace RiaHpcTools //-------------------------------------------------------------------------------------------------- QStringList availableQueues( RiaDefines::BatchSchedulerType scheduler ) { - if ( scheduler == RiaDefines::BatchSchedulerType::LOCAL_COMPUTER ) - { - return {}; - } - else if ( scheduler == RiaDefines::BatchSchedulerType::SLURM ) + if ( scheduler == RiaDefines::BatchSchedulerType::SLURM ) { auto rawOutput = runUtilityCommand( "sinfo", { "-a" } ); return decodeSlurmQueues( rawOutput ); @@ -156,4 +150,20 @@ QStringList decodeLsfQueues( QStringList stdOut ) return retList; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void stopLsfJob( QString jobId ) +{ + runUtilityCommand( "bkill", { jobId } ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void stopSlurmJob( QString jobId ) +{ + runUtilityCommand( "scancel", { jobId } ); +} + } // namespace RiaHpcTools diff --git a/ApplicationLibCode/Application/Tools/RiaHpcTools.h b/ApplicationLibCode/Application/Tools/RiaHpcTools.h index 7cbc1dc925..fce0836a2b 100644 --- a/ApplicationLibCode/Application/Tools/RiaHpcTools.h +++ b/ApplicationLibCode/Application/Tools/RiaHpcTools.h @@ -32,6 +32,10 @@ namespace RiaHpcTools { QStringList availableQueues( RiaDefines::BatchSchedulerType scheduler ); +void stopLsfJob( QString jobId ); +void stopSlurmJob( QString jobId ); + +// helpers QStringList decodeSlurmQueues( QStringList stdOut ); QStringList decodeLsfQueues( QStringList stdOut );