Skip to content

Commit

Permalink
make it work on both versions of MIP
Browse files Browse the repository at this point in the history
  • Loading branch information
dpvanbalen committed Apr 9, 2024
1 parent c92f26b commit c0b0098
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cbits/tracy
Submodule tracy updated 461 files
20 changes: 20 additions & 0 deletions gurobi.lic
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# DO NOT EDIT THIS FILE except as noted
#
# License ID 2437583
#
# Place this file in your home directory that takes precedence
# or in one of the following shared locations:
# * C:\gurobi\ on Windows
# * /opt/gurobi/ on Linux
# * /Library/gurobi/ on Mac OS X
# Or set the environment variable GRB_LICENSE_FILE to point to this file,
# it will override the default locations
#
TYPE=ACADEMIC
VERSION=10
HOSTNAME=jizo
HOSTID=c2c50dd4
USERNAME=dpvanbalen
EXPIRATION=2024-11-09
KEY=W6FHZ13Q
CKEY=W6FHZ13Q
2 changes: 1 addition & 1 deletion src/Data/Array/Accelerate/Trafo/Partitioning/ILP/MIP.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ instance (MakesILP op, MIP.IsSolver s IO) => ILPSolver s op where
solve :: s -> ILP op -> IO (Maybe (Solution op))
solve s (ILP dir obj constr bnds n) = makeSolution names . addZeroes problem <$> MIP.solve s options problem
where
options = MIP.SolveOptions{ MIP.solveTimeLimit = Just 60
options = def { MIP.solveTimeLimit = Just 60
, MIP.solveLogger = const (pure ()) --putStrLn . ("AccILPSolver: " ++)
, MIP.solveErrorLogger = putStrLn . ("AccILPSolverError: " ++)
} --, MIP.solveCondensedSolution = False }
Expand Down

0 comments on commit c0b0098

Please sign in to comment.