diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 0172b3f..fd371de 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v3 with: - python-version: '3.10' + python-version: '3.11' - name: Add conda to system path run: | # $CONDA is an environment variable pointing to the root of the miniconda directory diff --git a/luisa_lang/_math_type_exports.py b/luisa_lang/_math_type_exports.py deleted file mode 100644 index 6f3e8e8..0000000 --- a/luisa_lang/_math_type_exports.py +++ /dev/null @@ -1 +0,0 @@ -from luisa_lang.math_types import (FLOAT_TYPES, FloatType, FloatBuiltin, abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, exp, floor, log, log10, log2sin, sinh, sqrt, tan, tanh, trunc, atan2, copysign, f32, f64, i8, u8, i16, u16, i32, u32, i64, u64, bool2, float2, double2, byte2, ubyte2, short2, ushort2, int2, uint2, long2, ulong2, bool3, float3, double3, byte3, ubyte3, short3, ushort3, int3, uint3, long3, ulong3, bool4, float4, double4, byte4, ubyte4, short4, ushort4, int4, uint4, long4, ulong4) diff --git a/luisa_lang/lang.py b/luisa_lang/lang.py index 3002e1f..256e182 100644 --- a/luisa_lang/lang.py +++ b/luisa_lang/lang.py @@ -14,7 +14,7 @@ overload, Any, ) -from luisa_lang._math_type_exports import * +from luisa_lang.math_types import * from luisa_lang._markers import _builtin_type, _builtin, _intrinsic_impl import luisa_lang.hir as hir import luisa_lang.parse as parse diff --git a/luisa_lang/math_types.py b/luisa_lang/math_types.py index 899bfeb..5751db5 100644 --- a/luisa_lang/math_types.py +++ b/luisa_lang/math_types.py @@ -1296,3 +1296,4 @@ def __floordiv__(self, _other: tp.Union['ulong4', u64, int]) -> 'ulong4': retur def __rfloordiv__(self, _other: tp.Union['ulong4', u64, int]) -> 'ulong4': return _intrinsic_impl() _ctx.types[ulong4] = _hir.VectorType(tp.cast(_hir.ScalarType, _ctx.types[u64]), 4) +__all__ = ['FLOAT_TYPES', 'FloatType', 'FloatBuiltin', 'abs', 'acos', 'acosh', 'asin', 'asinh', 'atan', 'atanh', 'ceil', 'cos', 'cosh', 'exp', 'floor', 'log', 'log10', 'log2sin', 'sinh', 'sqrt', 'tan', 'tanh', 'trunc', 'atan2', 'copysign', 'f32', 'f64', 'i8', 'u8', 'i16', 'u16', 'i32', 'u32', 'i64', 'u64', 'bool2', 'float2', 'double2', 'byte2', 'ubyte2', 'short2', 'ushort2', 'int2', 'uint2', 'long2', 'ulong2', 'bool3', 'float3', 'double3', 'byte3', 'ubyte3', 'short3', 'ushort3', 'int3', 'uint3', 'long3', 'ulong3', 'bool4', 'float4', 'double4', 'byte4', 'ubyte4', 'short4', 'ushort4', 'int4', 'uint4', 'long4', 'ulong4']