Investigate n-dimensional array backend change.

colour-science · Aug 24, 2020 · 69f8d3b · 69f8d3b
1 parent 14b7916
commit 69f8d3b
Show file tree

Hide file tree

Showing 389 changed files with 645 additions and 429 deletions.
diff --git a/colour/__init__.py b/colour/__init__.py
@@ -46,7 +46,7 @@
 
 from __future__ import absolute_import
 
-import numpy as np
+import colour.ndarray as np
 import sys
 
 from .utilities.deprecation import ModuleAPI, build_API_changes

diff --git a/colour/adaptation/__init__.py b/colour/adaptation/__init__.py
@@ -171,7 +171,7 @@ def chromatic_adaptation(XYZ, XYZ_w, XYZ_wr, method='Von Kries', **kwargs):
 
     *Von Kries* chromatic adaptation:
 
-    >>> import numpy as np
+    >>> import colour.ndarray as np
     >>> XYZ = np.array([0.20654008, 0.12197225, 0.05136952])
     >>> XYZ_w = np.array([0.95045593, 1.00000000, 1.08905775])
     >>> XYZ_wr = np.array([0.96429568, 1.00000000, 0.82510460])

diff --git a/colour/adaptation/cie1994.py b/colour/adaptation/cie1994.py
@@ -17,7 +17,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 from colour.algebra import spow
 from colour.adaptation import CAT_VON_KRIES

diff --git a/colour/adaptation/cmccat2000.py b/colour/adaptation/cmccat2000.py
@@ -23,7 +23,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.adaptation import CAT_CMCCAT2000

diff --git a/colour/adaptation/datasets/cat.py b/colour/adaptation/datasets/cat.py
@@ -68,7 +68,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 from colour.utilities import CaseInsensitiveMapping
 

diff --git a/colour/adaptation/fairchild1990.py b/colour/adaptation/fairchild1990.py
@@ -18,7 +18,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 from colour.algebra import spow
 from colour.adaptation import CAT_VON_KRIES

diff --git a/colour/adaptation/tests/test__init__.py b/colour/adaptation/tests/test__init__.py
@@ -6,7 +6,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from six.moves import zip
 

diff --git a/colour/adaptation/tests/test_cie1994.py b/colour/adaptation/tests/test_cie1994.py
@@ -6,7 +6,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from itertools import permutations
 

diff --git a/colour/adaptation/tests/test_cmccat2000.py b/colour/adaptation/tests/test_cmccat2000.py
@@ -6,7 +6,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from itertools import permutations
 

diff --git a/colour/adaptation/tests/test_fairchild1990.py b/colour/adaptation/tests/test_fairchild1990.py
@@ -6,7 +6,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from itertools import permutations
 

diff --git a/colour/adaptation/tests/test_vonkries.py b/colour/adaptation/tests/test_vonkries.py
@@ -6,7 +6,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from itertools import permutations
 from functools import partial

