diff --git a/cunumeric/__init__.py b/cunumeric/__init__.py index 228bf0a6b8..558507542e 100644 --- a/cunumeric/__init__.py +++ b/cunumeric/__init__.py @@ -28,11 +28,7 @@ from cunumeric import linalg, random from cunumeric.array import ndarray from cunumeric.module import * -from cunumeric.ufunc.bit_twiddling import * -from cunumeric.ufunc.comparison import * -from cunumeric.ufunc.math import * -from cunumeric.ufunc.floating import * -from cunumeric.ufunc.trigonometric import * +from cunumeric._ufunc import * from cunumeric.coverage import clone_module clone_module(_np, globals()) diff --git a/cunumeric/ufunc/__init__.py b/cunumeric/_ufunc/__init__.py similarity index 79% rename from cunumeric/ufunc/__init__.py rename to cunumeric/_ufunc/__init__.py index d148fe1cc1..62861c87d3 100644 --- a/cunumeric/ufunc/__init__.py +++ b/cunumeric/_ufunc/__init__.py @@ -12,3 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +from .bit_twiddling import * +from .comparison import * +from .math import * +from .floating import * +from .trigonometric import * +from .ufunc import ufunc diff --git a/cunumeric/ufunc/bit_twiddling.py b/cunumeric/_ufunc/bit_twiddling.py similarity index 100% rename from cunumeric/ufunc/bit_twiddling.py rename to cunumeric/_ufunc/bit_twiddling.py diff --git a/cunumeric/ufunc/comparison.py b/cunumeric/_ufunc/comparison.py similarity index 100% rename from cunumeric/ufunc/comparison.py rename to cunumeric/_ufunc/comparison.py diff --git a/cunumeric/ufunc/floating.py b/cunumeric/_ufunc/floating.py similarity index 100% rename from cunumeric/ufunc/floating.py rename to cunumeric/_ufunc/floating.py diff --git a/cunumeric/ufunc/math.py b/cunumeric/_ufunc/math.py similarity index 100% rename from cunumeric/ufunc/math.py rename to cunumeric/_ufunc/math.py diff --git a/cunumeric/ufunc/trigonometric.py b/cunumeric/_ufunc/trigonometric.py similarity index 100% rename from cunumeric/ufunc/trigonometric.py rename to cunumeric/_ufunc/trigonometric.py diff --git a/cunumeric/ufunc/ufunc.py b/cunumeric/_ufunc/ufunc.py similarity index 100% rename from cunumeric/ufunc/ufunc.py rename to cunumeric/_ufunc/ufunc.py diff --git a/cunumeric/linalg/linalg.py b/cunumeric/linalg/linalg.py index 3c251f29bf..41bbef0f6a 100644 --- a/cunumeric/linalg/linalg.py +++ b/cunumeric/linalg/linalg.py @@ -14,9 +14,9 @@ # import numpy as np +from cunumeric._ufunc.math import sqrt as _sqrt from cunumeric.array import convert_to_cunumeric_ndarray from cunumeric.module import ndarray -from cunumeric.ufunc.math import sqrt as _sqrt def cholesky(a): diff --git a/cunumeric/module.py b/cunumeric/module.py index c2388d0624..325de24ab4 100644 --- a/cunumeric/module.py +++ b/cunumeric/module.py @@ -23,9 +23,9 @@ import numpy as np import opt_einsum as oe -from cunumeric.ufunc.comparison import maximum, minimum -from cunumeric.ufunc.floating import floor -from cunumeric.ufunc.math import add, multiply +from cunumeric._ufunc.comparison import maximum, minimum +from cunumeric._ufunc.floating import floor +from cunumeric._ufunc.math import add, multiply from .array import ( convert_to_cunumeric_ndarray, diff --git a/setup.py b/setup.py index 5d85486a6e..b41776823f 100755 --- a/setup.py +++ b/setup.py @@ -79,7 +79,7 @@ def run(self): "cunumeric", "cunumeric.linalg", "cunumeric.random", - "cunumeric.ufunc", + "cunumeric._ufunc", ], cmdclass={"build_py": my_build_py}, )