add --runsolver-wall-time-limit

conjure-cp · Mar 29, 2024 · 78f2b3f · 78f2b3f
1 parent 8ad1d61
commit 78f2b3f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/docs/conjure-help.html b/docs/conjure-help.html
@@ -136,6 +136,7 @@
 <tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--use-existing-models=FILE</td><td style='padding-left:2ex;'>File names of Essence' models generated beforehand.<br />If given, Conjure skips the modelling phase and uses the existing models for solving.<br />The models should be inside the output directory (See -o).</td></tr>
 <tr><td colspan='3'>runsolver:</td></tr>
 <tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--runsolver-cpu-time-limit=INT</td><td style='padding-left:2ex;'>Use runsolver to limit total CPU time (in seconds)</td></tr>
+<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--runsolver-wall-time-limit=INT</td><td style='padding-left:2ex;'>Use runsolver to limit total elapsed time (in seconds)</td></tr>
 <tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--runsolver-memory-limit=INT</td><td style='padding-left:2ex;'>Use runsolver to limit total memory usage (Maximum RSS - in megabytes).</td></tr>
 <tr><td colspan='3'>Options for other tools:</td></tr>
 <tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--savilerow-options=ITEM</td><td style='padding-left:2ex;'>Options passed to Savile Row.</td></tr>

diff --git a/docs/conjure-help.txt b/docs/conjure-help.txt
@@ -263,6 +263,7 @@
                                               The models should be inside the output directory (See -o).
  runsolver:
       --runsolver-cpu-time-limit=INT          Use runsolver to limit total CPU time (in seconds)
+      --runsolver-wall-time-limit=INT         Use runsolver to limit total elapsed time (in seconds)
       --runsolver-memory-limit=INT            Use runsolver to limit total memory usage (Maximum RSS - in megabytes).
  Options for other tools:
       --savilerow-options=ITEM                Options passed to Savile Row.

diff --git a/src/Conjure/Process/Enumerate.hs b/src/Conjure/Process/Enumerate.hs
@@ -144,6 +144,7 @@ enumerateDomain d = liftIO' $ withSystemTempDirectory ("conjure-enumerateDomain-
             , copySolutions                 = False
             , solutionsInOneFile            = False
             , runsolverCPUTimeLimit         = Nothing
+            , runsolverWallTimeLimit        = Nothing
             , runsolverMemoryLimit          = Nothing
             , logLevel                      = LogNone
             -- default values for the rest

diff --git a/src/Conjure/UI.hs b/src/Conjure/UI.hs
@@ -100,6 +100,7 @@ data UI
         , responsesRepresentation    :: String
         , solutionsInOneFile         :: Bool
         , runsolverCPUTimeLimit      :: Maybe Int
+        , runsolverWallTimeLimit     :: Maybe Int
         , runsolverMemoryLimit       :: Maybe Int
         -- flags related to logging
         , logLevel                   :: LogLevel
@@ -747,6 +748,12 @@ ui = modes
             &= groupname "runsolver"
             &= explicit
             &= help "Use runsolver to limit total CPU time (in seconds)"
+        , runsolverWallTimeLimit
+            = def
+            &= name "runsolver-wall-time-limit"
+            &= groupname "runsolver"
+            &= explicit
+            &= help "Use runsolver to limit total elapsed time (in seconds)"
         , runsolverMemoryLimit
             = def
             &= name "runsolver-memory-limit"

diff --git a/src/Conjure/UI/MainHelper.hs b/src/Conjure/UI/MainHelper.hs
@@ -804,11 +804,12 @@ savileRowNoParam ui@Solve{..} (modelPath, eprimeModel) = sh $ errExit False $ do
                     (outBase, modelPath, "<no param file>", ui)
                     tr (1::Int)
     let runsolverArgs = maybe [] (\ limit -> ["-C", show limit]) runsolverCPUTimeLimit ++
-                        maybe [] (\ limit -> ["-R", show limit]) runsolverMemoryLimit  ++
+                        maybe [] (\ limit -> ["-W", show limit]) runsolverWallTimeLimit ++
+                        maybe [] (\ limit -> ["-R", show limit]) runsolverMemoryLimit ++
                         ["--quiet", "-v", outputDirectory </> outBase ++ ".runsolver-info"]
     (stdoutSR, solutions) <- partitionEithers <$>
-        case (runsolverCPUTimeLimit, runsolverMemoryLimit) of
-            (Nothing, Nothing) -> runHandle savilerowScriptName srArgs handler
+        case (runsolverCPUTimeLimit, runsolverWallTimeLimit, runsolverMemoryLimit) of
+            (Nothing, Nothing, Nothing) -> runHandle savilerowScriptName srArgs handler
             _ ->
                 if os /= "linux"
                     then return [Left "runsolver is only supported on linux"]
@@ -854,11 +855,12 @@ savileRowWithParams ui@Solve{..} (modelPath, eprimeModel) (paramPath, essencePar
                             (outBase, modelPath, paramPath, ui)
                             tr (1::Int)
             let runsolverArgs = maybe [] (\ limit -> ["-C", show limit]) runsolverCPUTimeLimit ++
-                                maybe [] (\ limit -> ["-V", show limit]) runsolverMemoryLimit  ++
-                        ["--quiet", "-v", outputDirectory </> outBase ++ ".runsolver-info"]
+                                maybe [] (\ limit -> ["-W", show limit]) runsolverWallTimeLimit ++
+                                maybe [] (\ limit -> ["-R", show limit]) runsolverMemoryLimit ++
+                                ["--quiet", "-v", outputDirectory </> outBase ++ ".runsolver-info"]
             (stdoutSR, solutions) <- partitionEithers <$>
-                case (runsolverCPUTimeLimit, runsolverMemoryLimit) of
-                    (Nothing, Nothing) -> runHandle savilerowScriptName srArgs handler
+                case (runsolverCPUTimeLimit, runsolverWallTimeLimit, runsolverMemoryLimit) of
+                    (Nothing, Nothing, Nothing) -> runHandle savilerowScriptName srArgs handler
                     _ ->
                         if os /= "linux"
                             then return [Left "runsolver is only supported on linux"]