add tensor creation and fix ruff

Author: mcDandy

more_math/ConditioningMathNode.py

@@ -1,4 +1,3 @@
-from unittest import result
 import torch
 from .helper_functions import generate_dim_variables, parse_expr, getIndexTensorAlongDim, as_tensor, normalize_to_common_shape, make_zero_like, get_v_variable, get_f_variable
 from .Parser.UnifiedMathVisitor import UnifiedMathVisitor
@@ -105,7 +104,6 @@ def execute(cls, V, F, Expression, Expression_pi,batching, length_mismatch="tile
         V_norm_tensors = dict(zip(tensor_keys, norm_tensors_batch))
 
         ref_tensor = norm_tensors_batch[0]
-        common_shape = ref_tensor.shape
 
         # Normalize pooled outputs (if they exist)
         valid_pooled_keys = [k for k, v in pooled_outputs.items() if v is not None]

more_math/GuiderMathNode.py

@@ -1,4 +1,3 @@
-from numpy import stack
 import torch
 import re
 from antlr4 import InputStream, CommonTokenStream

more_math/Parser/MathExpr.g4

@@ -1,7 +1,7 @@
 grammar MathExpr;
 
 // Top-level entry point
-start: (funcDef | varDef | stmt)* expr? SEMICOLON? EOF;
+start: (funcDef | varDef | stmt)* expr SEMICOLON? EOF;
 
 funcDef:
 	VARIABLE LPAREN paramList? RPAREN ARROW (block | expr) SEMICOLON # FunctionDef;
@@ -170,7 +170,8 @@ func2:
 	| BOTK_IND LPAREN expr COMMA expr RPAREN				# BotkIndFunc
 	| BOTK_IND LPAREN expr COMMA expr RPAREN				# BotkIndFunc
 	| PUSH LPAREN expr COMMA expr RPAREN					# PushFunc
-	| GET_VALUE LPAREN expr COMMA expr RPAREN				# GetValueFunc;
+	| GET_VALUE LPAREN expr COMMA expr RPAREN				# GetValueFunc
+	| TENSOR LPAREN indexExpr (COMMA expr)? RPAREN			# EmptyTensorFunc;
 
 func3:
 	CLAMP LPAREN expr COMMA expr COMMA expr RPAREN			# ClampFunc
@@ -322,6 +323,8 @@ NONE: 'None' | 'none' | 'NULL' | 'null';
 BREAK: 'break';
 CONTINUE: 'continue';
 
+TENSOR: 'tensor';
+
 PLUS: '+';
 MINUS: '-';
 MULT: '*';

more_math/Parser/MathExpr.interp

@@ -108,37 +108,38 @@ TIMESTAMP=107
 NONE=108
 BREAK=109
 CONTINUE=110
-PLUS=111
-MINUS=112
-MULT=113
-DIV=114
-MOD=115
-POW=116
-GE=117
-GT=118
-LE=119
-LT=120
-EQ=121
-EQUEALS=122
-NE=123
-PIPE=124
-LPAREN=125
-RPAREN=126
-COMMA=127
-SEMICOLON=128
-ARROW=129
-LBRACKET=130
-RBRACKET=131
-QUESTION=132
-COLON=133
-LBRACE=134
-RBRACE=135
-NUMBER=136
-CONSTANT=137
-VARIABLE=138
-SL_COMMENT=139
-ML_COMMENT=140
-WS=141
+TENSOR=111
+PLUS=112
+MINUS=113
+MULT=114
+DIV=115
+MOD=116
+POW=117
+GE=118
+GT=119
+LE=120
+LT=121
+EQ=122
+EQUEALS=123
+NE=124
+PIPE=125
+LPAREN=126
+RPAREN=127
+COMMA=128
+SEMICOLON=129
+ARROW=130
+LBRACKET=131
+RBRACKET=132
+QUESTION=133
+COLON=134
+LBRACE=135
+RBRACE=136
+NUMBER=137
+CONSTANT=138
+VARIABLE=139
+SL_COMMENT=140
+ML_COMMENT=141
+WS=142
 'sin'=1
 'cos'=2
 'tan'=3
@@ -224,28 +225,29 @@ WS=141
 'in'=106
 'break'=109
 'continue'=110
-'+'=111
-'-'=112
-'*'=113
-'/'=114
-'%'=115
-'^'=116
-'>='=117
-'>'=118
-'<='=119
-'<'=120
-'=='=121
-'='=122
-'!='=123
-'|'=124
-'('=125
-')'=126
-','=127
-';'=128
-'->'=129
-'['=130
-']'=131
-'?'=132
-':'=133
-'{'=134
-'}'=135
+'tensor'=111
+'+'=112
+'-'=113
+'*'=114
+'/'=115
+'%'=116
+'^'=117
+'>='=118
+'>'=119
+'<='=120
+'<'=121
+'=='=122
+'='=123
+'!='=124
+'|'=125
+'('=126
+')'=127
+','=128
+';'=129
+'->'=130
+'['=131
+']'=132
+'?'=133
+':'=134
+'{'=135
+'}'=136

more_math/Parser/MathExpr.tokens

@@ -108,37 +108,38 @@ TIMESTAMP=107
 NONE=108
 BREAK=109
 CONTINUE=110
-PLUS=111
-MINUS=112
-MULT=113
-DIV=114
-MOD=115
-POW=116
-GE=117
-GT=118
-LE=119
-LT=120
-EQ=121
-EQUEALS=122
-NE=123
-PIPE=124
-LPAREN=125
-RPAREN=126
-COMMA=127
-SEMICOLON=128
-ARROW=129
-LBRACKET=130
-RBRACKET=131
-QUESTION=132
-COLON=133
-LBRACE=134
-RBRACE=135
-NUMBER=136
-CONSTANT=137
-VARIABLE=138
-SL_COMMENT=139
-ML_COMMENT=140
-WS=141
+TENSOR=111
+PLUS=112
+MINUS=113
+MULT=114
+DIV=115
+MOD=116
+POW=117
+GE=118
+GT=119
+LE=120
+LT=121
+EQ=122
+EQUEALS=123
+NE=124
+PIPE=125
+LPAREN=126
+RPAREN=127
+COMMA=128
+SEMICOLON=129
+ARROW=130
+LBRACKET=131
+RBRACKET=132
+QUESTION=133
+COLON=134
+LBRACE=135
+RBRACE=136
+NUMBER=137
+CONSTANT=138
+VARIABLE=139
+SL_COMMENT=140
+ML_COMMENT=141
+WS=142
 'sin'=1
 'cos'=2
 'tan'=3
@@ -224,28 +225,29 @@ WS=141
 'in'=106
 'break'=109
 'continue'=110
-'+'=111
-'-'=112
-'*'=113
-'/'=114
-'%'=115
-'^'=116
-'>='=117
-'>'=118
-'<='=119
-'<'=120
-'=='=121
-'='=122
-'!='=123
-'|'=124
-'('=125
-')'=126
-','=127
-';'=128
-'->'=129
-'['=130
-']'=131
-'?'=132
-':'=133
-'{'=134
-'}'=135
+'tensor'=111
+'+'=112
+'-'=113
+'*'=114
+'/'=115
+'%'=116
+'^'=117
+'>='=118
+'>'=119
+'<='=120
+'<'=121
+'=='=122
+'='=123
+'!='=124
+'|'=125
+'('=126
+')'=127
+','=128
+';'=129
+'->'=130
+'['=131
+']'=132
+'?'=133
+':'=134
+'{'=135
+'}'=136

more_math/Parser/MathExprLexer.interp

@@ -1259,6 +1259,15 @@ def exitGetValueFunc(self, ctx:MathExprParser.GetValueFuncContext):
         pass
 
 
+    # Enter a parse tree produced by MathExprParser#EmptyTensorFunc.
+    def enterEmptyTensorFunc(self, ctx:MathExprParser.EmptyTensorFuncContext):
+        pass
+
+    # Exit a parse tree produced by MathExprParser#EmptyTensorFunc.
+    def exitEmptyTensorFunc(self, ctx:MathExprParser.EmptyTensorFuncContext):
+        pass
+
+
     # Enter a parse tree produced by MathExprParser#ClampFunc.
     def enterClampFunc(self, ctx:MathExprParser.ClampFuncContext):
         pass