Add macro for automating the C++-side of the simpler functions to implement.

Author: Evan-Hock

CMakeLists.txt

@@ -29,7 +29,7 @@ if(APPLE)
     set(CMAKE_C_COMPILER "/usr/bin/clang")
     set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
 endif()
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
 
 
 include(LibTorchDL)
@@ -38,7 +38,6 @@ download_libtorch(
     DESTINATION ${LIBTORCH_DIR}
 )
 
-
 include(FetchContent)
 include(ExternalProject)
 
@@ -170,7 +169,7 @@ set(BRIDGE_OBJECT_FILES $<TARGET_OBJECTS:bridge>)
 
 
 file(GLOB LIBTORCH_ALL_LIB_FILES 
-    "${LIBTORCH_DIR}/lib/*.a" 
+    # "${LIBTORCH_DIR}/lib/*.a" 
     "${LIBTORCH_DIR}/lib/*.dylib" 
     "${LIBTORCH_DIR}/lib/*.so")
 
@@ -185,7 +184,6 @@ set(REQUIRED_LIBS
     "libtorch"
     "libtorch_cpu"
     "libc10"
-    "libtorch_global_deps"
 )
 
 set(DISALLOWED_LIBS
@@ -206,10 +204,13 @@ foreach(lib_name IN LISTS LIBTORCH_ALL_LIBS)
     list(APPEND LIBTORCH_LIBS_LINKER_ARGS "-l${lib_name_short}")
 endforeach()
 
-# cmake_print_variables(LIBTORCH_LIBS_LINKER_ARGS)
-# cmake_print_variables(${BRIDGE_OBJECT_FILES})
-# cmake_print_variables(BRIDGE_OBJECT_FILES)
-
+if(LINUX)
+    set(LIBTORCH_LINKER_ARGS
+        "-ltorch"
+        "-ltorch_cpu"
+        "-lc10"
+    )
+endif()
 
 add_executable(TorchBridge ${BRIDGE_DIR}/lib/Bridge.chpl)
 add_dependencies(TorchBridge bridge)

bridge/include/bridge.h

@@ -7,6 +7,9 @@
 extern "C" {
 #endif
 
+#define proto_bridge_simple(Name) \
+    bridge_tensor_t Name(bridge_tensor_t input)
+
 typedef float float32_t;
 typedef double float64_t;
 typedef char bool_t;
@@ -73,6 +76,28 @@ bridge_tensor_t max_pool2d(
     int dilation
 );
 
+proto_bridge_simple(relu);
+
+proto_bridge_simple(relu6);
+
+proto_bridge_simple(gelu);
+
+proto_bridge_simple(logsigmoid);
+
+proto_bridge_simple(mish);
+
+proto_bridge_simple(selu);
+
+proto_bridge_simple(silu);
+
+proto_bridge_simple(softmax);
+
+proto_bridge_simple(softmin);
+
+proto_bridge_simple(softsign);
+
+proto_bridge_simple(tanhshrink);
+
 
 // bridge_tensor_t conv2d(
 //     bridge_tensor_t input,
@@ -89,4 +114,4 @@ bridge_tensor_t max_pool2d(
 #endif
 
 #endif // BRIDGE_H
-//hello
+//hello

bridge/lib/bridge.cpp

@@ -14,7 +14,12 @@
 #include <vector>
 #include <cstdint>
 
-
+#define def_bridge_simple(Name) \
+    extern "C" bridge_tensor_t Name(bridge_tensor_t input) { \
+        auto t_input = bridge_to_torch(input); \
+        auto t_output = torch::Name(t_input); \
+        return torch_to_bridge(t_output); \
+    }
 
 
 int bridge_tensor_elements(bridge_tensor_t &bt) {
@@ -54,18 +59,6 @@ torch::Tensor bridge_to_torch(bridge_tensor_t &bt) {
     return torch::from_blob(bt.data, shape, torch::kFloat);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 extern "C" float32_t* unsafe(const float32_t* arr) {
     return const_cast<float32_t*>(arr);
 }
@@ -131,15 +124,6 @@ extern "C" bridge_tensor_t load_run_model(const uint8_t* model_path, bridge_tens
     return torch_to_bridge(output);
 }
 
-
-
-
-
-
-
-
-
-
 extern "C" bridge_tensor_t increment3(bridge_tensor_t arr) {
     auto t = bridge_to_torch(arr);
     // Increment the tensor
@@ -206,6 +190,28 @@ extern "C" bridge_tensor_t max_pool2d(
     return torch_to_bridge(output);
 }
 
+def_bridge_simple(relu);
+
+def_bridge_simple(relu6);
+
+def_bridge_simple(gelu);
+
+def_bridge_simple(logsigmoid);
+
+def_bridge_simple(mish);
+
+def_bridge_simple(selu);
+
+def_bridge_simple(silu);
+
+def_bridge_simple(softmax);
+
+def_bridge_simple(softmin);
+
+def_bridge_simple(softsign);
+
+def_bridge_simple(tanhshrink);
+
 
 // extern "C"
 
@@ -306,4 +312,4 @@ extern "C" float sumArray(float* arr, int* sizes, int dim) {
 
     // auto t = torch::from_blob(arr, shape, torch::kFloat);
     // return t.sum().item<float>();
-}
+}

cmake/LibTorchDL.cmake

@@ -23,7 +23,7 @@ endif()
 if(APPLE)
     set(TORCH_DISTRIBUTION "${TORCH_URL_PREFIX}/libtorch-macos-arm64-latest.zip")
 elseif(LINUX)
-    set(TORCH_DISTRIBUTION "$${TORCH_URL_PREFIX}/libtorch-shared-with-deps-latest.zip")
+    set(TORCH_DISTRIBUTION "${TORCH_URL_PREFIX}/libtorch-cxx11-abi-shared-with-deps-latest.zip")
 endif()
 
 function(download_libtorch)
@@ -112,4 +112,4 @@ endfunction()
 
 # dlcache("${TORCH_DISTRIBUTION}" OUT url)
 
-# message(STATUS "file loc >>>>> ${url}")
+# message(STATUS "file loc >>>>> ${url}")