[mojo] Fix/rename alias and add self prefix to params

numojo/__init__.mojo

@@ -3,7 +3,7 @@ NuMojo is a library for numerical computing in Mojo 🔥
 similar to NumPy, SciPy in Python.
 """
 
-alias __version__: String = "V0.8.0"
+comptime __version__: String = "V0.8.0"
 
 # ===----------------------------------------------------------------------=== #
 # Import core types
@@ -76,9 +76,9 @@ from numojo.core.error import (
 # Objects
 from numojo.routines.constants import Constants
 
-alias pi = numojo.routines.constants.Constants.pi
-alias e = numojo.routines.constants.Constants.e
-alias c = numojo.routines.constants.Constants.c
+comptime pi = numojo.routines.constants.Constants.pi
+comptime e = numojo.routines.constants.Constants.e
+comptime c = numojo.routines.constants.Constants.c
 
 # Functions
 # TODO Make explicit imports of each individual function in future
@@ -235,5 +235,5 @@ from numojo.routines.searching import argmax, argmin
 # ===----------------------------------------------------------------------=== #
 # Alias for users
 # For ease of use, the name of the types may not follow the Mojo convention,
-# e.g., lower case can also be used for alias of structs.
+# e.g., lower case can also be used for comptime of structs.
 # ===----------------------------------------------------------------------=== #

numojo/core/__init__.mojo

@@ -65,6 +65,6 @@ from .error import (
     ArithmeticError,
 )
 
-alias idx = Item
-alias shape = NDArrayShape
-alias Shape = NDArrayShape
+comptime idx = Item
+comptime shape = NDArrayShape
+comptime Shape = NDArrayShape

numojo/core/complex/complex_dtype.mojo

@@ -15,52 +15,52 @@ from sys import CompilationTarget
 from sys.info import bit_width_of, size_of
 from sys.intrinsics import _type_is_eq
 
-alias _mIsSigned = UInt8(1)
-alias _mIsInteger = UInt8(1 << 7)
-alias _mIsNotInteger = UInt8(~(1 << 7))
-alias _mIsFloat = UInt8(1 << 6)
+comptime _mIsSigned = UInt8(1)
+comptime _mIsInteger = UInt8(1 << 7)
+comptime _mIsNotInteger = UInt8(~(1 << 7))
+comptime _mIsFloat = UInt8(1 << 6)
 
 # rust like aliases for complex data types.
-alias ci8 = ComplexDType.int8
-"""Data type alias for ComplexDType.int8"""
-alias ci16 = ComplexDType.int16
-"""Data type alias for ComplexDType.int16"""
-alias ci32 = ComplexDType.int32
-"""Data type alias for ComplexDType.int32"""
-alias ci64 = ComplexDType.int64
-"""Data type alias for ComplexDType.int64"""
-alias ci128 = ComplexDType.int128
-"""Data type alias for ComplexDType.int128"""
-alias ci256 = ComplexDType.int256
-"""Data type alias for ComplexDType.int256"""
-alias cint = ComplexDType.int
-"""Data type alias for ComplexDType.int"""
-alias cu8 = ComplexDType.uint8
-"""Data type alias for ComplexDType.uint8"""
-alias cu16 = ComplexDType.uint16
-"""Data type alias for ComplexDType.uint16"""
-alias cu32 = ComplexDType.uint32
-"""Data type alias for ComplexDType.uint32"""
-alias cu64 = ComplexDType.uint64
-"""Data type alias for ComplexDType.uint64"""
-alias cu128 = ComplexDType.uint128
-"""Data type alias for ComplexDType.uint128"""
-alias cu256 = ComplexDType.uint256
-"""Data type alias for ComplexDType.uint256"""
-alias cuint = ComplexDType.uint
-"""Data type alias for ComplexDType.uint"""
-alias cbf16 = ComplexDType.bfloat16
-"""Data type alias for ComplexDType.bfloat16"""
-alias cf16 = ComplexDType.float16
-"""Data type alias for ComplexDType.float16"""
-alias cf32 = ComplexDType.float32
-"""Data type alias for ComplexDType.float32"""
-alias cf64 = ComplexDType.float64
-"""Data type alias for ComplexDType.float64"""
-alias cboolean = ComplexDType.bool
-"""Data type alias for ComplexDType.bool"""
-alias cinvalid = ComplexDType.invalid
-"""Data type alias for ComplexDType.invalid"""
+comptime ci8 = ComplexDType.int8
+"""Data type comptime for ComplexDType.int8"""
+comptime ci16 = ComplexDType.int16
+"""Data type comptime for ComplexDType.int16"""
+comptime ci32 = ComplexDType.int32
+"""Data type comptime for ComplexDType.int32"""
+comptime ci64 = ComplexDType.int64
+"""Data type comptime for ComplexDType.int64"""
+comptime ci128 = ComplexDType.int128
+"""Data type comptime for ComplexDType.int128"""
+comptime ci256 = ComplexDType.int256
+"""Data type comptime for ComplexDType.int256"""
+comptime cint = ComplexDType.int
+"""Data type comptime for ComplexDType.int"""
+comptime cu8 = ComplexDType.uint8
+"""Data type comptime for ComplexDType.uint8"""
+comptime cu16 = ComplexDType.uint16
+"""Data type comptime for ComplexDType.uint16"""
+comptime cu32 = ComplexDType.uint32
+"""Data type comptime for ComplexDType.uint32"""
+comptime cu64 = ComplexDType.uint64
+"""Data type comptime for ComplexDType.uint64"""
+comptime cu128 = ComplexDType.uint128
+"""Data type comptime for ComplexDType.uint128"""
+comptime cu256 = ComplexDType.uint256
+"""Data type comptime for ComplexDType.uint256"""
+comptime cuint = ComplexDType.uint
+"""Data type comptime for ComplexDType.uint"""
+comptime cbf16 = ComplexDType.bfloat16
+"""Data type comptime for ComplexDType.bfloat16"""
+comptime cf16 = ComplexDType.float16
+"""Data type comptime for ComplexDType.float16"""
+comptime cf32 = ComplexDType.float32
+"""Data type comptime for ComplexDType.float32"""
+comptime cf64 = ComplexDType.float64
+"""Data type comptime for ComplexDType.float64"""
+comptime cboolean = ComplexDType.bool
+"""Data type comptime for ComplexDType.bool"""
+comptime cinvalid = ComplexDType.invalid
+"""Data type comptime for ComplexDType.invalid"""
 
 # ===----------------------------------------------------------------------=== #
 # Implements the Complex Datatype.
@@ -102,89 +102,89 @@ struct ComplexDType(
     # Aliases
     # ===-------------------------------------------------------------------===#
     # Refer to DType documentation for details on each data type.
-    alias _mlir_type = __mlir_type.`!kgen.dtype`
-    alias invalid = ComplexDType(
+    comptime _mlir_type = __mlir_type.`!kgen.dtype`
+    comptime invalid = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<invalid> : !kgen.dtype`
     )
-    alias bool = ComplexDType(
+    comptime bool = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<bool> : !kgen.dtype`
     )
-    alias int = ComplexDType(
+    comptime int = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<index> : !kgen.dtype`
     )
-    alias uint = ComplexDType(
+    comptime uint = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<uindex> : !kgen.dtype`
     )
-    alias _uint1 = ComplexDType(
+    comptime _uint1 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui1> : !kgen.dtype`
     )
-    alias _uint2 = ComplexDType(
+    comptime _uint2 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui2> : !kgen.dtype`
     )
-    alias _uint4 = ComplexDType(
+    comptime _uint4 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui4> : !kgen.dtype`
     )
-    alias uint8 = ComplexDType(
+    comptime uint8 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui8> : !kgen.dtype`
     )
-    alias int8 = ComplexDType(
+    comptime int8 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<si8> : !kgen.dtype`
     )
-    alias uint16 = ComplexDType(
+    comptime uint16 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui16> : !kgen.dtype`
     )
-    alias int16 = ComplexDType(
+    comptime int16 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<si16> : !kgen.dtype`
     )
-    alias uint32 = ComplexDType(
+    comptime uint32 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui32> : !kgen.dtype`
     )
-    alias int32 = ComplexDType(
+    comptime int32 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<si32> : !kgen.dtype`
     )
-    alias uint64 = ComplexDType(
+    comptime uint64 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui64> : !kgen.dtype`
     )
-    alias int64 = ComplexDType(
+    comptime int64 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<si64> : !kgen.dtype`
     )
-    alias uint128 = ComplexDType(
+    comptime uint128 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui128> : !kgen.dtype`
     )
-    alias int128 = ComplexDType(
+    comptime int128 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<si128> : !kgen.dtype`
     )
-    alias uint256 = ComplexDType(
+    comptime uint256 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<ui256> : !kgen.dtype`
     )
-    alias int256 = ComplexDType(
+    comptime int256 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<si256> : !kgen.dtype`
     )
-    alias float8_e3m4 = ComplexDType(
+    comptime float8_e3m4 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f8e3m4> : !kgen.dtype`
     )
-    alias float8_e4m3fn = ComplexDType(
+    comptime float8_e4m3fn = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f8e4m3fn> : !kgen.dtype`
     )
-    alias float8_e4m3fnuz = ComplexDType(
+    comptime float8_e4m3fnuz = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f8e4m3fnuz> : !kgen.dtype`
     )
-    alias float8_e5m2 = ComplexDType(
+    comptime float8_e5m2 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f8e5m2> : !kgen.dtype`
     )
-    alias float8_e5m2fnuz = ComplexDType(
+    comptime float8_e5m2fnuz = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f8e5m2fnuz> : !kgen.dtype`
     )
-    alias bfloat16 = ComplexDType(
+    comptime bfloat16 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<bf16> : !kgen.dtype`
     )
-    alias float16 = ComplexDType(
+    comptime float16 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f16> : !kgen.dtype`
     )
-    alias float32 = ComplexDType(
+    comptime float32 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f32> : !kgen.dtype`
     )
-    alias float64 = ComplexDType(
+    comptime float64 = ComplexDType(
         mlir_value=__mlir_attr.`#kgen.dtype.constant<f64> : !kgen.dtype`
     )
 

numojo/core/complex/complex_ndarray.mojo

@@ -115,7 +115,7 @@ struct ComplexNDArray[cdtype: ComplexDType = ComplexDType.float64](
     # Aliases
     # ===----------------------------------------------------------------------===#
 
-    alias dtype: DType = cdtype._dtype  # corresponding real data type
+    comptime dtype: DType = cdtype._dtype  # corresponding real data type
 
     # ===----------------------------------------------------------------------===#
     # FIELDS
@@ -4066,7 +4066,7 @@ struct _ComplexNDArrayIter[
         forward: The iteration direction. `False` is backwards.
     """
     # The equivalent DType of the ComplexDType
