Merge pull request #344 from raysect/development

Release 0.6.1

Author: CnlPepper

.travis.yml

@@ -1,8 +1,13 @@
 language: python
 python:
   - "3.6"
+  - "3.7"
+env:
+  - NUMPY_VERSION=1.14.6
+  - NUMPY_VERSION=1.16.6
+  - NUMPY_VERSION=1.18.1
 install:
-  - pip install numpy scipy matplotlib cython
+  - pip install numpy==$NUMPY_VERSION scipy matplotlib cython>=0.28
   - dev/build.sh
 # command to run tests
 script: dev/test.sh

CHANGELOG.txt

@@ -1,6 +1,20 @@
 Raysect Changelog
 =================
 
+Release 0.6.1 (2 Feb 2019)
+---------------------------
+
+New:
+* Added relational operators to the FunctionXD objects.
+* Added abs() operator to FunctionXD objects.
+* Square root (SqrtXD) and error functions (ErfXD) added to FunctionXD package.
+* Added SpectralAdaptiveSampler1D and SpectralAdaptiveSampler2D.
+* FullFrameSampler2D, RGBAdaptiveSampler2D, MonoAdaptiveSampler2D now supports pixel masks directly.
+
+Bug fixes:
+* MulticoreEngine render engine now passes back exceptions from worker processes and correctly terminates the render.
+
+
 Release 0.6.0 (13 Nov 2019)
 ---------------------------
 
@@ -33,7 +47,7 @@ Bug fixes:
 New:
 * Added quaternions to the core math package.
 * Added low level cython functions to calculate mininum, maximum and peak_to_peak for memoryviews. (contributor: Dr Jack Lovell)
-* Added a material blending modifier to the raysect.optical.material.modifiers package.
+* Added a material blending modifier to the raysect.optical.material.modifiers package.relational
 
 
 Release 0.5.5 (4 Mar 2019)

dev/notes/building_bdist_with_manylinux.txt

@@ -0,0 +1,24 @@
+Install docker:
+
+    sudo apt install docker.io
+
+Create a temporary folder, enter it and clone the new release:
+
+    git clone git@github.com:raysect/source.git
+
+Start the manylinux docker container (this will download the container, mount the current folder as "io", and start an interactive session):
+
+    sudo docker run -ti -v $(pwd):/io quay.io/pypa/manylinux2010_x86_64 /bin/bash
+
+This will drop you into the manylinux container terminal. The /opt/python folder in the container holds the various versions of python. This example targets python 3.7. Adjust the paths as appropriate to build bdists for different python versions.
+
+    cd io/source
+    /opt/python/cp37-cp37m/bin/python -m pip install cython numpy==1.14.6
+    /opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
+    auditwheel repair dist/raysect-0.6.1-cp37-cp37m-linux_x86_64.whl
+
+This will compile the wheel and repair any library references to produce the manylinux wheel files in a folder ./wheelhouse. e.g. raysect-0.6.1-cp37-cp37m-manylinux1_x86_64.whl and raysect-0.6.0-cp37-cp37m-manylinux2010_x86_64.whl.
+
+These can then be uploaded to pypi (just the manylinux1 packages for now).
+
+For more info see: https://uwekorn.com/2019/09/15/how-we-build-apache-arrows-manylinux-wheels.html

docs/source/api_reference/optical/pipelines.rst

@@ -61,6 +61,9 @@ Power
 .. autoclass:: raysect.optical.observer.pipeline.mono.PowerPipeline0D
    :show-inheritance:
 
+.. autoclass:: raysect.optical.observer.pipeline.mono.PowerPipeline1D
+   :show-inheritance:
+
 .. autoclass:: raysect.optical.observer.pipeline.mono.PowerPipeline2D
    :members: display_auto_exposure, display_unsaturated_fraction, display_update_time, save
    :show-inheritance:
@@ -72,6 +75,9 @@ Radiance
 .. autoclass:: raysect.optical.observer.pipeline.mono.RadiancePipeline0D
    :show-inheritance:
 
+.. autoclass:: raysect.optical.observer.pipeline.mono.RadiancePipeline1D
+   :show-inheritance:
+
 .. autoclass:: raysect.optical.observer.pipeline.mono.RadiancePipeline2D
    :show-inheritance:
 
@@ -86,6 +92,13 @@ Spectral
    :members: to_spectrum
    :show-inheritance:
 
