Mercurial > pytave
changeset 48:5867e925d0dd
always enable float matrices
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Thu, 28 May 2009 10:28:24 +0200 |
| parents | 095e26d93935 |
| children | 2a2f1e2f2be3 |
| files | ChangeLog INSTALL configure.ac octave_to_python.cc python_to_octave.cc |
| diffstat | 5 files changed, 208 insertions(+), 157 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 26 11:41:26 2009 +0200 +++ b/ChangeLog Thu May 28 10:28:24 2009 +0200 @@ -1,3 +1,9 @@ +2009-05-28 Jaroslav Hajek <highegg@gmail.com> + + * configure.ac: Remove --enable-float-matrices option. + * octave_to_python.cc: Remove uses of PYTAVE_USE_OCTAVE_FLOAT. + * python_to_octave.cc: Ditto. + 2009-05-26 Jaroslav Hajek <highegg@gmail.com> * octave_to_python.cc (octvalue_to_pyarrobj): Support Complex
--- a/INSTALL Tue May 26 11:41:26 2009 +0200 +++ b/INSTALL Thu May 28 10:28:24 2009 +0200 @@ -1,154 +1,237 @@ -Building instructions +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options ===================== -You can use either Python distutils, GNU Automake or Boost BJam to -build pytave. The configure script outputs files for all these build -systems. Autoconf's VPATH is supported on all build systems. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. - Use the configure script to set up Octave and Boost::Python -paths. Run `./configure --help' for more info. + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: -Dependencies -============ + ./configure CC=c99 CFLAGS=-g LIBS=-lposix -Configuring: - an sh shell capable of running `configure' + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== -Building: - Python's distutils or - make or - BJam +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. -Linked and tested with: - Python 2.4 - Boost::Python 1.33 - Octave 3.0.2 + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. -Bootstraping from Bazaar trunk -============================== - - 1. `bzr branch lp:pytave' - - 2. `autoreconf --install' - - 3. `./configure' +Installation Names +================== -Autotools -========= - -The Autotools build system need not be installed to build the -module. You need `make' and all library dependencies though. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. - 1. Create the `Makefile' by typing: - `./configure --prefix=/directory/where/you/want/the/module/file' - - 2. Type `make' to build the extention module. - - 3. To copy the pytave dynamic library to the prefix, type - `make install' - -BJam -==== + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. -BJam must be installed in order to build the module. You also need a -proper `user-config.jam' file in your home directory. + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. - 1. Create `Jamfile' and `project-root.jam' by typing `./configure' - - 2. Use your `bjam' command to build the extention module. + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -user-config.jam -=============== - -For your convenience, here the content of a typical ~/user-config.jam -on a GNU/Linux system: +Optional Features +================= -using gcc ; -using python : 2.5 ; - -Distutils -========= +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. - 1. Create the `setup.py' file by typing `./configure' - - 2. Run `python setup.py build' to build and package the extention - module together with the pure Python files. + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. -Running from build directory -============================ - -Pytave is made up of three parts. The `pytave' package, the -`pytave/pytave' module and the `pytave/_pytave' extention. When the -user uses `import pytave', the pytave package __init__ script loads -both the module and the extention. It is important that they both can -be found. +Specifying the System Type +========================== - 1. Follow the Distutils build instructions. A complete Python - package directory called `pytave' is created in - `build/lib.something' +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: - 2. Start the Python interactive interpreter with - `PYTHONPATH=build/lib.linux-i686-2.4/ python' (with appropriate - changes for your system.) + CPU-COMPANY-SYSTEM - 3. In the interpreter you can now access Octave through Python: +where SYSTEM can have one of these forms: + + OS KERNEL-OS -import pytave -import Numeric -pytave.feval(1, "cos", 0) -b = pytave.addpath(".") -pytave.feval(1, "testfile", 42) + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. - (Observe that there is no testfile.m file in the distribution. - You could create one for yourself.) + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. - Using BJam or Automake instead of Distutils, you load the -`pytave/pytave' module and the extention instead of the whole -package. Using `import pytave' now calls the module directly, but the -difference is transparent to the user. + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ - Basically all you want to do is load Python with shared library -for the pytave extention (called `pytave/_pytave') and the native -`pytave/pytave' module. BJam creates shared library in the -`bin/something/something' directory, while Autotools hide a working -shared library in the `.libs' directory. The contents of the `pytave' -package is stored in the directory `package' of the source -package. This is an example for an Autotools build. - - 1. Follow the Autotools build instructions. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. - 2. Start the Python interpreter with a Python path set to a path - containing `_pytave.so' and the `package' directory. A common way - to do this with the bash shell is to execute this command: - `PYTHONPATH=.libs:package python'. +Defining Variables +================== - With BJam that command would be something like: - `PYTHONPATH=bin/something/something:package python'. +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: -Running test suite in build directory -===================================== + ./configure CC=/usr/local2/bin/gcc -Read the instructions above, and start the script test/test.py. +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). -Installing with distutils -========================= +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: - 1. Run `python setup.py install' + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash -Creating a source dist +`configure' Invocation ====================== - 1. Run `make distcheck' +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. -Hint about foreign systems -========================== +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. -If you are running on a system incapable of executing the configure -scripts (e.g. a Microsoft Windows system), you may want to try -installing the `MinGW' and `MSYS' packages, and build everything -inside that environment. This isn't for the faint of hearted though, -since you need/want to build Octave too. It is probably easier than -trying to build without configure scripts, that's all. There are no -guarentees that it will build at all, it has not been tested. +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. -EOF. \ No newline at end of file +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. +
--- a/configure.ac Tue May 26 11:41:26 2009 +0200 +++ b/configure.ac Thu May 28 10:28:24 2009 +0200 @@ -17,36 +17,10 @@ AC_PRESERVE_HELP_ORDER -AC_ARG_ENABLE(float-matrices, - [AS_HELP_STRING([--enable-float-matrices], - [use Octave float matrices (experimental) - @<:@default=no@:>@])], - [pytave_enable_float="$enableval"], - [pytave_enable_float=no]) dnl TODO: Change to check someday - pytave_libs_ok= AX_OCTAVE([], [], [pytave_libs_ok=no]) -AS_IF([test "x$pytave_enable_float" = "xcheck" dnl - -o "x$pytave_enable_float" = "xyes"], [ - AX_OCTAVE_FLOAT([ - AC_DEFINE([PYTAVE_USE_OCTAVE_FLOATS], [], - [Define to enable conversion of Octave float - matrices. If not defined, float matrices are - expanded to double matrices]) - ], [ - AS_IF([test "x$pytave_enable_float" = "xyes"], [ - AC_WARN([[ -======================================================================== -Float matrices enabled, but could not compile test program against -Octave. -========================================================================]]) - pytave_libs_ok=no - ]) - ]) -]) - # Pick a Python library to use AX_PYTHON_DEVEL([], [], [pytave_libs_ok=no])
--- a/octave_to_python.cc Tue May 26 11:41:26 2009 +0200 +++ b/octave_to_python.cc Thu May 28 10:28:24 2009 +0200 @@ -167,7 +167,6 @@ throw value_convert_exception("Unknown double matrix type"); } -#ifdef PYTAVE_USE_OCTAVE_FLOATS if (matrix.is_single_type ()) { if (matrix.is_complex_type ()) { return create_array<FloatComplex, FloatComplexNDArray> @@ -178,7 +177,6 @@ } else throw value_convert_exception("Unknown float matrix type"); } -#endif if (matrix.is_int64_type()) { return create_sint_array<int64NDArray, sizeof(int64_t)>(
--- a/python_to_octave.cc Tue May 26 11:41:26 2009 +0200 +++ b/python_to_octave.cc Thu May 28 10:28:24 2009 +0200 @@ -87,10 +87,8 @@ template <class X, class Y> class matching_type : public boost::false_type { }; template <class X> class matching_type<X, X> : public boost::true_type { }; template <class X> class matching_type<X, octave_int<X> > : public boost::true_type { }; -#ifndef PYTAVE_USE_OCTAVE_FLOATS template <> class matching_type<float, double> : public boost::true_type { }; template <> class matching_type<FloatComplex, Complex> : public boost::true_type { }; -#endif template <class PythonPrimitive, class OctaveBase> static void copy_pyarrobj_to_octarray_dispatch(OctaveBase &matrix, @@ -204,22 +202,14 @@ } break; case PyArray_FLOAT: -#ifdef PYTAVE_USE_OCTAVE_FLOATS pyarrobj_to_octvalueNd<FloatNDArray>(octvalue, pyarr, dims); break; -#else - /* fallthrough */ -#endif case PyArray_DOUBLE: pyarrobj_to_octvalueNd<NDArray>(octvalue, pyarr, dims); break; case PyArray_CFLOAT: -#ifdef PYTAVE_USE_OCTAVE_FLOATS pyarrobj_to_octvalueNd<FloatComplexNDArray>(octvalue, pyarr, dims); break; -#else - /* fallthrough */ -#endif case PyArray_CDOUBLE: pyarrobj_to_octvalueNd<ComplexNDArray>(octvalue, pyarr, dims); break;