From a7e7e035fa92f8d8b0ad2985316c4d0fb93380d0 Mon Sep 17 00:00:00 2001 From: Stuart Mitchell Date: Mon, 16 Mar 2015 23:20:15 +1300 Subject: [PATCH] fiddling with setup.py --- setup.py | 7 ++++++- src/pulp/pulp.cfg.osx | 2 +- src/pulp/solverdir/cbc/__init__.py | 0 src/pulp/solverdir/cbc/linux/32/__init__.py | 0 src/pulp/solverdir/cbc/linux/64/__init__.py | 0 src/pulp/solverdir/cbc/linux/__init__.py | 0 src/pulp/solverdir/cbc/osx/64/__init__.py | 0 src/pulp/solverdir/cbc/osx/{ => 64}/cbc | Bin .../solverdir/cbc/osx/{ => 64}/coin-license.txt | 0 src/pulp/solverdir/cbc/osx/__init__.py | 0 src/pulp/solverdir/cbc/win/32/__init__.py | 0 src/pulp/solverdir/cbc/win/64/__init__.py | 0 src/pulp/solverdir/cbc/win/__init__.py | 0 src/pulp/solvers.py | 11 ++++++----- 14 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 src/pulp/solverdir/cbc/__init__.py create mode 100644 src/pulp/solverdir/cbc/linux/32/__init__.py create mode 100644 src/pulp/solverdir/cbc/linux/64/__init__.py create mode 100644 src/pulp/solverdir/cbc/linux/__init__.py create mode 100644 src/pulp/solverdir/cbc/osx/64/__init__.py rename src/pulp/solverdir/cbc/osx/{ => 64}/cbc (100%) rename src/pulp/solverdir/cbc/osx/{ => 64}/coin-license.txt (100%) create mode 100644 src/pulp/solverdir/cbc/osx/__init__.py create mode 100644 src/pulp/solverdir/cbc/win/32/__init__.py create mode 100644 src/pulp/solverdir/cbc/win/64/__init__.py create mode 100644 src/pulp/solverdir/cbc/win/__init__.py diff --git a/setup.py b/setup.py index 009c69c..0fce5db 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,12 @@ problems. "AUTHORS.CoinMP.txt", "README.CoinMP.txt", ], - 'pulp.solverdir' : ['*','*.*']}, + 'pulp.solverdir.cbc.linux.32' : ['*','*.*'], + 'pulp.solverdir.cbc.linux.64' : ['*','*.*'], + 'pulp.solverdir.cbc.win.32' : ['*','*.*'], + 'pulp.solverdir.cbc.win.64' : ['*','*.*'], + 'pulp.solverdir.cbc.osx.64' : ['*','*.*'], + }, install_requires = [pyparsing_ver], entry_points = (""" [console_scripts] diff --git a/src/pulp/pulp.cfg.osx b/src/pulp/pulp.cfg.osx index 04569a5..b359d99 100644 --- a/src/pulp/pulp.cfg.osx +++ b/src/pulp/pulp.cfg.osx @@ -12,7 +12,7 @@ CplexPath = /usr/ilog/cplex/bin/x86_rhel4.0_3.4/libcplex110.so GurobiPath = /opt/gurobi201/linux32/lib/python2.5 CbcPath = cbc GlpkPath = glpsol -PulpCbcPath = %(here)s/solverdir/cbc/%(os)s/cbc +PulpCbcPath = %(here)s/solverdir/cbc/%(os)s/%(arch)scbc [licenses] ilm_cplex_license = "LICENSE your-enterprise\nRUNTIME NEVER ..." ilm_cplex_license_signature = 0 diff --git a/src/pulp/solverdir/cbc/__init__.py b/src/pulp/solverdir/cbc/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/linux/32/__init__.py b/src/pulp/solverdir/cbc/linux/32/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/linux/64/__init__.py b/src/pulp/solverdir/cbc/linux/64/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/linux/__init__.py b/src/pulp/solverdir/cbc/linux/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/osx/64/__init__.py b/src/pulp/solverdir/cbc/osx/64/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/osx/cbc b/src/pulp/solverdir/cbc/osx/64/cbc similarity index 100% rename from src/pulp/solverdir/cbc/osx/cbc rename to src/pulp/solverdir/cbc/osx/64/cbc diff --git a/src/pulp/solverdir/cbc/osx/coin-license.txt b/src/pulp/solverdir/cbc/osx/64/coin-license.txt similarity index 100% rename from src/pulp/solverdir/cbc/osx/coin-license.txt rename to src/pulp/solverdir/cbc/osx/64/coin-license.txt diff --git a/src/pulp/solverdir/cbc/osx/__init__.py b/src/pulp/solverdir/cbc/osx/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/win/32/__init__.py b/src/pulp/solverdir/cbc/win/32/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/win/64/__init__.py b/src/pulp/solverdir/cbc/win/64/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solverdir/cbc/win/__init__.py b/src/pulp/solverdir/cbc/win/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pulp/solvers.py b/src/pulp/solvers.py index d57572b..7e8b9fd 100644 --- a/src/pulp/solvers.py +++ b/src/pulp/solvers.py @@ -108,21 +108,22 @@ def initialize(filename, operating_system='linux', arch='64'): #pick up the correct config file depending on operating system PULPCFGFILE = "pulp.cfg" +is_64bits = sys.maxsize > 2**32 +if is_64bits: + arch = '64' +else: + arch = '32' operating_system = None if sys.platform in ['win32', 'cli']: operating_system = 'win' PULPCFGFILE += ".win" elif sys.platform in ['darwin']: operating_system = "osx" + arch = '64' PULPCFGFILE += ".osx" else: operating_system = "linux" PULPCFGFILE += ".linux" -is_64bits = sys.maxsize > 2**32 -if is_64bits: - arch = '64' -else: - arch = '32' if __name__ != '__main__': DIRNAME = os.path.dirname(__file__)