Changeset 258


Ignore:
Timestamp:
Nov 11, 2009, 9:29:00 AM (11 years ago)
Author:
jjbot
Message:

Made setup.py more readable and fixed errors in preimport.sql which were introduced by removing the source_id from set.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    r212 r258  
    2323
    2424#include_dir = distutils.sysconfig.get_python_lib() + "/numpy/core/include"
    25 #include_dir = "/usr/lib64/python2.6/site-packages/numpy/core/include"
    26 include_dir = setupconfig['setup.numpy_path']
     25include_dir = "/usr/lib64/python2.6/site-packages/numpy/core/include"
     26#include_dir = setupconfig['setup.numpy_path']
    2727
    2828setup(name = 'Ibidas',
     
    3434    py_modules = ['ibidas','test','config'],
    3535    packages = ['container', ],
    36 #   ext_package='extensions',
    3736    ext_modules = [
    38         Extension('closure', ['src/closure.c'],extra_compile_args=["-Wall"]),
    39         Extension('multi_visitor', ['src/multi_visitor.c'],extra_compile_args=["-Wall"]),
    40         Extension('base_container', ['src/base_container.c'],include_dirs=[include_dir],extra_compile_args=["-Wall"]),
    41         Extension('xnumpy', ['src/xnumpy.c'],
    42             include_dirs=[include_dir],extra_compile_args=["-Wall"]),
    43         Extension('qgraph', ['src/qgraph.c'],
    44             include_dirs=[include_dir],extra_compile_args=["-Wall"]),
    45         Extension('itypes',['src/itypes.c'],
    46             include_dirs=[include_dir],extra_compile_args=["-Wall"]),
    47         ],
     37        Extension(
     38                'closure',
     39                ['src/closure.c'],
     40                extra_compile_args=["-Wall"]
     41            ),
     42        Extension(
     43                    'multi_visitor',
     44                    ['src/multi_visitor.c'],
     45                    extra_compile_args=["-Wall"]
     46            ),
     47        Extension(
     48            'base_container',
     49            ['src/base_container.c'],
     50            include_dirs=[include_dir],
     51            extra_compile_args=["-Wall"]
     52        ),
     53        Extension(
     54            'xnumpy',
     55            ['src/xnumpy.c'],
     56            include_dirs=[include_dir],
     57            extra_compile_args=["-Wall"]
     58        ),
     59        Extension(
     60            'qgraph',
     61            ['src/qgraph.c'],
     62            include_dirs=[include_dir],
     63            extra_compile_args=["-Wall"]
     64        ),
     65        Extension(
     66            'itypes',
     67            ['src/itypes.c'],
     68            include_dirs=[include_dir],
     69            extra_compile_args=["-Wall"]
     70        ),
     71     ],
    4872     requires=['numpy','psycopg2','ipython'],
    4973     provides=['ibidas'],
  • sql/preimport.sql

    r256 r258  
    142142CREATE INDEX item_tree_location_display_name ON item_tree_location(display_name);
    143143
    144 CREATE INDEX set_type ON set(type_id,source_id);
    145 CREATE INDEX set_tree_type ON set_tree(type_id,source_id);
    146 CREATE INDEX set_reference_type ON set_reference(type_id,source_id);
     144CREATE INDEX set_type ON set(type_id);
     145CREATE INDEX set_tree_type ON set_tree(type_id);
     146CREATE INDEX set_reference_type ON set_reference(type_id);
    147147CREATE INDEX term_type ON term(source_id);
    148148CREATE INDEX term_tree_type ON term_tree(source_id);
     
    321321    end_pos BIGINT NOT NULL,
    322322    strand CHAR(1) NOT NULL
    323 ) INHERITS (prop)
     323) INHERITS (prop);
    324324
    325325CREATE TABLE prop_term (
     
    627627
    628628CREATE TABLE item_link_prop_range (
    629 ) INHERITS (item_link_prop, prop_range)
     629) INHERITS (item_link_prop, prop_range);
    630630
    631631CREATE INDEX thlp_type ON item_link_prop(type_id,source_id);
Note: See TracChangeset for help on using the changeset viewer.