Permalink
Browse files

INSTALL update requirements, install directions and setup.py with che…

…eseshop qpbo and ad3.

Now both are installed by default :)
  • Loading branch information...
1 parent b736b88 commit a424fca66f262e11e720a866ad257e6690eb8676 @amueller amueller committed Aug 11, 2013
Showing with 8 additions and 12 deletions.
  1. +3 −5 doc/index.rst
  2. +2 −4 requirements.txt
  3. +3 −3 setup.py
View
@@ -11,7 +11,7 @@ of `scikit-learn <http://scikit-learn.org/dev>`_.
PyStruct 0.1 is out now! Install it via pip:
- pip install -U pystruct
+ pip install pystruct
Starting with this first stable release, PyStruct will remain
stable with respect to API and will provide backward compatibility.
@@ -21,15 +21,13 @@ or on `github <https://github.com/pystruct/pystruct>`_.
Installation
=============
+To install pystruct, you need cvxopt, cython and scikit-learn.
The easiest way to install pystruct is using pip:
pip install pystruct
-You also need cvxopt and scikit-learn installed, and it is suggested that you
-also install additional packages for inference. The easiest way to get ready is:
-
- pip install -r requirements.txt
+This will also install the additional inference packages ad3 and pyqpbo.
You might also want to check out `OpenGM <http://ipa.iwr.uni-heidelberg.de/jkappes/opengm2/>`_,
a library containing many many inference algorithms that can be used with
View
@@ -4,7 +4,5 @@ matplotlib
PIL
cython
scikit-learn
-git+git://github.com/amueller/pyqpbo.git#egg=pyqpbo
-git+git://github.com/pystruct/AD3#egg=AD3
-#git clone git://git.tuebingen.mpg.de/libdai.git
-#git+git://github.com/amueller/daimrf.git#egg=daimrf
+pyqpbo
+ad3
View
@@ -1,5 +1,5 @@
-from distutils.core import setup
-from distutils.extension import Extension
+from setuptools import setup
+from setuptools.extension import Extension
from Cython.Distutils import build_ext
import os
@@ -9,7 +9,7 @@
setup(name="pystruct",
version="0.1",
-
+ install_requires=["ad3", "pyqpbo"],
packages=['pystruct', 'pystruct.learners', 'pystruct.inference',
'pystruct.models', 'pystruct.utils', 'pystruct.datasets',
'pystruct.tests', 'pystruct.tests.test_learners',

0 comments on commit a424fca

Please sign in to comment.