diff --git a/setup.py b/setup.py index f6c68c6..69f0ef2 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ problems. package_data = {'pulp' : ["AUTHORS","LICENSE", "pulp.cfg.linux", "pulp.cfg.win", + "pulp.cfg.osx", "LICENSE.CoinMP.txt", "AUTHORS.CoinMP.txt", "README.CoinMP.txt", diff --git a/src/pulp/pulp.cfg.osx b/src/pulp/pulp.cfg.osx new file mode 100644 index 0000000..2d6b9c7 --- /dev/null +++ b/src/pulp/pulp.cfg.osx @@ -0,0 +1,18 @@ +# The configuration file that holds locations for 3rd party solvers +# This is an appropriate configuration file for linux uses and in this case is assuming that the +# needed libraries are in the same directory as the config file (note this is not ideal and +# may change in later versions) +# Libraries are ordered in the needed order to resolve dependancies and CoinMP is loaded last +# a windows specific configuation file is pulp.cfg.win +#$Id: pulp.cfg 1704 2007-12-20 21:56:14Z smit023 $ +[locations] +CplexPath = /usr/ilog/cplex/bin/x86_rhel4.0_3.4/libcplex110.so +#note the recommended gurobi changes must be made to your PATH +#and LD_LIBRARY_PATH environment variables +GurobiPath = /opt/gurobi201/linux32/lib/python2.5 +CbcPath = cbc +GlpkPath = glpsol +PulpCbcPath = %(here)s/solverdir/cbc-osx +[licenses] +ilm_cplex_license = "LICENSE your-enterprise\nRUNTIME NEVER ..." +ilm_cplex_license_signature = 0 diff --git a/src/pulp/solverdir/cbc-osx-64 b/src/pulp/solverdir/cbc-osx-64 new file mode 100644 index 0000000..d2a6275 Binary files /dev/null and b/src/pulp/solverdir/cbc-osx-64 differ diff --git a/src/pulp/solvers.py b/src/pulp/solvers.py index ed99546..d1f3db7 100644 --- a/src/pulp/solvers.py +++ b/src/pulp/solvers.py @@ -102,6 +102,8 @@ def initialize(filename): PULPCFGFILE = "pulp.cfg" if sys.platform in ['win32', 'cli']: PULPCFGFILE += ".win" +elif sys.platform in ['darwin']: + PULPCFGFILE += ".osx" else: PULPCFGFILE += ".linux"