Skip to content

Commit

Permalink
Advance version number to 20140710.
Browse files Browse the repository at this point in the history
whats_new.omh: release notes.
environment.hpp: suppress warnins.
setup.py: provide options for user choices in commnets.
  • Loading branch information
bradbell committed Jul 10, 2014
1 parent 26537eb commit 0713cd0
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 20 deletions.
3 changes: 1 addition & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /bin/bash -e
pycppad_version='20121020'
pycppad_version='20140710'
# ----------------------------------------------------------------------------
#
# exit on any error
Expand All @@ -17,7 +17,6 @@ then
fi
option="$1"
# ---------------------------------------------------------------------
cppad_tarball='cppad-20110101.5.gpl.tgz' # local_cppad_directory.gpl.tgz
external_dir=`pwd`/external # externals are placed here
log_dir=`pwd` # build progress logs written here
cppad_download_dir='http://www.coin-or.org/download/source/CppAD'
Expand Down
2 changes: 1 addition & 1 deletion doc.omh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $hiliteseq%
%.%reverse%(% reverse
%$$

$section pycppad-20121020: A Python Algorithm Derivative Package$$
$section pycppad-20140710: A Python Algorithm Derivative Package$$

$index AD, python$$
$index python, AD$$
Expand Down
22 changes: 11 additions & 11 deletions omh/install.omh
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ $index download, pycppad$$
$index pycppad, download$$
Download the file
$href%
http://www.seanet.com/~bradbell/pycppad-20121020.tar.gz%
pycppad-20121020.tar.gz
http://www.seanet.com/~bradbell/pycppad-20140710.tar.gz%
pycppad-20140710.tar.gz
%$$
and store it on your machine.

Expand All @@ -73,14 +73,14 @@ $index extract, pycppad$$
$index pycppad, extract$$
On unix, you could use the command
$codep
tar -xvzf pycppad-20121020.tar.gz
tar -xvzf pycppad-20140710.tar.gz
$$
which would create the directory $code pycppad-20121020$$.
which would create the directory $code pycppad-20140710$$.

$head Required Setup Information$$
The value of the following setup variables, in the file
$codep
pycppad-20121020/setup.py
pycppad-20140710/setup.py
$$
must be set to agree with your system:
$code
Expand All @@ -96,7 +96,7 @@ $index pycppad, build$$
$subhead With Debugging$$
$index debugging, build$$
$index build, debugging$$
Change into the directory $code pycppad-20121020$$ and execute the command
Change into the directory $code pycppad-20140710$$ and execute the command
$codep
./setup.py build_ext --inplace --debug --undef NDEBUG
$$
Expand Down Expand Up @@ -169,7 +169,7 @@ $index test, pycppad$$
$index pycppad, test$$
You can test of all the
$cref/examples/example/$$ in the $code pycppad$$ documentation.
Change into the directory $code pycppad-20121020$$ and execute the command
Change into the directory $code pycppad-20140710$$ and execute the command
$codep
python test_example.py
$$
Expand All @@ -194,7 +194,7 @@ You may or may not preform this step:
$pre

$$
Change into the directory $code pycppad-20121020$$ and execute the command
Change into the directory $code pycppad-20140710$$ and execute the command
$codei%
./setup.py build_ext --debug --undef NDEBUG install --prefix=%prefix%
%$$
Expand All @@ -221,7 +221,7 @@ an uninstall command. You can uninstall the $code pycppad$$ package
by removing the entries
$codei%
%prefix%/lib/python%major%.%minor%/site-packages/pycppad
%prefix%/lib/python%major%.%minor%/site-packages/pycppad-20121020.egg-info
%prefix%/lib/python%major%.%minor%/site-packages/pycppad-20140710.egg-info
%prefix%/share/doc/pycppad
%$$
where $icode major$$ and $icode minor$$
Expand All @@ -240,7 +240,7 @@ $codei%
%$$
unless the distribution directory
$codep
pycppad-20121020
pycppad-20140710
$$
is in your python path.
If you have installed $code pycppad$$,
Expand Down Expand Up @@ -272,7 +272,7 @@ to your $code @HOME/.bashrc$$ file.
$head pycppad Documentation$$
The documentation for $code pycppad$$ starts out in the directory
$codep
pycppad-20121020/doc
pycppad-20140710/doc
$$
During the installation process, it is copied to the directory
$codei%
Expand Down
11 changes: 11 additions & 0 deletions omh/whats_new.omh
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
$begin whats_new$$
$dollar @$$
$spell
pycppad
numpy
cppad
$$

$section Extensions, Bug Fixes, and Changes$$


$head 2014-07-10$$
Suppress warnings about using deprecated features of the
numpy C-API; see
$href%http://docs.scipy.org/doc/numpy-dev/reference/c-api.deprecations.html
%numpy c-api deprecation
%$$

$head 2014-05-29$$
Add support for the
$cref/future divide operator/future_div_op.py/$$.
Expand Down
3 changes: 3 additions & 0 deletions pycppad/environment.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# ifndef PYCPPAD_SETUP_INCLUDED
# define PYCPPAD_SETUP_INCLUDED

// Supress warnings about using deprecated numpy features:
# define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

# include <cppad/cppad.hpp>
# include <boost/python.hpp>
# include <numpy/arrayobject.h>
Expand Down
18 changes: 12 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@
# The code below is included verbatim in omh/install.omh
# BEGIN USER SETTINGS
# Directory where CppAD include files are located
cppad_include_dir = [ '/usr/include' ]
# cppad_include_dir = [ '/usr/include' ]
cppad_include_dir = [ os.environ['HOME'] + '/prefix/cppad/include' ]
# Directory where Boost Python library and include files are located
#
# Directory where Boost Python include files are located
boost_python_include_dir = [ '/usr/include' ]
boost_python_lib_dir = [ '/usr/lib' ]
#
# Director whre Boost Python library is located
# boost_python_lib_dir = [ '/usr/lib' ]
boost_python_lib_dir = [ '/usr/lib64' ]
#
# Name of the Boost Python library in boost_python_lib_dir.
boost_python_lib = [ 'boost_python-mt' ]
# boost_python_lib = [ 'boost_python-mt' ]
boost_python_lib = [ 'boost_python' ]
# END USER SETTINGS
# ---------------------------------------------------------------------
# See http://docs.python.org/distutils/setupscript.html
Expand All @@ -23,7 +29,7 @@
# for documentation on how to use the script setup.py
# ---------------------------------------------------------------------
# Values in setup.py that are replaced by build.sh
package_version = '20121020',
package_version = '20140710',
# ---------------------------------------------------------------------
def remove_duplicates(alist) :
n = len(alist)
Expand Down Expand Up @@ -69,7 +75,7 @@ def remove_duplicates(alist) :
sebastian_email = 'sebastian dot walter @ gmail dot com'
setup(
name = 'pycppad',
version = '20121020',
version = '20140710',
license = 'BSD',
description = 'Python Algorihtmic Differentiation Using CppAD',
author = 'Bradley M. Bell and Sebastian F. Walter',
Expand Down

0 comments on commit 0713cd0

Please sign in to comment.