-    alias dtype: DType = cdtype._dtype
+    comptime dtype: DType = cdtype._dtype
 
     # FIELDS
     var index: Int

numojo/core/complex/complex_simd.mojo

@@ -20,10 +20,10 @@ from math import sqrt
 
 from numojo.core.complex.complex_dtype import ComplexDType
 
-# ComplexScalar alias is for internal purposes
-alias ComplexScalar[cdtype: ComplexDType] = ComplexSIMD[cdtype, width=1]
-# CScalar is short alias for ComplexScalar for user convenience
-alias CScalar[cdtype: ComplexDType] = ComplexSIMD[cdtype, width=1]
+# ComplexScalar comptime is for internal purposes
+comptime ComplexScalar[cdtype: ComplexDType] = ComplexSIMD[cdtype, width=1]
+# CScalar is short comptime for ComplexScalar for user convenience
+comptime CScalar[cdtype: ComplexDType] = ComplexSIMD[cdtype, width=1]
 
 
 @register_passable("trivial")
@@ -55,7 +55,7 @@ struct ComplexSIMD[cdtype: ComplexDType, width: Int = 1](
     """
 
     # FIELDS
-    alias dtype: DType = cdtype._dtype  # the corresponding DType
+    comptime dtype: DType = cdtype._dtype  # the corresponding DType
     # The underlying data real and imaginary parts of the complex number.
     var re: SIMD[Self.dtype, width]
     var im: SIMD[Self.dtype, width]

numojo/core/data_container.mojo

@@ -3,14 +3,14 @@
 #
 # TODO: fields in traits are not supported yet by Mojo
 # Currently use `get_ptr()` to get pointer, in future, use `ptr` directly.
-# var ptr: LegacyUnsafePointer[Scalar[dtype]]
+# var ptr: LegacyUnsafePointer[Scalar[Self.dtype]]
 # ===----------------------------------------------------------------------===
 
 from memory import LegacyUnsafePointer
 
 
 struct DataContainer[dtype: DType]():
-    var ptr: LegacyUnsafePointer[Scalar[dtype]]
+    var ptr: LegacyUnsafePointer[Scalar[Self.dtype]]
 
     fn __init__(out self, size: Int):
         """
@@ -21,9 +21,9 @@ struct DataContainer[dtype: DType]():
         `ndarray.flags['OWN_DATA']` should be set as True.
         The memory should be freed by `__del__`.
         """
-        self.ptr = LegacyUnsafePointer[Scalar[dtype]]().alloc(size)
+        self.ptr = LegacyUnsafePointer[Scalar[Self.dtype]]().alloc(size)
 
-    fn __init__(out self, ptr: LegacyUnsafePointer[Scalar[dtype]]):
+    fn __init__(out self, ptr: LegacyUnsafePointer[Scalar[Self.dtype]]):
         """
         Do not use this if you know what it means.
         If the pointer is associated with another array, it might cause
@@ -38,5 +38,5 @@ struct DataContainer[dtype: DType]():
     fn __moveinit__(out self, deinit other: Self):
         self.ptr = other.ptr
 
-    fn get_ptr(self) -> LegacyUnsafePointer[Scalar[dtype]]:
+    fn get_ptr(self) -> LegacyUnsafePointer[Scalar[Self.dtype]]:
         return self.ptr