Skip to content

Commit

Permalink
use oz's mirror of runsolver that has a hacky --quiet mode
Browse files Browse the repository at this point in the history
  • Loading branch information
ozgurakgun committed Mar 28, 2024
1 parent 951e2d7 commit 8ad1d61
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions etc/build/install-runsolver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# version as of 25 March 2024
# alas, none of the published releases compile correctly
VERSION='3f923c08285bdc5186f995296e1c6bffa0588710'
VERSION='add1db71b5ecbeb9d2b1329d242dff0ada18809f'

set -o errexit
set -o nounset
Expand All @@ -18,7 +18,7 @@ if [ "$OS" == "Linux" ]; then
rm -rf tmp-install-runsolver
mkdir tmp-install-runsolver
pushd tmp-install-runsolver
git clone https://github.com/utpalbora/runsolver.git
git clone https://github.com/ozgurakgun/runsolver.git
cd runsolver
git checkout $VERSION
cd src
Expand Down
6 changes: 3 additions & 3 deletions etc/build/runsolver.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/src/runsolver.cc b/src/runsolver.cc
index f42c9a1..312c985 100644
index e2a7902..5696a34 100644
--- a/src/runsolver.cc
+++ b/src/runsolver.cc
@@ -906,7 +906,7 @@ void numaInfo() {
@@ -916,7 +916,7 @@ void numaInfo() {
return;

int nbNodes = numa_num_configured_nodes();
- long mem, memFree;
+ long long mem, memFree;

if (!quiet_progress) {
cout << "NUMA information:\n";
cout << " number of nodes: " << nbNodes << endl;
4 changes: 2 additions & 2 deletions src/Conjure/UI/MainHelper.hs
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ savileRowNoParam ui@Solve{..} (modelPath, eprimeModel) = sh $ errExit False $ do
tr (1::Int)
let runsolverArgs = maybe [] (\ limit -> ["-C", show limit]) runsolverCPUTimeLimit ++
maybe [] (\ limit -> ["-R", show limit]) runsolverMemoryLimit ++
["-v", outputDirectory </> outBase ++ ".runsolver-info"]
["--quiet", "-v", outputDirectory </> outBase ++ ".runsolver-info"]
(stdoutSR, solutions) <- partitionEithers <$>
case (runsolverCPUTimeLimit, runsolverMemoryLimit) of
(Nothing, Nothing) -> runHandle savilerowScriptName srArgs handler
Expand Down Expand Up @@ -855,7 +855,7 @@ savileRowWithParams ui@Solve{..} (modelPath, eprimeModel) (paramPath, essencePar
tr (1::Int)
let runsolverArgs = maybe [] (\ limit -> ["-C", show limit]) runsolverCPUTimeLimit ++
maybe [] (\ limit -> ["-V", show limit]) runsolverMemoryLimit ++
["-v", outputDirectory </> outBase ++ ".runsolver-info"]
["--quiet", "-v", outputDirectory </> outBase ++ ".runsolver-info"]
(stdoutSR, solutions) <- partitionEithers <$>
case (runsolverCPUTimeLimit, runsolverMemoryLimit) of
(Nothing, Nothing) -> runHandle savilerowScriptName srArgs handler
Expand Down

0 comments on commit 8ad1d61

Please sign in to comment.