Skip to content

Commit

Permalink
Merge bb59ad4 into 02ced52
Browse files Browse the repository at this point in the history
  • Loading branch information
jakeret committed Feb 4, 2015
2 parents 02ced52 + bb59ad4 commit c98dada
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 9 deletions.
2 changes: 1 addition & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Citations

As you use **HOPE** for your exciting discoveries, please cite the paper that describes the package:

Akeret, J., Gamper, L., Amara, A. and Refregier, A., Astronomy and Computing (submitted 2014)
`Akeret, J., Gamper, L., Amara, A. and Refregier, A., Astronomy and Computing (submitted 2015) <http://www.sciencedirect.com/science/article/pii/S2213133714000687>`_

Feedback
--------
Expand Down
6 changes: 4 additions & 2 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
History
-------

0.4.0 (2015-xx-xx)
0.4.0 (2015-02-04)
++++++++++++++++++

* Increased compilation speed for large functions
* Support for variable allocation within if-else
* Added support for numpy.sign
* Improve compilation speed for large functions
* Updated Cython implementation in benchmarks
* Fixed array allocation problem under OSX Yosemite (thx iankronquist)

0.3.1 (2014-10-24)
++++++++++++++++++
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ By using **HOPE**, the user can benefit from being able to write common numerica
The **HOPE** package has been developed at ETH Zurich in the `Software Lab of the Cosmology Research Group <http://www.astro.ethz.ch/refregier/research/Software>`_ of the `ETH Institute of Astronomy <http://www.astro.ethz.ch>`_, and is now publicly available at `GitHub <https://github.com/cosmo-ethz/hope>`_.

Further information on the package can be found in our `paper <http://arxiv.org/abs/1410.4345>`_, on `pythonhosted.org <http://pythonhosted.org/hope>`_ and on our `website <http://hope.phys.ethz.ch>`_.
Further information on the package can be found in our `paper <http://www.sciencedirect.com/science/article/pii/S2213133714000687>`_, on `pythonhosted.org <http://pythonhosted.org/hope>`_ and on our `website <http://hope.phys.ethz.ch>`_.

Installation
------------
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
# dir menu entry, description, category)
texinfo_documents = [
('index', 'hope', u'hope Documentation',
u'Lukas Gamper', 'hope', 'One line description of project.',
u'Lukas Gamper', 'hope', 'HOPE - combine the ease of Python and the speed of C++',
'Miscellaneous'),
]

Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Contents
Benchmarks
----------

All the benchmarks have been made available online as `IPython notebooks <http://refreweb.phys.ethz.ch/hope/benchmark.html>`_. If you would like to run the benchmarks on your machine, you can download the notebooks in the nbviewer.
All the benchmarks have been made available online as `IPython notebooks <http://refreweb.phys.ethz.ch/hope/benchmark.html>`_ (also on `GitHub <https://github.com/cosmo-ethz/hope/tree/master/benchmarks>`_). If you would like to run the benchmarks on your machine, you can download the notebooks in the nbviewer.

**Note**: Make sure to execute the *native_cpp_gen* the first time in order to generate the native C++ code and some Python utility modules.

1 change: 1 addition & 0 deletions docs/lang.rst
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ NumPy Mathematical functions
``trunc(x)`` Return the truncated value of the input, element-wise.
``pi`` Returns the pi constant
``fabs`` Compute the absolute values element-wise
``sign`` Returns an element-wise indication of the sign of a number
==================================== =======================================================================================


Expand Down
16 changes: 14 additions & 2 deletions hope/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
# Copyright (c) 2013 ETH Zurich, Institute of Astronomy
# HOPE is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# HOPE is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with HOPE. If not, see <http://www.gnu.org/licenses/>.

from __future__ import print_function, division, absolute_import, unicode_literals


__all__ = ["jit", "config", "serialize", "unserialize"]
__author__ = "Lukas Gamper, Joel Akeret"
__email__ = "hope@phys.ethz.ch"
__version__ = "0.3.1"
__version__ = "0.4.0"
__credits__ = "ETH Zurich, Institute for Astronomy"

from hope import config
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def run_tests(self):

setup(
name="hope",
version="0.3.1",
version="0.4.0",
description="Specialized method-at-a-time JIT compiler",
long_description=readme + "\n\n" + history,
author="Lukas Gamper, Joel Akeret",
Expand Down

0 comments on commit c98dada

Please sign in to comment.