[libfann] 175/242: *** empty log message ***

Christian Kastner chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:10:40 UTC 2014


This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to tag Version2_0_0
in repository libfann.

commit 2d75b42f8118e667928638d7ff25946e85e18045
Author: Steffen Nissen <lukesky at diku.dk>
Date:   Sun May 1 07:25:35 2005 +0000

    *** empty log message ***
---
 debian/changelog                      |   6 +
 debian/control                        |  18 +-
 debian/libfann1-py.dirs               |   1 +
 debian/libfann1-py.files              |   1 +
 debian/libfann1-py.install            |   1 +
 debian/rules                          |   3 +
 python/INSTALL                        |  45 +++
 python/Makefile                       |  29 ++
 python/README                         |  41 +--
 python/libfann.py                     | 512 ----------------------------------
 python/libfann.pyc                    | Bin 26911 -> 0 bytes
 python/makefile.gnu                   |  23 --
 python/pyfann/Makefile                |  22 ++
 python/{ => pyfann}/__init__.py       |   0
 python/{ => pyfann}/fann.py           |   0
 python/{ => pyfann}/fann_helper.c     |   0
 python/{ => pyfann}/makefile.msvc     |   4 +-
 python/{libfann.i => pyfann/pyfann.i} |   8 +-
 python/setup.py                       |  56 +---
 python/setup_unix.py                  |  38 ---
 20 files changed, 151 insertions(+), 657 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7ee1d5..311e019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libfann1 (1.2.0-2) unstable; urgency=low
+
+  * Added python bindings package 
+
+ -- Vincenzo Di Massa <hawk at hawk.linuxpratico.net>  Thu, 21 Apr 2005 12:32:35 +0200
+
 libfann1 (1.2.0-1) unstable; urgency=low
 
   * Debian package for version 1.2.0
diff --git a/debian/control b/debian/control
index 83289da..4dfa284 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libdevel
 Priority: optional
 Maintainer: Steffen Nissen <lukesky at diku.dk>
 Standards-Version: 3.6.0
-Build-Depends: docbook-utils, debhelper (>= 4.0.0)
+Build-Depends: docbook-utils, debhelper (>= 4.0.0), python-dev
 
 Package: libfann1-dev
 Section: libdevel
@@ -37,3 +37,19 @@ Description: Fast Artificial Neural Network Library (fann)
  well documented, and fast.
  . 
  This package contains the shared libraries.