+.. autoclass:: raysect.optical.observer.pipeline.spectral.SpectralPowerPipeline1D
+   :show-inheritance:
+
+.. autoclass:: raysect.optical.observer.pipeline.spectral.SpectralRadiancePipeline1D
+   :members: to_spectrum
+   :show-inheritance:
+
 .. autoclass:: raysect.optical.observer.pipeline.spectral.SpectralPowerPipeline2D
    :show-inheritance:
 
@@ -97,11 +110,35 @@ Spectral
 Frame Samplers
 --------------
 
+.. autoclass:: raysect.optical.observer.sampler1d.FullFrameSampler1D
+   :show-inheritance:
+
+.. autoclass:: raysect.optical.observer.sampler1d.MonoAdaptiveSampler1D
+   :show-inheritance:
+
+.. autoclass:: raysect.optical.observer.sampler1d.SpectralAdaptiveSampler1D
+   :show-inheritance:
+
 .. autoclass:: raysect.optical.observer.sampler2d.FullFrameSampler2D
    :show-inheritance:
 
+.. autoclass:: raysect.optical.observer.sampler2d.MaskedFrameSampler2D
+   :show-inheritance:
+
 .. autoclass:: raysect.optical.observer.sampler2d.MonoAdaptiveSampler2D
    :show-inheritance:
 
+.. autoclass:: raysect.optical.observer.sampler2d.MaskedMonoAdaptiveSampler2D
+   :show-inheritance:
+
+.. autoclass:: raysect.optical.observer.sampler2d.SpectralAdaptiveSampler2D
+   :show-inheritance:
+
+.. autoclass:: raysect.optical.observer.sampler2d.MaskedSpectralAdaptiveSampler2D
+   :show-inheritance:
+
 .. autoclass:: raysect.optical.observer.sampler2d.RGBAdaptiveSampler2D
    :show-inheritance:
+
+.. autoclass:: raysect.optical.observer.sampler2d.MaskedRGBAdaptiveSampler2D
+   :show-inheritance:

raysect/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

raysect/core/math/function/function1d/base.pxd

@@ -29,6 +29,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+
 cdef class Function1D:
     cdef double evaluate(self, double x) except? -1e999
 
@@ -57,6 +58,34 @@ cdef class ModuloFunction1D(Function1D):
     cdef Function1D _function1, _function2
 
 
+cdef class AbsFunction1D(Function1D):
+    cdef Function1D _function
+
+
+cdef class EqualsFunction1D(Function1D):
+    cdef Function1D _function1, _function2
+
+
+cdef class NotEqualsFunction1D(Function1D):
+    cdef Function1D _function1, _function2
+
+
+cdef class LessThanFunction1D(Function1D):
+    cdef Function1D _function1, _function2
+
+
+cdef class GreaterThanFunction1D(Function1D):
+    cdef Function1D _function1, _function2
+
+
+cdef class LessEqualsFunction1D(Function1D):
+    cdef Function1D _function1, _function2
+
+
+cdef class GreaterEqualsFunction1D(Function1D):
+    cdef Function1D _function1, _function2
+
+
 cdef class AddScalar1D(Function1D):
     cdef double _value
     cdef Function1D _function
@@ -95,3 +124,43 @@ cdef class PowScalarFunction1D(Function1D):
 cdef class PowFunctionScalar1D(Function1D):
     cdef double _value
     cdef Function1D _function
+
+
+cdef class EqualsScalar1D(Function1D):
+    cdef double _value
+    cdef Function1D _function
+
+
+cdef class NotEqualsScalar1D(Function1D):
+    cdef double _value
+    cdef Function1D _function
+
+
+cdef class LessThanScalar1D(Function1D):
+    cdef double _value
+    cdef Function1D _function
+
+
+cdef class GreaterThanScalar1D(Function1D):
+    cdef double _value
+    cdef Function1D _function
+
+
+cdef class LessEqualsScalar1D(Function1D):
+    cdef double _value
+    cdef Function1D _function
+
+
+cdef class GreaterEqualsScalar1D(Function1D):
+    cdef double _value
+    cdef Function1D _function
+
+
+cdef inline bint is_callable(object f):
+    """
+    Tests if an object is a python callable or function object.
+
+    :param object f: Object to test.
+    :return: True if callable, False otherwise.
+    """
+    return isinstance(f, Function1D) or callable(f)