Skip to content

Commit 947680f

Browse files
SanftMonsterSanftMonster
committed
feat(/): refactor the name of the native library.
1 parent f26c1d2 commit 947680f

File tree

9 files changed

+68
-68
lines changed

9 files changed

+68
-68
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
88
# set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
99
# set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
1010

11-
project(NumNet VERSION 1.0.0)
11+
project(TensorNet VERSION 0.1.0)
1212

1313
option(NN_WITH_TEST "Enable test for Num.NET." OFF)
1414
option(NN_CROSS_COMPILE "Cross compile to build. So far only compile from Linux targeting Windows is supported" OFF)

‎apis/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ file(GLOB_RECURSE SOURCES ./*.cpp)
33
message(${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
44

55
if(NOT WIN32 AND NN_CROSS_COMPILE)
6-
add_library(numnet.dll SHARED ${SOURCES})
7-
target_link_libraries(numnet.dll PRIVATE numnet_core_op.lib numnet_core_base.lib)
8-
set_target_properties(numnet.dll PROPERTIES
6+
add_library(tensornet.dll SHARED ${SOURCES})
7+
target_link_libraries(tensornet.dll PRIVATE tensornet_core_op.lib tensornet_core_base.lib)
8+
set_target_properties(tensornet.dll PROPERTIES
99
SUFFIX ""
1010
LINK_FLAGS "-Wl,--add-stdcall-alias"
1111
)
12-
target_include_directories(numnet.dll PRIVATE ${PROJECT_SOURCE_DIR})
12+
target_include_directories(tensornet.dll PRIVATE ${PROJECT_SOURCE_DIR})
1313
else()
14-
add_library(numnet SHARED ${SOURCES})
15-
set_target_properties(numnet PROPERTIES
14+
add_library(tensornet SHARED ${SOURCES})
15+
set_target_properties(tensornet PROPERTIES
1616
PREFFIX ""
1717
)
18-
target_link_libraries(numnet PRIVATE numnet_core_op numnet_core_base)
19-
target_include_directories(numnet PRIVATE ${PROJECT_SOURCE_DIR})
18+
target_link_libraries(tensornet PRIVATE tensornet_core_op tensornet_core_base)
19+
target_include_directories(tensornet PRIVATE ${PROJECT_SOURCE_DIR})
2020
endif()

‎core/base/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ set(CORE_BASE_SRC ./impl)
22
file(GLOB_RECURSE SOURCES ${CORE_BASE_SRC}/*.cpp)
33

44
if(NOT WIN32 AND NN_CROSS_COMPILE)
5-
add_library(numnet_core_base.lib STATIC ${SOURCES})
6-
set_target_properties(numnet_core_base.lib PROPERTIES
5+
add_library(tensornet_core_base.lib STATIC ${SOURCES})
6+
set_target_properties(tensornet_core_base.lib PROPERTIES
77
SUFFIX ""
88
LINK_FLAGS "-Wl,--add-stdcall-alias"
99
)
10-
target_include_directories(numnet_core_base.lib PRIVATE ${PROJECT_SOURCE_DIR})
10+
target_include_directories(tensornet_core_base.lib PRIVATE ${PROJECT_SOURCE_DIR})
1111
else()
12-
add_library(numnet_core_base STATIC ${SOURCES})
13-
target_include_directories(numnet_core_base PRIVATE ${PROJECT_SOURCE_DIR})
12+
add_library(tensornet_core_base STATIC ${SOURCES})
13+
target_include_directories(tensornet_core_base PRIVATE ${PROJECT_SOURCE_DIR})
1414
endif()
1515

‎core/op/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
file(GLOB_RECURSE SOURCES naive/*.cpp common/*.cpp)
22

33
if(NOT WIN32 AND NN_CROSS_COMPILE)
4-
add_library(numnet_core_op.lib STATIC ${SOURCES})
5-
target_link_libraries(numnet_core_op.lib PRIVATE numnet_core_base.lib)
6-
set_target_properties(numnet_core_op.lib PROPERTIES
4+
add_library(tensornet_core_op.lib STATIC ${SOURCES})
5+
target_link_libraries(tensornet_core_op.lib PRIVATE tensornet_core_base.lib)
6+
set_target_properties(tensornet_core_op.lib PROPERTIES
77
SUFFIX ""
88
LINK_FLAGS "-Wl,--add-stdcall-alias"
99
)
10-
target_include_directories(numnet_core_op.lib PRIVATE ${PROJECT_SOURCE_DIR})
10+
target_include_directories(tensornet_core_op.lib PRIVATE ${PROJECT_SOURCE_DIR})
1111
else()
12-
add_library(numnet_core_op STATIC ${SOURCES})
13-
target_link_libraries(numnet_core_op PRIVATE numnet_core_base)
14-
target_include_directories(numnet_core_op PRIVATE ${PROJECT_SOURCE_DIR})
12+
add_library(tensornet_core_op STATIC ${SOURCES})
13+
target_link_libraries(tensornet_core_op PRIVATE tensornet_core_base)
14+
target_include_directories(tensornet_core_op PRIVATE ${PROJECT_SOURCE_DIR})
1515
endif()

‎core/test/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ file(GLOB_RECURSE SOURCES common/*.cpp naive/*.cpp)
44
enable_testing()
55

66
if(NOT WIN32 AND NN_CROSS_COMPILE)
7-
add_executable( numnet_core_test ${SOURCES} )
7+
add_executable( tensornet_core_test ${SOURCES} )
88
target_link_libraries(
9-
numnet_core_test
10-
PRIVATE numnet_core_base
11-
PRIVATE numnet_core_op
9+
tensornet_core_test
10+
PRIVATE tensornet_core_base
11+
PRIVATE tensornet_core_op
1212
PRIVATE gtest_main
1313
)
14-
set_target_properties(numnet_core_test PROPERTIES
14+
set_target_properties(tensornet_core_test PROPERTIES
1515
SUFFIX "exe"
1616
LINK_FLAGS "-Wl,--add-stdcall-alias"
1717
)
18-
target_include_directories(numnet_core_test PRIVATE ${PROJECT_SOURCE_DIR})
18+
target_include_directories(tensornet_core_test PRIVATE ${PROJECT_SOURCE_DIR})
1919
else()
20-
add_executable(numnet_core_test ${SOURCES})
20+
add_executable(tensornet_core_test ${SOURCES})
2121
target_link_libraries(
22-
numnet_core_test
23-
PRIVATE numnet_core_base
24-
PRIVATE numnet_core_op
22+
tensornet_core_test
23+
PRIVATE tensornet_core_base
24+
PRIVATE tensornet_core_op
2525
PRIVATE gtest_main
2626
)
27-
target_include_directories(numnet_core_test PRIVATE ${PROJECT_SOURCE_DIR})
27+
target_include_directories(tensornet_core_test PRIVATE ${PROJECT_SOURCE_DIR})
2828
endif()
2929

3030
include(GoogleTest)
31-
gtest_discover_tests(numnet_core_test)
31+
gtest_discover_tests(tensornet_core_test)
3232

‎csharp/Tensor.NET/Native/NativeApi.cs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,73 @@
22

33
namespace Tensornet.Native{
44
internal static class NativeApi{
5-
[DllImport("libnumnet")]
5+
[DllImport("libtensornet")]
66
public static extern StatusCode GetErrorCode(IntPtr status);
7-
[DllImport("libnumnet")]
7+
[DllImport("libtensornet")]
88
public static extern IntPtr GetErrorMessage(IntPtr status);
9-
[DllImport("libnumnet")]
9+
[DllImport("libtensornet")]
1010
public static extern void FreeStatusMemory(IntPtr status);
1111

1212

13-
[DllImport("libnumnet")]
13+
[DllImport("libtensornet")]
1414
public static extern IntPtr Matmul(IntPtr a, IntPtr b, IntPtr oup, IntPtr param, NativeProvider provider);
15-
[DllImport("libnumnet")]
15+
[DllImport("libtensornet")]
1616
public static extern IntPtr Dot(IntPtr a, IntPtr b, IntPtr oup, IntPtr param, NativeProvider provider);
17-
[DllImport("libnumnet")]
17+
[DllImport("libtensornet")]
1818
public static extern IntPtr BoolIndex(IntPtr a, IntPtr b, IntPtr oup, IntPtr param, NativeProvider provider);
19-
[DllImport("libnumnet")]
19+
[DllImport("libtensornet")]
2020
public static extern IntPtr Interelem(IntPtr a, IntPtr b, IntPtr oup, IntPtr param, NativeProvider provider);
2121

2222

23-
[DllImport("libnumnet")]
23+
[DllImport("libtensornet")]
2424
public static extern IntPtr Permute(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
25-
[DllImport("libnumnet")]
25+
[DllImport("libtensornet")]
2626
public static extern IntPtr Transpose(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
27-
[DllImport("libnumnet")]
27+
[DllImport("libtensornet")]
2828
public static extern IntPtr Argmxx(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
29-
[DllImport("libnumnet")]
29+
[DllImport("libtensornet")]
3030
public static extern IntPtr Repeat(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
31-
[DllImport("libnumnet")]
31+
[DllImport("libtensornet")]
3232
public static extern IntPtr Flip(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
33-
[DllImport("libnumnet")]
33+
[DllImport("libtensornet")]
3434
public static extern IntPtr MatrixInverse(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
35-
[DllImport("libnumnet")]
35+
[DllImport("libtensornet")]
3636
public static extern IntPtr Rotate(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
37-
[DllImport("libnumnet")]
37+
[DllImport("libtensornet")]
3838
public static extern IntPtr Pad(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
39-
[DllImport("libnumnet")]
39+
[DllImport("libtensornet")]
4040
public static extern IntPtr Sort(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
41-
[DllImport("libnumnet")]
41+
[DllImport("libtensornet")]
4242
public static extern IntPtr Onehot(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
43-
[DllImport("libnumnet")]
43+
[DllImport("libtensornet")]
4444
public static extern IntPtr Sum(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
45-
[DllImport("libnumnet")]
45+
[DllImport("libtensornet")]
4646
public static extern IntPtr Mean(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
47-
[DllImport("libnumnet")]
47+
[DllImport("libtensornet")]
4848
public static extern IntPtr Max(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
49-
[DllImport("libnumnet")]
49+
[DllImport("libtensornet")]
5050
public static extern IntPtr Min(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
51-
[DllImport("libnumnet")]
51+
[DllImport("libtensornet")]
5252
public static extern IntPtr Negative(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
5353

5454

55-
[DllImport("libnumnet")]
55+
[DllImport("libtensornet")]
5656
public static extern IntPtr TypeConvert(IntPtr inp, IntPtr oup, IntPtr param, NativeProvider provider);
5757

58-
[DllImport("libnumnet")]
58+
[DllImport("libtensornet")]
5959
public static extern IntPtr Concat(IntPtr inps, int size, IntPtr oup, IntPtr param, NativeProvider provider);
6060

61-
[DllImport("libnumnet")]
61+
[DllImport("libtensornet")]
6262
public static extern IntPtr Normal(IntPtr t, IntPtr param, NativeProvider provider);
63-
[DllImport("libnumnet")]
63+
[DllImport("libtensornet")]
6464
public static extern IntPtr Uniform(IntPtr t, IntPtr param, NativeProvider provider);
65-
[DllImport("libnumnet")]
65+
[DllImport("libtensornet")]
6666
public static extern IntPtr Eye(IntPtr t, IntPtr param, NativeProvider provider);
67-
[DllImport("libnumnet")]
67+
[DllImport("libtensornet")]
6868
public static extern IntPtr Fill(IntPtr t, IntPtr param, NativeProvider provider);
69-
[DllImport("libnumnet")]
69+
[DllImport("libtensornet")]
7070
public static extern IntPtr Arange(IntPtr t, IntPtr param, NativeProvider provider);
71-
[DllImport("libnumnet")]
71+
[DllImport("libtensornet")]
7272
public static extern IntPtr Linspace(IntPtr t, IntPtr param, NativeProvider provider);
7373
}
7474
}

‎csharp/Tensor.NET/Tensor/Serializer/Tensor.Reader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class TensorReader{
1010
private static byte[] _versionNumber;
1111

1212
static TensorReader(){
13-
_magicNumber = Encoding.ASCII.GetBytes("NumNET");
13+
_magicNumber = Encoding.ASCII.GetBytes("Tensor.NET");
1414
_versionNumber = Encoding.ASCII.GetBytes(Tensor.VersionNumber);
1515
}
1616

‎csharp/Tensor.NET/Tensor/Serializer/Tensor.writer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ namespace Tensornet{
88
public enum TensorSerializationMode
99
{
1010
Auto = 0,
11-
NumNET,
11+
TensorNET,
1212
Numpy
1313
}
1414
public static class TensorWriter{
1515
private static byte[] _magicNumber;
1616
private static byte[] _versionNumber;
1717

1818
static TensorWriter(){
19-
_magicNumber = Encoding.ASCII.GetBytes("NumNET");
19+
_magicNumber = Encoding.ASCII.GetBytes("Tensor.NET");
2020
_versionNumber = Encoding.ASCII.GetBytes(Tensor.VersionNumber);
2121
}
2222

23-
public static void Write<T>(string path, Tensor<T> tensor, TensorSerializationMode mode = TensorSerializationMode.NumNET) where T : struct, IEquatable<T>, IConvertible{
23+
public static void Write<T>(string path, Tensor<T> tensor, TensorSerializationMode mode = TensorSerializationMode.TensorNET) where T : struct, IEquatable<T>, IConvertible{
2424
using(var fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write)){
2525
WriteHeader(fs, tensor.TLayout);
2626
if(tensor.TLayout.IsContiguous()){

‎csharp/Tensor.NET/Tensor/Tensor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void CopyTo(Tensor<T> target){
9191
}
9292
}
9393

94-
public void Save(string path, TensorSerializationMode mode = TensorSerializationMode.NumNET){
94+
public void Save(string path, TensorSerializationMode mode = TensorSerializationMode.TensorNET){
9595
TensorWriter.Write(path, this, mode);
9696
}
9797

0 commit comments

Comments
 (0)