test

BigNoobWasTaken · BigNoobWasTaken · commit 25a307d9deaa · 2024-01-05T15:48:06.000+07:00
diff --git a/CPythonTensor/CPythonTensor.vcxproj b/CPythonTensor/CPythonTensor.vcxproj
@@ -73,11 +73,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.pyd</TargetExt>
-    <TargetName>tensor_d</TargetName>
+    <TargetName>tensor_bind</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetExt>.pyd</TargetExt>
-    <TargetName>tensor</TargetName>
+    <TargetName>tensor_bind</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/CPythonTensor/tensor_bind.cc b/CPythonTensor/tensor_bind.cc
@@ -30,7 +30,7 @@ std::string tensor_to_string(const Tensor t)
 	return osstream.str();
 }
 
-PYBIND11_MODULE(tensor, m)
+PYBIND11_MODULE(tensor_bind, m)
 {
 	pybind11::class_<Tensor>(m, "TensorC")
 		.def(pybind11::init())
diff --git a/PythonTensorTesting/PyTensorArray/__init__.py b/PythonTensorTesting/PyTensorArray/__init__.py
@@ -1,26 +1 @@
-import numpy as np
-import tensor as t
-
-class Tensor:
-    def __init__(self, arr):
-        self.temp_tensor = t.TensorC(arr)
-        
-    def __add__(self, other):
-        result = Tensor(0);
-        result.temp_tensor = self.temp_tensor + other.temp_tensor
-        return result;
-
-    def __sub__(self, other):
-        result = Tensor(0);
-        result.temp_tensor = self.temp_tensor - other.temp_tensor
-        return result;
-
-    def __matmul__(self, other):
-        result = Tensor(0);
-        result.temp_tensor = self.temp_tensor @ other.temp_tensor
-        return result;
-
-    def __str__(self) -> str:
-        return self.temp_tensor.__str__()
-
-
+from .tensor import *
diff --git a/PythonTensorTesting/PyTensorArray/tensor.py b/PythonTensorTesting/PyTensorArray/tensor.py
@@ -0,0 +1,11 @@
+import numpy as np
+import tensor_bind as t
+
+def tensor_decorator(cls):
+    return t.TensorC
+
+@tensor_decorator
+class Tensor: 
+    def __init__(self):
+        pass
+        
diff --git a/PythonTensorTesting/main.py b/PythonTensorTesting/main.py
@@ -1,15 +1,14 @@
-# import os
-
-# os.add_dll_directory(os.path.join(os.environ['CUDA_PATH'], 'bin'))
-
 import PyTensorArray as py_t_arr
 
 import numpy as np
 
 if __name__ == '__main__':
-    t3 = np.array([[1, 2, 3], [4, 5, 6]])
-    t1 = py_t_arr.Tensor([[1, 2.5, 3], [4, 5, 6]])
-    t2 = py_t_arr.Tensor([[1, 2.5], [4, 5], [7.5, 8]])
-    t3 = t1 @ t2
+    t4 = np.array([[1, 2, 3], [4, 5, 6]])
+    t1 = py_t_arr.tensor.Tensor(t4)
+    t2 = py_t_arr.tensor.Tensor(t4)
+    t3 = t1 + t2
     print("Hello")
+    print(t1)
+    print(t2)
     print(t3)
+    print(t1 == t2)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ std::string tensor_to_string(const Tensor t)`
`30`	`30`	`return osstream.str();`
`31`	`31`	`}`
`32`	`32`
`33`		`-PYBIND11_MODULE(tensor, m)`
	`33`	`+PYBIND11_MODULE(tensor_bind, m)`
`34`	`34`	`{`
`35`	`35`	`pybind11::class_<Tensor>(m, "TensorC")`
`36`	`36`	`.def(pybind11::init())`