diff --git a/colour/adaptation/vonkries.py b/colour/adaptation/vonkries.py
@@ -17,7 +17,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 from colour.adaptation import CHROMATIC_ADAPTATION_TRANSFORMS
 from colour.utilities import (dot_matrix, dot_vector, from_range_1,

diff --git a/colour/algebra/common.py b/colour/algebra/common.py
@@ -14,7 +14,7 @@
 from __future__ import division, unicode_literals
 
 import functools
-import numpy as np
+import colour.ndarray as np
 
 from colour.utilities import as_float_array, as_float
 

diff --git a/colour/algebra/coordinates/tests/test_transformations.py b/colour/algebra/coordinates/tests/test_transformations.py
@@ -6,7 +6,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from itertools import permutations
 

diff --git a/colour/algebra/coordinates/transformations.py b/colour/algebra/coordinates/transformations.py
@@ -31,7 +31,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 from colour.utilities import as_float_array, tsplit, tstack
 

diff --git a/colour/algebra/extrapolation.py b/colour/algebra/extrapolation.py
@@ -19,7 +19,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 from colour.constants import DEFAULT_FLOAT_DTYPE
 from colour.utilities import as_float, is_numeric, is_string

diff --git a/colour/algebra/geometry.py b/colour/algebra/geometry.py
@@ -37,7 +37,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.utilities import (CaseInsensitiveMapping, as_float_array, ones,

diff --git a/colour/algebra/interpolation.py b/colour/algebra/interpolation.py
@@ -61,7 +61,7 @@
 from __future__ import division, unicode_literals
 
 import itertools
-import numpy as np
+import colour.ndarray as np
 import scipy.interpolate
 from six.moves import reduce
 from collections import OrderedDict
@@ -1078,7 +1078,11 @@ def x(self, value):
             xp3 = value[-1] + value_interval
             xp4 = value[-1] + value_interval * 2
 
-            self._xp = np.concatenate(((xp1, xp2), value, (xp3, xp4)))
+            self._xp = np.concatenate([
+                np.array([xp1, xp2]),
+                value,
+                np.array([xp3, xp4]),
+            ])
 
         self._x = value
 
@@ -1131,7 +1135,11 @@ def y(self, value):
                 (np.dot(self.SPRAGUE_C_COEFFICIENTS[3],
                         np.array(value[-6:]).reshape([6, 1]))) / 209)[0]
 
-            self._yp = np.concatenate(((yp1, yp2), value, (yp3, yp4)))
+            self._yp = np.concatenate([
+                np.array([yp1, yp2]),
+                value,
+                np.array([yp3, yp4]),
+            ])
 
         self._y = value
 

diff --git a/colour/algebra/matrix.py b/colour/algebra/matrix.py
@@ -8,7 +8,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 __author__ = 'Colour Developers'
 __copyright__ = 'Copyright (C) 2013-2020 - Colour Developers'

diff --git a/colour/algebra/random.py b/colour/algebra/random.py
@@ -17,7 +17,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 from colour.constants import DEFAULT_INT_DTYPE
 from colour.utilities import runtime_warning, tstack

diff --git a/colour/algebra/regression.py b/colour/algebra/regression.py
@@ -18,7 +18,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 
 __author__ = 'Colour Developers'
 __copyright__ = 'Copyright (C) 2013-2020 - Colour Developers'

diff --git a/colour/algebra/tests/test_common.py b/colour/algebra/tests/test_common.py
@@ -5,7 +5,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 
 from colour.algebra import (is_spow_enabled, set_spow_enable, spow_enable,

diff --git a/colour/algebra/tests/test_extrapolation.py b/colour/algebra/tests/test_extrapolation.py
@@ -5,7 +5,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from itertools import permutations
 

diff --git a/colour/algebra/tests/test_geometry.py b/colour/algebra/tests/test_geometry.py
@@ -5,7 +5,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 from itertools import permutations
 

diff --git a/colour/algebra/tests/test_interpolation.py b/colour/algebra/tests/test_interpolation.py
@@ -11,7 +11,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import os
 import unittest
 from itertools import permutations

diff --git a/colour/algebra/tests/test_matrix.py b/colour/algebra/tests/test_matrix.py
@@ -5,7 +5,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 
 from colour.algebra import is_identity

diff --git a/colour/algebra/tests/test_random.py b/colour/algebra/tests/test_random.py
@@ -12,7 +12,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 
 from colour.algebra import random_triplet_generator

diff --git a/colour/algebra/tests/test_regression.py b/colour/algebra/tests/test_regression.py
@@ -5,7 +5,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 import unittest
 
 from colour.algebra import least_square_mapping_MoorePenrose

diff --git a/colour/appearance/atd95.py b/colour/appearance/atd95.py
@@ -27,7 +27,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.algebra import spow

diff --git a/colour/appearance/cam16.py b/colour/appearance/cam16.py
@@ -21,7 +21,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.algebra import spow

diff --git a/colour/appearance/ciecam02.py b/colour/appearance/ciecam02.py
@@ -28,7 +28,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.algebra import spow

diff --git a/colour/appearance/hunt.py b/colour/appearance/hunt.py
@@ -20,7 +20,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.algebra import spow

diff --git a/colour/appearance/llab.py b/colour/appearance/llab.py
@@ -28,7 +28,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.algebra import polar_to_cartesian, spow

diff --git a/colour/appearance/nayatani95.py b/colour/appearance/nayatani95.py
@@ -21,7 +21,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.algebra import spow

diff --git a/colour/appearance/rlab.py b/colour/appearance/rlab.py
@@ -21,7 +21,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from collections import namedtuple
 
 from colour.algebra import spow

diff --git a/colour/appearance/tests/common.py b/colour/appearance/tests/common.py
@@ -7,7 +7,7 @@
 from __future__ import division, unicode_literals
 
 import csv
-import numpy as np
+import colour.ndarray as np
 import os
 from abc import ABCMeta, abstractmethod
 from collections import defaultdict

diff --git a/colour/appearance/tests/test_atd95.py b/colour/appearance/tests/test_atd95.py
@@ -6,11 +6,10 @@
 
 from __future__ import division, unicode_literals
 
+import colour.ndarray as np
 from itertools import permutations
 from unittest import TestCase
 
-import numpy as np
-
 from colour.appearance import XYZ_to_ATD95
 from colour.appearance.tests.common import ColourAppearanceModelTest
 from colour.utilities import domain_range_scale, ignore_numpy_errors, tstack

diff --git a/colour/appearance/tests/test_cam16.py b/colour/appearance/tests/test_cam16.py
@@ -6,11 +6,10 @@
 
 from __future__ import division, unicode_literals
 
+import colour.ndarray as np
 from itertools import permutations
 from unittest import TestCase
 
-import numpy as np
-
 from colour.appearance import (VIEWING_CONDITIONS_CAM16,
                                InductionFactors_CAM16, CAM_Specification_CAM16,
                                XYZ_to_CAM16, CAM16_to_XYZ)

diff --git a/colour/appearance/tests/test_ciecam02.py b/colour/appearance/tests/test_ciecam02.py
@@ -6,10 +6,10 @@
 
 from __future__ import division, unicode_literals
 
+import colour.ndarray as np
 from itertools import permutations
 from unittest import TestCase
 
-import numpy as np
 
 from colour.appearance import (
     VIEWING_CONDITIONS_CIECAM02, InductionFactors_CIECAM02,

diff --git a/colour/appearance/tests/test_hunt.py b/colour/appearance/tests/test_hunt.py
@@ -6,7 +6,7 @@
 
 from __future__ import division, unicode_literals
 
-import numpy as np
+import colour.ndarray as np
 from itertools import permutations
 from unittest import TestCase