+
+Package: libfann1-py
+Section: python
+Architecture: any
+Depends: ${shlibs:Depends}, libfann1
+Suggests: libfann1-dev (= ${Source-Version})
+Description: Python FANN Bindings (pyfann)
+ Fast Artificial Neural Network Library implements multilayer
+ artificial neural networks in C with support for both fully connected
+ and sparsely connected networks. Cross-platform execution in both
+ fixed and floating point are supported. It includes a framework for
+ easy handling of training data sets. It is easy to use, versatile,
+ well documented, and fast.
+ . 
+ This package contains the python wrapper.
+
diff --git a/debian/libfann1-py.dirs b/debian/libfann1-py.dirs
new file mode 100644
index 0000000..c898aaf
--- /dev/null
+++ b/debian/libfann1-py.dirs
@@ -0,0 +1 @@
+usr/lib/python2.4/site-packages/pyfann
diff --git a/debian/libfann1-py.files b/debian/libfann1-py.files
new file mode 100644
index 0000000..4e79043
--- /dev/null
+++ b/debian/libfann1-py.files
@@ -0,0 +1 @@
+usr/lib/python2.4/site-packages/pyfann/*
diff --git a/debian/libfann1-py.install b/debian/libfann1-py.install
new file mode 100644
index 0000000..4e79043
--- /dev/null
+++ b/debian/libfann1-py.install
@@ -0,0 +1 @@
+usr/lib/python2.4/site-packages/pyfann/*
diff --git a/debian/rules b/debian/rules
index 3c32f0d..110c565 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,8 @@ build-stamp:  config.status
 	cd doc && $(MAKE) html
 
 	$(MAKE)
+	
+	cd python && make build
 
 	touch build-stamp
 
@@ -74,6 +76,7 @@ install: build
 
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	( cd python && make install ROOT=$(CURDIR)/debian/tmp )
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/python/INSTALL b/python/INSTALL
new file mode 100644
index 0000000..2783d0e
--- /dev/null
+++ b/python/INSTALL
@@ -0,0 +1,45 @@
+INSTRUCTIONS
+
+
+PREREQUISITES
+^^^^^^^^^^^^^
+Make sure to make and install the fann library first. 
+You are required to have swig and python development files 
+installed. After you compiled the fann library...
+
+
+
+BUILD AND INSTALL USING DISTUTILS 
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+run the following command as root
+
+# make
+
+
+########## ** ** ** ** ** ** ** ** ** ** ** ** ** ** #########
+####### The wrapper should be installed using distutils #######
+###### The following instructions are for advanced users ######
+
+
+BUILD USING LINUX MAKEFILES
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+run the following command 
+
+$ make linux
+
+
+
+BUILD USING MSVC MAKEFILES
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+run the following command 
+
+$ make msvc
+
+
+
+INSTALL
+^^^^^^^
+
+to install you have to copy fann.py libfann.py and _libfann.so where python 
+can find them.
+
diff --git a/python/Makefile b/python/Makefile
new file mode 100644
index 0000000..1dd55bd
--- /dev/null
+++ b/python/Makefile
@@ -0,0 +1,29 @@
+# This makefile was written to compile a distribution of pyfann for
+# GNU platforms (cygwin included.)
+
+ROOT=/
+
+all: install
+
+linux:
+	@(cd pyfann && make)
+
+clean:
+	@(cd pyfann && make clean)
+	@rm -fr dist build setup.pyc
+
+msvc:
+	@(cd pyfann && make -f makefile.msvc)
+
+build: ../src/fann.o
+	@python setup.py build
+
+install: build
+	@python setup.py install --root $(ROOT)
+
+../src/fann.o: ../Makefile
+	@(cd .. && make )
+
+../Makefile:
+	@(cd .. && ./configure)
+
diff --git a/python/README b/python/README
index c0b6af8..e86f63a 100644
--- a/python/README
+++ b/python/README
@@ -1,43 +1,12 @@
 This python binding is provided by Vincenzo Di Massa <hawk.it at tiscalinet.it>
 and Gil Megidish <gil at megidish.net>
 
-Instructions for Windows:
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-MAKE
-Make sure to make the fann library first. You are required to have
-swig and python development files installed. After you compiled the
-fann library, run make with the apropriate makefile (gnu or msvc.) 
-Running build.bat will create a distribution for Windows platform. For
-that, you will need py2exe installed.
-
-NOTE
-Two makefiles are provided. The GNU makefile will create a shared object
-for use in GNU/cygwin environments. The MSVC makefile will create a dll
-for the official Python distribution. Importing a dll made with cygwin
-in a standard distribution will cause python to hang.
-
-ANOTHER NOTE
-MSVC makefile does not compile fann sources by itself. This is done, as
-of the moment, by compiling them manually. This should go into the setup.py,
-as python supports compilation of C code, using extension tags. Due the
-demand of this release, it has been postponed to a future version. One last
-note, there isn't really a need for libfann.py. It will be removed next
-version.
+DESCRIPTION
+Using this wrapper it is possible tu use libfann from python scripts
 
 USAGE
-Just import fann.
-
-Instructions for Unix/Linux:
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-First build and install the fann library. Then run:
-
-./setup_unix.py build
-./setup_unix.py install
+Just import pyfan.fann.
 
-Install alone will work too, if you run it twice (a small bug).
-The examples/ (not installed) should work now after you copy the datasets:
+BUILDING
+see INSTALL
 
-mkdir examples/datasets
-cp ../examples/xor.data ../benchmarks/datasets/mushroom.* examples/datasets/
diff --git a/python/libfann.py b/python/libfann.py
deleted file mode 100644
index 9dbe996..0000000
--- a/python/libfann.py
+++ /dev/null
@@ -1,512 +0,0 @@
-# This file was created automatically by SWIG.
-# Don't modify this file, modify the SWIG interface instead.
-# This file is compatible with both classic and new-style classes.
-
-import _libfann
-
-def _swig_setattr(self,class_type,name,value):
-    if (name == "this"):
-        if isinstance(value, class_type):
-            self.__dict__[name] = value.this
-            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
-            del value.thisown
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    self.__dict__[name] = value
-
-def _swig_getattr(self,class_type,name):
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError,name
-
-import types
-try:
-    _object = types.ObjectType
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-del types
-
-
-NULL = _libfann.NULL
-
-fann_create_array = _libfann.fann_create_array
-
-fann_create_shortcut_array = _libfann.fann_create_shortcut_array
-
-fann_run_old = _libfann.fann_run_old
-
-fann_destroy = _libfann.fann_destroy
-
-fann_randomize_weights = _libfann.fann_randomize_weights
-
-fann_init_weights = _libfann.fann_init_weights
-
-fann_print_connections = _libfann.fann_print_connections
-
-fann_create_from_file = _libfann.fann_create_from_file
-
-fann_save = _libfann.fann_save
-
-fann_save_to_fixed = _libfann.fann_save_to_fixed
-
-fann_train = _libfann.fann_train
-
-fann_test_old = _libfann.fann_test_old
-
-fann_get_error = _libfann.fann_get_error
-
-fann_get_MSE = _libfann.fann_get_MSE
-
-fann_reset_error = _libfann.fann_reset_error
-
-fann_reset_MSE = _libfann.fann_reset_MSE
-
-fann_read_train_from_file = _libfann.fann_read_train_from_file
-
-fann_destroy_train = _libfann.fann_destroy_train
-
-fann_train_epoch = _libfann.fann_train_epoch
-
-fann_test_data = _libfann.fann_test_data
-
-fann_train_on_data = _libfann.fann_train_on_data
-
-fann_train_on_data_callback = _libfann.fann_train_on_data_callback
-
-fann_train_on_file = _libfann.fann_train_on_file
-
-fann_train_on_file_callback = _libfann.fann_train_on_file_callback
-
-fann_shuffle_train_data = _libfann.fann_shuffle_train_data
-
-fann_merge_train_data = _libfann.fann_merge_train_data
-
-fann_duplicate_train_data = _libfann.fann_duplicate_train_data
-
-fann_save_train = _libfann.fann_save_train
-
-fann_save_train_to_fixed = _libfann.fann_save_train_to_fixed
-
-fann_cascadetrain_on_data_callback = _libfann.fann_cascadetrain_on_data_callback
-
-fann_print_parameters = _libfann.fann_print_parameters
-
-fann_get_training_algorithm = _libfann.fann_get_training_algorithm
-
-fann_set_training_algorithm = _libfann.fann_set_training_algorithm
-
-fann_get_learning_rate = _libfann.fann_get_learning_rate
-
-fann_set_learning_rate = _libfann.fann_set_learning_rate
-
-fann_get_activation_function_hidden = _libfann.fann_get_activation_function_hidden
-
-fann_set_activation_function_hidden = _libfann.fann_set_activation_function_hidden
-
-fann_get_activation_function_output = _libfann.fann_get_activation_function_output
-
-fann_set_activation_function_output = _libfann.fann_set_activation_function_output
-
-fann_get_activation_steepness_hidden = _libfann.fann_get_activation_steepness_hidden
-
-fann_set_activation_steepness_hidden = _libfann.fann_set_activation_steepness_hidden
-
-fann_get_activation_steepness_output = _libfann.fann_get_activation_steepness_output
-
-fann_set_activation_steepness_output = _libfann.fann_set_activation_steepness_output
-
-fann_get_activation_hidden_steepness = _libfann.fann_get_activation_hidden_steepness
-
-fann_set_activation_hidden_steepness = _libfann.fann_set_activation_hidden_steepness
-
-fann_get_activation_output_steepness = _libfann.fann_get_activation_output_steepness
-
-fann_set_activation_output_steepness = _libfann.fann_set_activation_output_steepness
-
-fann_set_train_error_function = _libfann.fann_set_train_error_function
-
-fann_get_train_error_function = _libfann.fann_get_train_error_function
-
-fann_get_quickprop_decay = _libfann.fann_get_quickprop_decay
-
-fann_set_quickprop_decay = _libfann.fann_set_quickprop_decay
-
-fann_get_quickprop_mu = _libfann.fann_get_quickprop_mu
-
-fann_set_quickprop_mu = _libfann.fann_set_quickprop_mu
-
-fann_get_rprop_increase_factor = _libfann.fann_get_rprop_increase_factor
-
-fann_set_rprop_increase_factor = _libfann.fann_set_rprop_increase_factor
-
-fann_get_rprop_decrease_factor = _libfann.fann_get_rprop_decrease_factor
-
-fann_set_rprop_decrease_factor = _libfann.fann_set_rprop_decrease_factor
-
-fann_get_rprop_delta_min = _libfann.fann_get_rprop_delta_min
-
-fann_set_rprop_delta_min = _libfann.fann_set_rprop_delta_min
-
-fann_get_rprop_delta_max = _libfann.fann_get_rprop_delta_max
-
-fann_set_rprop_delta_max = _libfann.fann_set_rprop_delta_max
-
-fann_get_num_input = _libfann.fann_get_num_input
-
-fann_get_num_output = _libfann.fann_get_num_output
-
-fann_get_total_neurons = _libfann.fann_get_total_neurons
-
-fann_get_total_connections = _libfann.fann_get_total_connections
-
-fann_set_error_log = _libfann.fann_set_error_log
-
-fann_get_errno = _libfann.fann_get_errno
-
-fann_reset_errno = _libfann.fann_reset_errno
-
-fann_reset_errstr = _libfann.fann_reset_errstr
-
-fann_get_errstr = _libfann.fann_get_errstr
-
-fann_print_error = _libfann.fann_print_error
-class fann_neuron(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, fann_neuron, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, fann_neuron, name)
-    def __repr__(self):
-        return "<C fann_neuron instance at %s>" % (self.this,)
-    __swig_setmethods__["first_con"] = _libfann.fann_neuron_first_con_set
-    __swig_getmethods__["first_con"] = _libfann.fann_neuron_first_con_get
-    if _newclass:first_con = property(_libfann.fann_neuron_first_con_get, _libfann.fann_neuron_first_con_set)
-    __swig_setmethods__["last_con"] = _libfann.fann_neuron_last_con_set
-    __swig_getmethods__["last_con"] = _libfann.fann_neuron_last_con_get
-    if _newclass:last_con = property(_libfann.fann_neuron_last_con_get, _libfann.fann_neuron_last_con_set)
-    __swig_setmethods__["sum"] = _libfann.fann_neuron_sum_set
-    __swig_getmethods__["sum"] = _libfann.fann_neuron_sum_get
-    if _newclass:sum = property(_libfann.fann_neuron_sum_get, _libfann.fann_neuron_sum_set)
-    __swig_setmethods__["value"] = _libfann.fann_neuron_value_set
-    __swig_getmethods__["value"] = _libfann.fann_neuron_value_get
-    if _newclass:value = property(_libfann.fann_neuron_value_get, _libfann.fann_neuron_value_set)
-    def __init__(self, *args):
-        _swig_setattr(self, fann_neuron, 'this', _libfann.new_fann_neuron(*args))
-        _swig_setattr(self, fann_neuron, 'thisown', 1)
-    def __del__(self, destroy=_libfann.delete_fann_neuron):
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-class fann_neuronPtr(fann_neuron):
-    def __init__(self, this):
-        _swig_setattr(self, fann_neuron, 'this', this)
-        if not hasattr(self,"thisown"): _swig_setattr(self, fann_neuron, 'thisown', 0)
-        _swig_setattr(self, fann_neuron,self.__class__,fann_neuron)
-_libfann.fann_neuron_swigregister(fann_neuronPtr)
-
-class fann_layer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, fann_layer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, fann_layer, name)
-    def __repr__(self):
-        return "<C fann_layer instance at %s>" % (self.this,)
-    __swig_setmethods__["first_neuron"] = _libfann.fann_layer_first_neuron_set
-    __swig_getmethods__["first_neuron"] = _libfann.fann_layer_first_neuron_get
-    if _newclass:first_neuron = property(_libfann.fann_layer_first_neuron_get, _libfann.fann_layer_first_neuron_set)
-    __swig_setmethods__["last_neuron"] = _libfann.fann_layer_last_neuron_set
-    __swig_getmethods__["last_neuron"] = _libfann.fann_layer_last_neuron_get
-    if _newclass:last_neuron = property(_libfann.fann_layer_last_neuron_get, _libfann.fann_layer_last_neuron_set)
-    def __init__(self, *args):
-        _swig_setattr(self, fann_layer, 'this', _libfann.new_fann_layer(*args))
-        _swig_setattr(self, fann_layer, 'thisown', 1)
-    def __del__(self, destroy=_libfann.delete_fann_layer):
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-class fann_layerPtr(fann_layer):
-    def __init__(self, this):
-        _swig_setattr(self, fann_layer, 'this', this)
-        if not hasattr(self,"thisown"): _swig_setattr(self, fann_layer, 'thisown', 0)
-        _swig_setattr(self, fann_layer,self.__class__,fann_layer)
-_libfann.fann_layer_swigregister(fann_layerPtr)
-
-class fann(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, fann, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, fann, name)
-    def __repr__(self):
-        return "<C fann instance at %s>" % (self.this,)
-    __swig_setmethods__["errno_f"] = _libfann.fann_errno_f_set
-    __swig_getmethods__["errno_f"] = _libfann.fann_errno_f_get
-    if _newclass:errno_f = property(_libfann.fann_errno_f_get, _libfann.fann_errno_f_set)
-    __swig_setmethods__["error_log"] = _libfann.fann_error_log_set
-    __swig_getmethods__["error_log"] = _libfann.fann_error_log_get
-    if _newclass:error_log = property(_libfann.fann_error_log_get, _libfann.fann_error_log_set)
-    __swig_setmethods__["errstr"] = _libfann.fann_errstr_set
-    __swig_getmethods__["errstr"] = _libfann.fann_errstr_get
-    if _newclass:errstr = property(_libfann.fann_errstr_get, _libfann.fann_errstr_set)
-    __swig_setmethods__["learning_rate"] = _libfann.fann_learning_rate_set
-    __swig_getmethods__["learning_rate"] = _libfann.fann_learning_rate_get
-    if _newclass:learning_rate = property(_libfann.fann_learning_rate_get, _libfann.fann_learning_rate_set)
-    __swig_setmethods__["connection_rate"] = _libfann.fann_connection_rate_set
-    __swig_getmethods__["connection_rate"] = _libfann.fann_connection_rate_get
-    if _newclass:connection_rate = property(_libfann.fann_connection_rate_get, _libfann.fann_connection_rate_set)
-    __swig_setmethods__["shortcut_connections"] = _libfann.fann_shortcut_connections_set
-    __swig_getmethods__["shortcut_connections"] = _libfann.fann_shortcut_connections_get
-    if _newclass:shortcut_connections = property(_libfann.fann_shortcut_connections_get, _libfann.fann_shortcut_connections_set)
-    __swig_setmethods__["first_layer"] = _libfann.fann_first_layer_set
-    __swig_getmethods__["first_layer"] = _libfann.fann_first_layer_get
-    if _newclass:first_layer = property(_libfann.fann_first_layer_get, _libfann.fann_first_layer_set)
-    __swig_setmethods__["last_layer"] = _libfann.fann_last_layer_set
-    __swig_getmethods__["last_layer"] = _libfann.fann_last_layer_get
-    if _newclass:last_layer = property(_libfann.fann_last_layer_get, _libfann.fann_last_layer_set)
-    __swig_setmethods__["total_neurons"] = _libfann.fann_total_neurons_set
-    __swig_getmethods__["total_neurons"] = _libfann.fann_total_neurons_get
-    if _newclass:total_neurons = property(_libfann.fann_total_neurons_get, _libfann.fann_total_neurons_set)
-    __swig_setmethods__["num_input"] = _libfann.fann_num_input_set
-    __swig_getmethods__["num_input"] = _libfann.fann_num_input_get
-    if _newclass:num_input = property(_libfann.fann_num_input_get, _libfann.fann_num_input_set)
-    __swig_setmethods__["num_output"] = _libfann.fann_num_output_set
-    __swig_getmethods__["num_output"] = _libfann.fann_num_output_get
-    if _newclass:num_output = property(_libfann.fann_num_output_get, _libfann.fann_num_output_set)
-    __swig_setmethods__["weights"] = _libfann.fann_weights_set
-    __swig_getmethods__["weights"] = _libfann.fann_weights_get
-    if _newclass:weights = property(_libfann.fann_weights_get, _libfann.fann_weights_set)
-    __swig_setmethods__["connections"] = _libfann.fann_connections_set
-    __swig_getmethods__["connections"] = _libfann.fann_connections_get
-    if _newclass:connections = property(_libfann.fann_connections_get, _libfann.fann_connections_set)
-    __swig_setmethods__["train_errors"] = _libfann.fann_train_errors_set
-    __swig_getmethods__["train_errors"] = _libfann.fann_train_errors_get
-    if _newclass:train_errors = property(_libfann.fann_train_errors_get, _libfann.fann_train_errors_set)
-    __swig_setmethods__["activation_function_hidden"] = _libfann.fann_activation_function_hidden_set
-    __swig_getmethods__["activation_function_hidden"] = _libfann.fann_activation_function_hidden_get
-    if _newclass:activation_function_hidden = property(_libfann.fann_activation_function_hidden_get, _libfann.fann_activation_function_hidden_set)
-    __swig_setmethods__["activation_function_output"] = _libfann.fann_activation_function_output_set
-    __swig_getmethods__["activation_function_output"] = _libfann.fann_activation_function_output_get
-    if _newclass:activation_function_output = property(_libfann.fann_activation_function_output_get, _libfann.fann_activation_function_output_set)
-    __swig_setmethods__["activation_steepness_hidden"] = _libfann.fann_activation_steepness_hidden_set
-    __swig_getmethods__["activation_steepness_hidden"] = _libfann.fann_activation_steepness_hidden_get
-    if _newclass:activation_steepness_hidden = property(_libfann.fann_activation_steepness_hidden_get, _libfann.fann_activation_steepness_hidden_set)
-    __swig_setmethods__["activation_steepness_output"] = _libfann.fann_activation_steepness_output_set
-    __swig_getmethods__["activation_steepness_output"] = _libfann.fann_activation_steepness_output_get
-    if _newclass:activation_steepness_output = property(_libfann.fann_activation_steepness_output_get, _libfann.fann_activation_steepness_output_set)
-    __swig_setmethods__["training_algorithm"] = _libfann.fann_training_algorithm_set
-    __swig_getmethods__["training_algorithm"] = _libfann.fann_training_algorithm_get
-    if _newclass:training_algorithm = property(_libfann.fann_training_algorithm_get, _libfann.fann_training_algorithm_set)
-    __swig_setmethods__["activation_results_hidden"] = _libfann.fann_activation_results_hidden_set
-    __swig_getmethods__["activation_results_hidden"] = _libfann.fann_activation_results_hidden_get
-    if _newclass:activation_results_hidden = property(_libfann.fann_activation_results_hidden_get, _libfann.fann_activation_results_hidden_set)
-    __swig_setmethods__["activation_values_hidden"] = _libfann.fann_activation_values_hidden_set
-    __swig_getmethods__["activation_values_hidden"] = _libfann.fann_activation_values_hidden_get
-    if _newclass:activation_values_hidden = property(_libfann.fann_activation_values_hidden_get, _libfann.fann_activation_values_hidden_set)
-    __swig_setmethods__["activation_results_output"] = _libfann.fann_activation_results_output_set
-    __swig_getmethods__["activation_results_output"] = _libfann.fann_activation_results_output_get
-    if _newclass:activation_results_output = property(_libfann.fann_activation_results_output_get, _libfann.fann_activation_results_output_set)
-    __swig_setmethods__["activation_values_output"] = _libfann.fann_activation_values_output_set
-    __swig_getmethods__["activation_values_output"] = _libfann.fann_activation_values_output_get
-    if _newclass:activation_values_output = property(_libfann.fann_activation_values_output_get, _libfann.fann_activation_values_output_set)
-    __swig_setmethods__["total_connections"] = _libfann.fann_total_connections_set
-    __swig_getmethods__["total_connections"] = _libfann.fann_total_connections_get
-    if _newclass:total_connections = property(_libfann.fann_total_connections_get, _libfann.fann_total_connections_set)
-    __swig_setmethods__["output"] = _libfann.fann_output_set
-    __swig_getmethods__["output"] = _libfann.fann_output_get
-    if _newclass:output = property(_libfann.fann_output_get, _libfann.fann_output_set)
-    __swig_setmethods__["num_MSE"] = _libfann.fann_num_MSE_set
-    __swig_getmethods__["num_MSE"] = _libfann.fann_num_MSE_get
-    if _newclass:num_MSE = property(_libfann.fann_num_MSE_get, _libfann.fann_num_MSE_set)
-    __swig_setmethods__["MSE_value"] = _libfann.fann_MSE_value_set
-    __swig_getmethods__["MSE_value"] = _libfann.fann_MSE_value_get
-    if _newclass:MSE_value = property(_libfann.fann_MSE_value_get, _libfann.fann_MSE_value_set)
-    __swig_setmethods__["num_bit_fail"] = _libfann.fann_num_bit_fail_set
-    __swig_getmethods__["num_bit_fail"] = _libfann.fann_num_bit_fail_get
-    if _newclass:num_bit_fail = property(_libfann.fann_num_bit_fail_get, _libfann.fann_num_bit_fail_set)
-    __swig_setmethods__["train_error_function"] = _libfann.fann_train_error_function_set
-    __swig_getmethods__["train_error_function"] = _libfann.fann_train_error_function_get
-    if _newclass:train_error_function = property(_libfann.fann_train_error_function_get, _libfann.fann_train_error_function_set)
-    __swig_setmethods__["cascade_change_fraction"] = _libfann.fann_cascade_change_fraction_set
-    __swig_getmethods__["cascade_change_fraction"] = _libfann.fann_cascade_change_fraction_get
-    if _newclass:cascade_change_fraction = property(_libfann.fann_cascade_change_fraction_get, _libfann.fann_cascade_change_fraction_set)
-    __swig_setmethods__["cascade_stagnation_epochs"] = _libfann.fann_cascade_stagnation_epochs_set
-    __swig_getmethods__["cascade_stagnation_epochs"] = _libfann.fann_cascade_stagnation_epochs_get
-    if _newclass:cascade_stagnation_epochs = property(_libfann.fann_cascade_stagnation_epochs_get, _libfann.fann_cascade_stagnation_epochs_set)
-    __swig_setmethods__["cascade_num_candidates"] = _libfann.fann_cascade_num_candidates_set
-    __swig_getmethods__["cascade_num_candidates"] = _libfann.fann_cascade_num_candidates_get
-    if _newclass:cascade_num_candidates = property(_libfann.fann_cascade_num_candidates_get, _libfann.fann_cascade_num_candidates_set)
-    __swig_setmethods__["cascade_best_candidate"] = _libfann.fann_cascade_best_candidate_set
-    __swig_getmethods__["cascade_best_candidate"] = _libfann.fann_cascade_best_candidate_get
-    if _newclass:cascade_best_candidate = property(_libfann.fann_cascade_best_candidate_get, _libfann.fann_cascade_best_candidate_set)
-    __swig_setmethods__["cascade_candidate_limit"] = _libfann.fann_cascade_candidate_limit_set
-    __swig_getmethods__["cascade_candidate_limit"] = _libfann.fann_cascade_candidate_limit_get
-    if _newclass:cascade_candidate_limit = property(_libfann.fann_cascade_candidate_limit_get, _libfann.fann_cascade_candidate_limit_set)
-    __swig_setmethods__["cascade_weight_multiplier"] = _libfann.fann_cascade_weight_multiplier_set
-    __swig_getmethods__["cascade_weight_multiplier"] = _libfann.fann_cascade_weight_multiplier_get
-    if _newclass:cascade_weight_multiplier = property(_libfann.fann_cascade_weight_multiplier_get, _libfann.fann_cascade_weight_multiplier_set)
-    __swig_setmethods__["cascade_candidate_scores"] = _libfann.fann_cascade_candidate_scores_set
-    __swig_getmethods__["cascade_candidate_scores"] = _libfann.fann_cascade_candidate_scores_get
-    if _newclass:cascade_candidate_scores = property(_libfann.fann_cascade_candidate_scores_get, _libfann.fann_cascade_candidate_scores_set)
-    __swig_setmethods__["total_neurons_allocated"] = _libfann.fann_total_neurons_allocated_set
-    __swig_getmethods__["total_neurons_allocated"] = _libfann.fann_total_neurons_allocated_get
-    if _newclass:total_neurons_allocated = property(_libfann.fann_total_neurons_allocated_get, _libfann.fann_total_neurons_allocated_set)
-    __swig_setmethods__["total_connections_allocated"] = _libfann.fann_total_connections_allocated_set
-    __swig_getmethods__["total_connections_allocated"] = _libfann.fann_total_connections_allocated_get
-    if _newclass:total_connections_allocated = property(_libfann.fann_total_connections_allocated_get, _libfann.fann_total_connections_allocated_set)
-    __swig_setmethods__["quickprop_decay"] = _libfann.fann_quickprop_decay_set
-    __swig_getmethods__["quickprop_decay"] = _libfann.fann_quickprop_decay_get
-    if _newclass:quickprop_decay = property(_libfann.fann_quickprop_decay_get, _libfann.fann_quickprop_decay_set)
-    __swig_setmethods__["quickprop_mu"] = _libfann.fann_quickprop_mu_set
-    __swig_getmethods__["quickprop_mu"] = _libfann.fann_quickprop_mu_get
-    if _newclass:quickprop_mu = property(_libfann.fann_quickprop_mu_get, _libfann.fann_quickprop_mu_set)
-    __swig_setmethods__["rprop_increase_factor"] = _libfann.fann_rprop_increase_factor_set
-    __swig_getmethods__["rprop_increase_factor"] = _libfann.fann_rprop_increase_factor_get
-    if _newclass:rprop_increase_factor = property(_libfann.fann_rprop_increase_factor_get, _libfann.fann_rprop_increase_factor_set)
-    __swig_setmethods__["rprop_decrease_factor"] = _libfann.fann_rprop_decrease_factor_set
-    __swig_getmethods__["rprop_decrease_factor"] = _libfann.fann_rprop_decrease_factor_get
-    if _newclass:rprop_decrease_factor = property(_libfann.fann_rprop_decrease_factor_get, _libfann.fann_rprop_decrease_factor_set)
-    __swig_setmethods__["rprop_delta_min"] = _libfann.fann_rprop_delta_min_set
-    __swig_getmethods__["rprop_delta_min"] = _libfann.fann_rprop_delta_min_get
-    if _newclass:rprop_delta_min = property(_libfann.fann_rprop_delta_min_get, _libfann.fann_rprop_delta_min_set)
-    __swig_setmethods__["rprop_delta_max"] = _libfann.fann_rprop_delta_max_set
-    __swig_getmethods__["rprop_delta_max"] = _libfann.fann_rprop_delta_max_get
-    if _newclass:rprop_delta_max = property(_libfann.fann_rprop_delta_max_get, _libfann.fann_rprop_delta_max_set)
-    __swig_setmethods__["rprop_delta_zero"] = _libfann.fann_rprop_delta_zero_set
-    __swig_getmethods__["rprop_delta_zero"] = _libfann.fann_rprop_delta_zero_get
-    if _newclass:rprop_delta_zero = property(_libfann.fann_rprop_delta_zero_get, _libfann.fann_rprop_delta_zero_set)
-    __swig_setmethods__["train_slopes"] = _libfann.fann_train_slopes_set
-    __swig_getmethods__["train_slopes"] = _libfann.fann_train_slopes_get
-    if _newclass:train_slopes = property(_libfann.fann_train_slopes_get, _libfann.fann_train_slopes_set)
-    __swig_setmethods__["prev_steps"] = _libfann.fann_prev_steps_set
-    __swig_getmethods__["prev_steps"] = _libfann.fann_prev_steps_get
-    if _newclass:prev_steps = property(_libfann.fann_prev_steps_get, _libfann.fann_prev_steps_set)
-    __swig_setmethods__["prev_train_slopes"] = _libfann.fann_prev_train_slopes_set
-    __swig_getmethods__["prev_train_slopes"] = _libfann.fann_prev_train_slopes_get
-    if _newclass:prev_train_slopes = property(_libfann.fann_prev_train_slopes_get, _libfann.fann_prev_train_slopes_set)
-    def __init__(self, *args):
-        _swig_setattr(self, fann, 'this', _libfann.new_fann(*args))
-        _swig_setattr(self, fann, 'thisown', 1)
-    def __del__(self, destroy=_libfann.delete_fann):
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-class fannPtr(fann):
-    def __init__(self, this):
-        _swig_setattr(self, fann, 'this', this)
-        if not hasattr(self,"thisown"): _swig_setattr(self, fann, 'thisown', 0)
-        _swig_setattr(self, fann,self.__class__,fann)
-_libfann.fann_swigregister(fannPtr)
-
-class fann_train_data(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, fann_train_data, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, fann_train_data, name)
-    def __repr__(self):
-        return "<C fann_train_data instance at %s>" % (self.this,)
-    __swig_setmethods__["errno_f"] = _libfann.fann_train_data_errno_f_set
-    __swig_getmethods__["errno_f"] = _libfann.fann_train_data_errno_f_get
-    if _newclass:errno_f = property(_libfann.fann_train_data_errno_f_get, _libfann.fann_train_data_errno_f_set)
-    __swig_setmethods__["error_log"] = _libfann.fann_train_data_error_log_set
-    __swig_getmethods__["error_log"] = _libfann.fann_train_data_error_log_get
-    if _newclass:error_log = property(_libfann.fann_train_data_error_log_get, _libfann.fann_train_data_error_log_set)
-    __swig_setmethods__["errstr"] = _libfann.fann_train_data_errstr_set
-    __swig_getmethods__["errstr"] = _libfann.fann_train_data_errstr_get
-    if _newclass:errstr = property(_libfann.fann_train_data_errstr_get, _libfann.fann_train_data_errstr_set)
-    __swig_setmethods__["num_data"] = _libfann.fann_train_data_num_data_set
-    __swig_getmethods__["num_data"] = _libfann.fann_train_data_num_data_get
-    if _newclass:num_data = property(_libfann.fann_train_data_num_data_get, _libfann.fann_train_data_num_data_set)
-    __swig_setmethods__["num_input"] = _libfann.fann_train_data_num_input_set
-    __swig_getmethods__["num_input"] = _libfann.fann_train_data_num_input_get
-    if _newclass:num_input = property(_libfann.fann_train_data_num_input_get, _libfann.fann_train_data_num_input_set)
-    __swig_setmethods__["num_output"] = _libfann.fann_train_data_num_output_set
-    __swig_getmethods__["num_output"] = _libfann.fann_train_data_num_output_get
-    if _newclass:num_output = property(_libfann.fann_train_data_num_output_get, _libfann.fann_train_data_num_output_set)
-    __swig_setmethods__["input"] = _libfann.fann_train_data_input_set
-    __swig_getmethods__["input"] = _libfann.fann_train_data_input_get
-    if _newclass:input = property(_libfann.fann_train_data_input_get, _libfann.fann_train_data_input_set)
-    __swig_setmethods__["output"] = _libfann.fann_train_data_output_set
-    __swig_getmethods__["output"] = _libfann.fann_train_data_output_get
-    if _newclass:output = property(_libfann.fann_train_data_output_get, _libfann.fann_train_data_output_set)
-    def __init__(self, *args):
-        _swig_setattr(self, fann_train_data, 'this', _libfann.new_fann_train_data(*args))
-        _swig_setattr(self, fann_train_data, 'thisown', 1)
-    def __del__(self, destroy=_libfann.delete_fann_train_data):
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-class fann_train_dataPtr(fann_train_data):
-    def __init__(self, this):
-        _swig_setattr(self, fann_train_data, 'this', this)
-        if not hasattr(self,"thisown"): _swig_setattr(self, fann_train_data, 'thisown', 0)
-        _swig_setattr(self, fann_train_data,self.__class__,fann_train_data)
-_libfann.fann_train_data_swigregister(fann_train_dataPtr)
-
-class fann_error(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, fann_error, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, fann_error, name)
-    def __repr__(self):
-        return "<C fann_error instance at %s>" % (self.this,)
-    __swig_setmethods__["errno_f"] = _libfann.fann_error_errno_f_set
-    __swig_getmethods__["errno_f"] = _libfann.fann_error_errno_f_get
-    if _newclass:errno_f = property(_libfann.fann_error_errno_f_get, _libfann.fann_error_errno_f_set)
-    __swig_setmethods__["error_log"] = _libfann.fann_error_error_log_set
-    __swig_getmethods__["error_log"] = _libfann.fann_error_error_log_get
-    if _newclass:error_log = property(_libfann.fann_error_error_log_get, _libfann.fann_error_error_log_set)
-    __swig_setmethods__["errstr"] = _libfann.fann_error_errstr_set
-    __swig_getmethods__["errstr"] = _libfann.fann_error_errstr_get
-    if _newclass:errstr = property(_libfann.fann_error_errstr_get, _libfann.fann_error_errstr_set)
-    def __init__(self, *args):
-        _swig_setattr(self, fann_error, 'this', _libfann.new_fann_error(*args))
-        _swig_setattr(self, fann_error, 'thisown', 1)
-    def __del__(self, destroy=_libfann.delete_fann_error):
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-class fann_errorPtr(fann_error):
-    def __init__(self, this):
-        _swig_setattr(self, fann_error, 'this', this)
-        if not hasattr(self,"thisown"): _swig_setattr(self, fann_error, 'thisown', 0)
-        _swig_setattr(self, fann_error,self.__class__,fann_error)
-_libfann.fann_error_swigregister(fann_errorPtr)
-
-FANN_TRAIN_INCREMENTAL = _libfann.FANN_TRAIN_INCREMENTAL
-FANN_TRAIN_BATCH = _libfann.FANN_TRAIN_BATCH
-FANN_TRAIN_RPROP = _libfann.FANN_TRAIN_RPROP
-FANN_TRAIN_QUICKPROP = _libfann.FANN_TRAIN_QUICKPROP
-FANN_ERRORFUNC_LINEAR = _libfann.FANN_ERRORFUNC_LINEAR
-FANN_ERRORFUNC_TANH = _libfann.FANN_ERRORFUNC_TANH
-FANN_LINEAR = _libfann.FANN_LINEAR
-FANN_THRESHOLD = _libfann.FANN_THRESHOLD
-FANN_THRESHOLD_SYMMETRIC = _libfann.FANN_THRESHOLD_SYMMETRIC
-FANN_SIGMOID = _libfann.FANN_SIGMOID
-FANN_SIGMOID_STEPWISE = _libfann.FANN_SIGMOID_STEPWISE
-FANN_SIGMOID_SYMMETRIC = _libfann.FANN_SIGMOID_SYMMETRIC
-FANN_SIGMOID_SYMMETRIC_STEPWISE = _libfann.FANN_SIGMOID_SYMMETRIC_STEPWISE
-FANN_GAUSSIAN = _libfann.FANN_GAUSSIAN
-FANN_GAUSSIAN_STEPWISE = _libfann.FANN_GAUSSIAN_STEPWISE
-FANN_ELLIOT = _libfann.FANN_ELLIOT
-FANN_ELLIOT_SYMMETRIC = _libfann.FANN_ELLIOT_SYMMETRIC
-
-fann_run = _libfann.fann_run
-
-fann_test = _libfann.fann_test
-
-get_train_data_input = _libfann.get_train_data_input
-
-get_train_data_output = _libfann.get_train_data_output
-
-fann_is_NULL = _libfann.fann_is_NULL
-cvar = _libfann.cvar
-FANN_TRAIN_NAMES = cvar.FANN_TRAIN_NAMES
-FANN_ERRORFUNC_NAMES = cvar.FANN_ERRORFUNC_NAMES
-FANN_ACTIVATION_NAMES = cvar.FANN_ACTIVATION_NAMES
-
diff --git a/python/libfann.pyc b/python/libfann.pyc
deleted file mode 100644
index c02a78d..0000000
Binary files a/python/libfann.pyc and /dev/null differ
diff --git a/python/makefile.gnu b/python/makefile.gnu
deleted file mode 100755
index ecce84d..0000000
--- a/python/makefile.gnu
+++ /dev/null
@@ -1,23 +0,0 @@
-# This makefile was written to compile a distribution of pyfann for
-# GNU platforms (cygwin included.)
-#
-# This is NOT needed for Linux/Unix, use setup_unix.py instead.
-
-TARGETS = _libfann.dll
-
-PYTHON=python2.3
-LIBS=-L. -L/usr/local/lib -L/usr/bin -l$(PYTHON) ../src/fann*.o
-
-all: $(TARGETS)
-
-_%.dll: %_wrap.o fann_helper.o
-	gcc $(LIBS) -shared -dll $^ -o $@
-
-%.o: %.c 
-	gcc -c $< -I/usr/include/$(PYTHON)/
-
-%_wrap.c: %.i 
-	swig -python $<
-
-clean:
-	rm -f $(TARGETS) *_wrap.* fann_helper.o fann.pyc *.so
diff --git a/python/pyfann/Makefile b/python/pyfann/Makefile
new file mode 100644
index 0000000..562f366
--- /dev/null
+++ b/python/pyfann/Makefile
@@ -0,0 +1,22 @@
+# This makefile was written to compile a distribution of pyfann for
+# GNU platforms (cygwin included.)
+
+TARGETS = _libfann.so
+
+PYTHON=python2.4
+FANN_DIR="../.."
+LIBS=-L. -L/usr/local/lib -L/usr/bin -l$(PYTHON) $(FANN_DIR)/src/fann*.o
+
+all: $(TARGETS)
+	
+_%.so: pyfann_wrap.o fann_helper.o
+	gcc $(LIBS) -shared -dll $^ -o $@
+
+%.o: %.c 
+	gcc -c $< -I/usr/include/$(PYTHON)/ -I$(FANN_DIR)/src/include/
+
+pyfann_wrap.c: pyfann.i 
+	swig -python $<
+
+clean:
+	rm -f $(TARGETS) *_wrap.* fann_helper.o fann.pyc *.so libfann.*
diff --git a/python/__init__.py b/python/pyfann/__init__.py
old mode 100755
new mode 100644
similarity index 100%
rename from python/__init__.py
rename to python/pyfann/__init__.py
diff --git a/python/fann.py b/python/pyfann/fann.py
old mode 100755
new mode 100644
similarity index 100%
rename from python/fann.py
rename to python/pyfann/fann.py
diff --git a/python/fann_helper.c b/python/pyfann/fann_helper.c
similarity index 100%
rename from python/fann_helper.c
rename to python/pyfann/fann_helper.c
diff --git a/python/makefile.msvc b/python/pyfann/makefile.msvc
old mode 100755
new mode 100644
similarity index 70%
rename from python/makefile.msvc
rename to python/pyfann/makefile.msvc
index 6c760e0..f5c9b9e
--- a/python/makefile.msvc
+++ b/python/pyfann/makefile.msvc
@@ -11,10 +11,10 @@ OBJS=libfann_wrap.obj fann_helper.obj
 all: $(TARGETS)
 
 _libfann.pyd: $(OBJS)
-	link /LIBPATH:$(PYDIR)/libs /DLL /OUT:$@ $(OBJS) ../src/fann*.obj python23.lib
+	link /LIBPATH:$(PYDIR)/libs /DLL /OUT:$@ $(OBJS) ../../src/fann*.obj python23.lib
 
 .c.obj:
-	cl -c $< -I $(PYDIR)/include -I ../src/include
+	cl -c $< -I $(PYDIR)/include -I ../../src/include
 
 libfann_wrap.c: libfann.i
 	swig -python libfann.i
diff --git a/python/libfann.i b/python/pyfann/pyfann.i
old mode 100755
new mode 100644
similarity index 90%
rename from python/libfann.i
rename to python/pyfann/pyfann.i
index 639c6a9..a70d4fc
--- a/python/libfann.i
+++ b/python/pyfann/pyfann.i
@@ -4,7 +4,7 @@
 %include "typemaps.i"
 
 %{
-#include "../src/include/fann.h"
+#include "fann.h"
 %}
 
 %define CHECKED_FLOAT_ARRAY(typemap_name, expected_length)
@@ -84,9 +84,9 @@ typedef double fann_type;
 %rename(fann_test) fann_test2;
 
 #define FANN_INCLUDE
-%include "../src/include/fann.h"
-%include "../src/include/fann_data.h"
-%include "../src/include/fann_activation.h"
+%include "../../src/include/fann.h"
+%include "../../src/include/fann_data.h"
+%include "../../src/include/fann_activation.h"
 
 // Helper functions
 PyObject* fann_run2(struct fann *ann, fann_type *input);
diff --git a/python/setup.py b/python/setup.py
index 0ca08f1..f389d42 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,13 +1,12 @@
 from distutils.core import setup, Extension
-from distutils.command.install_data import install_data
-from compiler.pycodegen import compileFile
 import glob
-import distutils
-import distutils.sysconfig
-import distutils.core
+#from compiler.pycodegen import compileFile
+#import distutils
+#import distutils.sysconfig
+#import distutils.core
 import os
-import py2exe
 
+NAME='pyfann'
 VERSION='1.2.0'
 
 LONG_DESCRIPTION="""\
@@ -18,52 +17,27 @@ handling of training data sets. It is easy to use, versatile, well
 documented, and fast. 
 """
 
-class smart_install_data(install_data):
-    """
-    override default distutils install_data, so we can copy
-    files directly, without splitting into modules, scripts,
-    packages, and extensions.
-    """
-    def run(self):
-        # need to change self.install_dir to the actual library dir
-
-        install_cmd = self.get_finalized_command('install')
-        self.install_dir = getattr(install_cmd, 'install_lib')
-        return install_data.run(self)
+#These lines are needed to circumvent a bug in distutils
+swig_cmd = 'swig -python pyfann/pyfann.i'
+#print 'running SWIG:', swig_cmd
+os.system(swig_cmd)
 
+#This utility function searches for files
 def hunt_files(root, which):
     return glob.glob(os.path.join(root, which))
 
-data_files = []
-
-# add sources
-data_files = data_files + [['', ['fann.py', '__init__.py']]]
-
-# add dll and swig output
-compileFile('libfann.py')
-data_files = data_files + [['', ['libfann.pyc', '_libfann.pyd']]]
-
-# add examples
-data_files = data_files + [['examples', hunt_files('examples', '*.py')]]
-
-# add examples datasets
-data_files = data_files + [['examples/datasets', hunt_files('../benchmarks/datasets', 'mushroom*')]]
-data_files = data_files + [['examples/datasets', hunt_files('../examples', 'xor.data')]]
-
 setup(
-    name='pyfann',
+    name=NAME,
     description='Fast Artificial Neural Network Library (fann)',
     long_description=LONG_DESCRIPTION,
     version=VERSION,
     author='Steffen Nissen',
     author_email='lukesky at diku.dk',
-    maintainer='Gil Megidish',
-    maintainer_email='gil at megidish.net',
+    maintainer='Gil Megidish & Vincenzo Di Massa',
+    maintainer_email='gil at megidish.net & hawk.it at tiscali,it',
     url='http://sourceforge.net/projects/fann/',
-    platforms='WIN32',
     license='GNU LESSER GENERAL PUBLIC LICENSE (LGPL)',
-    data_files=data_files,
-    cmdclass={'install_data': smart_install_data},
-    extra_path='pyfann'
+    py_modules=['pyfann.libfann','pyfann.fann'],
+    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann.i','pyfann/fann_helper.c'], include_dirs=['../src/include'], extra_objects=hunt_files('../src','fann*.o') )]
 )
 
diff --git a/python/setup_unix.py b/python/setup_unix.py
deleted file mode 100755
index 16cc8cd..0000000
--- a/python/setup_unix.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-from distutils.core import setup, Extension
-#from glob import glob
-
-VERSION='1.2.0'
-
-LONG_DESCRIPTION="""\
-Fast Artificial Neural Network Library implements multilayer
-artificial neural networks with support for both fully connected
-and sparsely connected networks. It includes a framework for easy 
-handling of training data sets. It is easy to use, versatile, well 
-documented, and fast. 
-"""
-
-module1 = Extension(
-    '_libfann', 
-    sources = ['libfann.i', 'fann_helper.c'], 
-    libraries = ['fann'],
-    #extra_objects = glob('../src/fann*.o'),
-    )
-
-setup(
-    name='pyfann',
-    version=VERSION,
-    description='Fast Artificial Neural Network Library (fann)',
-    long_description=LONG_DESCRIPTION,
-    author='Steffen Nissen',
-    author_email='lukesky at diku.dk',
-    maintainer='Gil Megidish',
-    maintainer_email='gil at megidish.net',
-    url='http://sourceforge.net/projects/fann/',
-    license='GNU LESSER GENERAL PUBLIC LICENSE (LGPL)',
-    platforms='UNIX',
-
-    ext_modules = [module1],
-    py_modules = ['libfann', 'fann']
-    )
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git



More information about the debian-science-commits mailing list